added "onlyInLocations" flag for LectureWrite

update thrift files to 0.9.3

46 files changed, 4858 insertions, 1005 deletions

diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
index c5100f1..cacc3d8 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
index fe0b74b..715ff3a 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionData, ClientSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ClientSessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientSessionData");
 
@@ -424,7 +427,29 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_sessionId = true && (isSetSessionId());
+    list.add(present_sessionId);
+    if (present_sessionId)
+      list.add(sessionId);
+
+    boolean present_authToken = true && (isSetAuthToken());
+    list.add(present_authToken);
+    if (present_authToken)
+      list.add(authToken);
+
+    boolean present_satellites = true && (isSetSatellites());
+    list.add(present_satellites);
+    if (present_satellites)
+      list.add(satellites);
+
+    boolean present_userInfo = true && (isSetUserInfo());
+    list.add(present_userInfo);
+    if (present_userInfo)
+      list.add(userInfo);
+
+    return list.hashCode();
   }
 
   @Override
@@ -593,12 +618,12 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
               {
                 org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
                 struct.satellites = new ArrayList<Satellite>(_list16.size);
-                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+                Satellite _elem17;
+                for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                 {
-                  Satellite _elem18;
-                  _elem18 = new Satellite();
-                  _elem18.read(iprot);
-                  struct.satellites.add(_elem18);
+                  _elem17 = new Satellite();
+                  _elem17.read(iprot);
+                  struct.satellites.add(_elem17);
                 }
                 iprot.readListEnd();
               }
@@ -725,12 +750,12 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.satellites = new ArrayList<Satellite>(_list21.size);
-          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+          Satellite _elem22;
+          for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
-            Satellite _elem23;
-            _elem23 = new Satellite();
-            _elem23.read(iprot);
-            struct.satellites.add(_elem23);
+            _elem22 = new Satellite();
+            _elem22.read(iprot);
+            struct.satellites.add(_elem22);
           }
         }
         struct.setSatellitesIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java b/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
index 3163a8f..23910bf 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
index bf04945..6e35111 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, ImageBaseWrite._Fields>, java.io.Serializable, Cloneable, Comparable<ImageBaseWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageBaseWrite");
 
@@ -155,7 +158,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   private static final int __OSID_ISSET_ID = 0;
   private static final int __ISTEMPLATE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.ADD_TAGS,_Fields.REM_TAGS};
+  private static final _Fields optionals[] = {_Fields.ADD_TAGS,_Fields.REM_TAGS};
   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);
@@ -596,13 +599,13 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       return getDescription();
 
     case OS_ID:
-      return Integer.valueOf(getOsId());
+      return getOsId();
 
     case VIRT_ID:
       return getVirtId();
 
     case IS_TEMPLATE:
-      return Boolean.valueOf(isIsTemplate());
+      return isIsTemplate();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -748,7 +751,54 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_imageName = true && (isSetImageName());
+    list.add(present_imageName);
+    if (present_imageName)
+      list.add(imageName);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_osId = true;
+    list.add(present_osId);
+    if (present_osId)
+      list.add(osId);
+
+    boolean present_virtId = true && (isSetVirtId());
+    list.add(present_virtId);
+    if (present_virtId)
+      list.add(virtId);
+
+    boolean present_isTemplate = true;
+    list.add(present_isTemplate);
+    if (present_isTemplate)
+      list.add(isTemplate);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_shareMode = true && (isSetShareMode());
+    list.add(present_shareMode);
+    if (present_shareMode)
+      list.add(shareMode.getValue());
+
+    boolean present_addTags = true && (isSetAddTags());
+    list.add(present_addTags);
+    if (present_addTags)
+      list.add(addTags);
+
+    boolean present_remTags = true && (isSetRemTags());
+    list.add(present_remTags);
+    if (present_remTags)
+      list.add(remTags);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1035,7 +1085,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
             break;
           case 7: // SHARE_MODE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.shareMode = ShareMode.findByValue(iprot.readI32());
+              struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
               struct.setShareModeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1046,11 +1096,11 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
               {
                 org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
                 struct.addTags = new ArrayList<String>(_list34.size);
-                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
+                String _elem35;
+                for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                 {
-                  String _elem36;
-                  _elem36 = iprot.readString();
-                  struct.addTags.add(_elem36);
+                  _elem35 = iprot.readString();
+                  struct.addTags.add(_elem35);
                 }
                 iprot.readListEnd();
               }
@@ -1064,11 +1114,11 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
               {
                 org.apache.thrift.protocol.TList _list37 = iprot.readListBegin();
                 struct.remTags = new ArrayList<String>(_list37.size);
-                for (int _i38 = 0; _i38 < _list37.size; ++_i38)
+                String _elem38;
+                for (int _i39 = 0; _i39 < _list37.size; ++_i39)
                 {
-                  String _elem39;
-                  _elem39 = iprot.readString();
-                  struct.remTags.add(_elem39);
+                  _elem38 = iprot.readString();
+                  struct.remTags.add(_elem38);
                 }
                 iprot.readListEnd();
               }
@@ -1268,18 +1318,18 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         struct.setDefaultPermissionsIsSet(true);
       }
       if (incoming.get(6)) {
-        struct.shareMode = ShareMode.findByValue(iprot.readI32());
+        struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
         struct.setShareModeIsSet(true);
       }
       if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.addTags = new ArrayList<String>(_list44.size);
-          for (int _i45 = 0; _i45 < _list44.size; ++_i45)
+          String _elem45;
+          for (int _i46 = 0; _i46 < _list44.size; ++_i46)
           {
-            String _elem46;
-            _elem46 = iprot.readString();
-            struct.addTags.add(_elem46);
+            _elem45 = iprot.readString();
+            struct.addTags.add(_elem45);
           }
         }
         struct.setAddTagsIsSet(true);
@@ -1288,11 +1338,11 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         {
           org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.remTags = new ArrayList<String>(_list47.size);
-          for (int _i48 = 0; _i48 < _list47.size; ++_i48)
+          String _elem48;
+          for (int _i49 = 0; _i49 < _list47.size; ++_i49)
           {
-            String _elem49;
-            _elem49 = iprot.readString();
-            struct.remTags.add(_elem49);
+            _elem48 = iprot.readString();
+            struct.remTags.add(_elem48);
           }
         }
         struct.setRemTagsIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
index 55f4d2b..e4e7eac 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRead, ImageDetailsRead._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDetailsRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDetailsRead");
 
@@ -192,7 +195,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   private static final int __UPDATETIME_ISSET_ID = 2;
   private static final int __ISTEMPLATE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.USER_PERMISSIONS};
+  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
   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);
@@ -928,16 +931,16 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       return getTags();
 
     case OS_ID:
-      return Integer.valueOf(getOsId());
+      return getOsId();
 
     case VIRT_ID:
       return getVirtId();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     case UPDATE_TIME:
-      return Long.valueOf(getUpdateTime());
+      return getUpdateTime();
 
     case OWNER_ID:
       return getOwnerId();
@@ -949,7 +952,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       return getShareMode();
 
     case IS_TEMPLATE:
-      return Boolean.valueOf(isIsTemplate());
+      return isIsTemplate();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -1166,7 +1169,89 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_imageBaseId = true && (isSetImageBaseId());
+    list.add(present_imageBaseId);
+    if (present_imageBaseId)
+      list.add(imageBaseId);
+
+    boolean present_latestVersionId = true && (isSetLatestVersionId());
+    list.add(present_latestVersionId);
+    if (present_latestVersionId)
+      list.add(latestVersionId);
+
+    boolean present_versions = true && (isSetVersions());
+    list.add(present_versions);
+    if (present_versions)
+      list.add(versions);
+
+    boolean present_imageName = true && (isSetImageName());
+    list.add(present_imageName);
+    if (present_imageName)
+      list.add(imageName);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_tags = true && (isSetTags());
+    list.add(present_tags);
+    if (present_tags)
+      list.add(tags);
+
+    boolean present_osId = true;
+    list.add(present_osId);
+    if (present_osId)
+      list.add(osId);
+
+    boolean present_virtId = true && (isSetVirtId());
+    list.add(present_virtId);
+    if (present_virtId)
+      list.add(virtId);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    boolean present_updateTime = true;
+    list.add(present_updateTime);
+    if (present_updateTime)
+      list.add(updateTime);
+
+    boolean present_ownerId = true && (isSetOwnerId());
+    list.add(present_ownerId);
+    if (present_ownerId)
+      list.add(ownerId);
+
+    boolean present_updaterId = true && (isSetUpdaterId());
+    list.add(present_updaterId);
+    if (present_updaterId)
+      list.add(updaterId);
+
+    boolean present_shareMode = true && (isSetShareMode());
+    list.add(present_shareMode);
+    if (present_shareMode)
+      list.add(shareMode.getValue());
+
+    boolean present_isTemplate = true;
+    list.add(present_isTemplate);
+    if (present_isTemplate)
+      list.add(isTemplate);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_userPermissions = true && (isSetUserPermissions());
+    list.add(present_userPermissions);
+    if (present_userPermissions)
+      list.add(userPermissions);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1542,12 +1627,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
               {
                 org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
                 struct.versions = new ArrayList<ImageVersionDetails>(_list58.size);
-                for (int _i59 = 0; _i59 < _list58.size; ++_i59)
+                ImageVersionDetails _elem59;
+                for (int _i60 = 0; _i60 < _list58.size; ++_i60)
                 {
-                  ImageVersionDetails _elem60;
-                  _elem60 = new ImageVersionDetails();
-                  _elem60.read(iprot);
-                  struct.versions.add(_elem60);
+                  _elem59 = new ImageVersionDetails();
+                  _elem59.read(iprot);
+                  struct.versions.add(_elem59);
                 }
                 iprot.readListEnd();
               }
@@ -1577,11 +1662,11 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
               {
                 org.apache.thrift.protocol.TList _list61 = iprot.readListBegin();
                 struct.tags = new ArrayList<String>(_list61.size);
-                for (int _i62 = 0; _i62 < _list61.size; ++_i62)
+                String _elem62;
+                for (int _i63 = 0; _i63 < _list61.size; ++_i63)
                 {
-                  String _elem63;
-                  _elem63 = iprot.readString();
-                  struct.tags.add(_elem63);
+                  _elem62 = iprot.readString();
+                  struct.tags.add(_elem62);
                 }
                 iprot.readListEnd();
               }
@@ -1640,7 +1725,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
             break;
           case 14: // SHARE_MODE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.shareMode = ShareMode.findByValue(iprot.readI32());
+              struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
               struct.setShareModeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1920,12 +2005,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         {
           org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.versions = new ArrayList<ImageVersionDetails>(_list68.size);
-          for (int _i69 = 0; _i69 < _list68.size; ++_i69)
+          ImageVersionDetails _elem69;
+          for (int _i70 = 0; _i70 < _list68.size; ++_i70)
           {
-            ImageVersionDetails _elem70;
-            _elem70 = new ImageVersionDetails();
-            _elem70.read(iprot);
-            struct.versions.add(_elem70);
+            _elem69 = new ImageVersionDetails();
+            _elem69.read(iprot);
+            struct.versions.add(_elem69);
           }
         }
         struct.setVersionsIsSet(true);
@@ -1942,11 +2027,11 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         {
           org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.tags = new ArrayList<String>(_list71.size);
-          for (int _i72 = 0; _i72 < _list71.size; ++_i72)
+          String _elem72;
+          for (int _i73 = 0; _i73 < _list71.size; ++_i73)
           {
-            String _elem73;
-            _elem73 = iprot.readString();
-            struct.tags.add(_elem73);
+            _elem72 = iprot.readString();
+            struct.tags.add(_elem72);
           }
         }
         struct.setTagsIsSet(true);
@@ -1976,7 +2061,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         struct.setUpdaterIdIsSet(true);
       }
       if (incoming.get(12)) {
-        struct.shareMode = ShareMode.findByValue(iprot.readI32());
+        struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
         struct.setShareModeIsSet(true);
       }
       if (incoming.get(13)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
index 95fdaac..57cc72e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImagePermissions implements org.apache.thrift.TBase<ImagePermissions, ImagePermissions._Fields>, java.io.Serializable, Cloneable, Comparable<ImagePermissions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImagePermissions");
 
@@ -318,16 +321,16 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case LINK:
-      return Boolean.valueOf(isLink());
+      return isLink();
 
     case DOWNLOAD:
-      return Boolean.valueOf(isDownload());
+      return isDownload();
 
     case EDIT:
-      return Boolean.valueOf(isEdit());
+      return isEdit();
 
     case ADMIN:
-      return Boolean.valueOf(isAdmin());
+      return isAdmin();
 
     }
     throw new IllegalStateException();
@@ -406,7 +409,29 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_link = true;
+    list.add(present_link);
+    if (present_link)
+      list.add(link);
+
+    boolean present_download = true;
+    list.add(present_download);
+    if (present_download)
+      list.add(download);
+
+    boolean present_edit = true;
+    list.add(present_edit);
+    if (present_edit)
+      list.add(edit);
+
+    boolean present_admin = true;
+    list.add(present_admin);
+    if (present_admin)
+      list.add(admin);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
index 8e34329..87b632f 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishData, ImagePublishData._Fields>, java.io.Serializable, Cloneable, Comparable<ImagePublishData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImagePublishData");
 
@@ -724,13 +727,13 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       return getDescription();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     case USER:
       return getUser();
 
     case FILE_SIZE:
-      return Long.valueOf(getFileSize());
+      return getFileSize();
 
     case SOFTWARE:
       return getSoftware();
@@ -739,13 +742,13 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       return getTags();
 
     case OS_ID:
-      return Integer.valueOf(getOsId());
+      return getOsId();
 
     case VIRT_ID:
       return getVirtId();
 
     case IS_TEMPLATE:
-      return Boolean.valueOf(isIsTemplate());
+      return isIsTemplate();
 
     }
     throw new IllegalStateException();
@@ -912,7 +915,69 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_imageBaseId = true && (isSetImageBaseId());
+    list.add(present_imageBaseId);
+    if (present_imageBaseId)
+      list.add(imageBaseId);
+
+    boolean present_imageVersionId = true && (isSetImageVersionId());
+    list.add(present_imageVersionId);
+    if (present_imageVersionId)
+      list.add(imageVersionId);
+
+    boolean present_imageName = true && (isSetImageName());
+    list.add(present_imageName);
+    if (present_imageName)
+      list.add(imageName);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    boolean present_user = true && (isSetUser());
+    list.add(present_user);
+    if (present_user)
+      list.add(user);
+
+    boolean present_fileSize = true;
+    list.add(present_fileSize);
+    if (present_fileSize)
+      list.add(fileSize);
+
+    boolean present_software = true && (isSetSoftware());
+    list.add(present_software);
+    if (present_software)
+      list.add(software);
+
+    boolean present_tags = true && (isSetTags());
+    list.add(present_tags);
+    if (present_tags)
+      list.add(tags);
+
+    boolean present_osId = true;
+    list.add(present_osId);
+    if (present_osId)
+      list.add(osId);
+
+    boolean present_virtId = true && (isSetVirtId());
+    list.add(present_virtId);
+    if (present_virtId)
+      list.add(virtId);
+
+    boolean present_isTemplate = true;
+    list.add(present_isTemplate);
+    if (present_isTemplate)
+      list.add(isTemplate);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1252,11 +1317,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
               {
                 org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
                 struct.software = new ArrayList<String>(_list74.size);
-                for (int _i75 = 0; _i75 < _list74.size; ++_i75)
+                String _elem75;
+                for (int _i76 = 0; _i76 < _list74.size; ++_i76)
                 {
-                  String _elem76;
-                  _elem76 = iprot.readString();
-                  struct.software.add(_elem76);
+                  _elem75 = iprot.readString();
+                  struct.software.add(_elem75);
                 }
                 iprot.readListEnd();
               }
@@ -1270,11 +1335,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
               {
                 org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
                 struct.tags = new ArrayList<String>(_list77.size);
-                for (int _i78 = 0; _i78 < _list77.size; ++_i78)
+                String _elem78;
+                for (int _i79 = 0; _i79 < _list77.size; ++_i79)
                 {
-                  String _elem79;
-                  _elem79 = iprot.readString();
-                  struct.tags.add(_elem79);
+                  _elem78 = iprot.readString();
+                  struct.tags.add(_elem78);
                 }
                 iprot.readListEnd();
               }
@@ -1530,11 +1595,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         {
           org.apache.thrift.protocol.TList _list84 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.software = new ArrayList<String>(_list84.size);
-          for (int _i85 = 0; _i85 < _list84.size; ++_i85)
+          String _elem85;
+          for (int _i86 = 0; _i86 < _list84.size; ++_i86)
           {
-            String _elem86;
-            _elem86 = iprot.readString();
-            struct.software.add(_elem86);
+            _elem85 = iprot.readString();
+            struct.software.add(_elem85);
           }
         }
         struct.setSoftwareIsSet(true);
@@ -1543,11 +1608,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         {
           org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.tags = new ArrayList<String>(_list87.size);
-          for (int _i88 = 0; _i88 < _list87.size; ++_i88)
+          String _elem88;
+          for (int _i89 = 0; _i89 < _list87.size; ++_i89)
           {
-            String _elem89;
-            _elem89 = iprot.readString();
-            struct.tags.add(_elem89);
+            _elem88 = iprot.readString();
+            struct.tags.add(_elem88);
           }
         }
         struct.setTagsIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
index e00e17c..7095bba 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRead, ImageSummaryRead._Fields>, java.io.Serializable, Cloneable, Comparable<ImageSummaryRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageSummaryRead");
 
@@ -213,7 +216,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   private static final int __ISPROCESSED_ISSET_ID = 8;
   private static final int __ISTEMPLATE_ISSET_ID = 9;
   private short __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.USER_PERMISSIONS};
+  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
   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);
@@ -1017,22 +1020,22 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       return getImageName();
 
     case OS_ID:
-      return Integer.valueOf(getOsId());
+      return getOsId();
 
     case VIRT_ID:
       return getVirtId();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     case UPDATE_TIME:
-      return Long.valueOf(getUpdateTime());
+      return getUpdateTime();
 
     case UPLOAD_TIME:
-      return Long.valueOf(getUploadTime());
+      return getUploadTime();
 
     case EXPIRE_TIME:
-      return Long.valueOf(getExpireTime());
+      return getExpireTime();
 
     case OWNER_ID:
       return getOwnerId();
@@ -1044,19 +1047,19 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       return getShareMode();
 
     case FILE_SIZE:
-      return Long.valueOf(getFileSize());
+      return getFileSize();
 
     case IS_RESTRICTED:
-      return Boolean.valueOf(isIsRestricted());
+      return isIsRestricted();
 
     case IS_VALID:
-      return Boolean.valueOf(isIsValid());
+      return isIsValid();
 
     case IS_PROCESSED:
-      return Boolean.valueOf(isIsProcessed());
+      return isIsProcessed();
 
     case IS_TEMPLATE:
-      return Boolean.valueOf(isIsTemplate());
+      return isIsTemplate();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -1306,7 +1309,104 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_imageBaseId = true && (isSetImageBaseId());
+    list.add(present_imageBaseId);
+    if (present_imageBaseId)
+      list.add(imageBaseId);
+
+    boolean present_latestVersionId = true && (isSetLatestVersionId());
+    list.add(present_latestVersionId);
+    if (present_latestVersionId)
+      list.add(latestVersionId);
+
+    boolean present_imageName = true && (isSetImageName());
+    list.add(present_imageName);
+    if (present_imageName)
+      list.add(imageName);
+
+    boolean present_osId = true;
+    list.add(present_osId);
+    if (present_osId)
+      list.add(osId);
+
+    boolean present_virtId = true && (isSetVirtId());
+    list.add(present_virtId);
+    if (present_virtId)
+      list.add(virtId);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    boolean present_updateTime = true;
+    list.add(present_updateTime);
+    if (present_updateTime)
+      list.add(updateTime);
+
+    boolean present_uploadTime = true;
+    list.add(present_uploadTime);
+    if (present_uploadTime)
+      list.add(uploadTime);
+
+    boolean present_expireTime = true;
+    list.add(present_expireTime);
+    if (present_expireTime)
+      list.add(expireTime);
+
+    boolean present_ownerId = true && (isSetOwnerId());
+    list.add(present_ownerId);
+    if (present_ownerId)
+      list.add(ownerId);
+
+    boolean present_uploaderId = true && (isSetUploaderId());
+    list.add(present_uploaderId);
+    if (present_uploaderId)
+      list.add(uploaderId);
+
+    boolean present_shareMode = true && (isSetShareMode());
+    list.add(present_shareMode);
+    if (present_shareMode)
+      list.add(shareMode.getValue());
+
+    boolean present_fileSize = true;
+    list.add(present_fileSize);
+    if (present_fileSize)
+      list.add(fileSize);
+
+    boolean present_isRestricted = true;
+    list.add(present_isRestricted);
+    if (present_isRestricted)
+      list.add(isRestricted);
+
+    boolean present_isValid = true;
+    list.add(present_isValid);
+    if (present_isValid)
+      list.add(isValid);
+
+    boolean present_isProcessed = true;
+    list.add(present_isProcessed);
+    if (present_isProcessed)
+      list.add(isProcessed);
+
+    boolean present_isTemplate = true;
+    list.add(present_isTemplate);
+    if (present_isTemplate)
+      list.add(isTemplate);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_userPermissions = true && (isSetUserPermissions());
+    list.add(present_userPermissions);
+    if (present_userPermissions)
+      list.add(userPermissions);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1781,7 +1881,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
             break;
           case 12: // SHARE_MODE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.shareMode = ShareMode.findByValue(iprot.readI32());
+              struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
               struct.setShareModeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -2121,7 +2221,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         struct.setUploaderIdIsSet(true);
       }
       if (incoming.get(11)) {
-        struct.shareMode = ShareMode.findByValue(iprot.readI32());
+        struct.shareMode = org.openslx.bwlp.thrift.iface.ShareMode.findByValue(iprot.readI32());
         struct.setShareModeIsSet(true);
       }
       if (incoming.get(12)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
index bb78a52..abba44a 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersionDetails, ImageVersionDetails._Fields>, java.io.Serializable, Cloneable, Comparable<ImageVersionDetails> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageVersionDetails");
 
@@ -563,25 +566,25 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       return getVersionId();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     case EXPIRE_TIME:
-      return Long.valueOf(getExpireTime());
+      return getExpireTime();
 
     case FILE_SIZE:
-      return Long.valueOf(getFileSize());
+      return getFileSize();
 
     case UPLOADER_ID:
       return getUploaderId();
 
     case IS_RESTRICTED:
-      return Boolean.valueOf(isIsRestricted());
+      return isIsRestricted();
 
     case IS_VALID:
-      return Boolean.valueOf(isIsValid());
+      return isIsValid();
 
     case IS_PROCESSED:
-      return Boolean.valueOf(isIsProcessed());
+      return isIsProcessed();
 
     case SOFTWARE:
       return getSoftware();
@@ -718,7 +721,54 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_versionId = true && (isSetVersionId());
+    list.add(present_versionId);
+    if (present_versionId)
+      list.add(versionId);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    boolean present_expireTime = true;
+    list.add(present_expireTime);
+    if (present_expireTime)
+      list.add(expireTime);
+
+    boolean present_fileSize = true;
+    list.add(present_fileSize);
+    if (present_fileSize)
+      list.add(fileSize);
+
+    boolean present_uploaderId = true && (isSetUploaderId());
+    list.add(present_uploaderId);
+    if (present_uploaderId)
+      list.add(uploaderId);
+
+    boolean present_isRestricted = true;
+    list.add(present_isRestricted);
+    if (present_isRestricted)
+      list.add(isRestricted);
+
+    boolean present_isValid = true;
+    list.add(present_isValid);
+    if (present_isValid)
+      list.add(isValid);
+
+    boolean present_isProcessed = true;
+    list.add(present_isProcessed);
+    if (present_isProcessed)
+      list.add(isProcessed);
+
+    boolean present_software = true && (isSetSoftware());
+    list.add(present_software);
+    if (present_software)
+      list.add(software);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1000,11 +1050,11 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
               {
                 org.apache.thrift.protocol.TList _list50 = iprot.readListBegin();
                 struct.software = new ArrayList<String>(_list50.size);
-                for (int _i51 = 0; _i51 < _list50.size; ++_i51)
+                String _elem51;
+                for (int _i52 = 0; _i52 < _list50.size; ++_i52)
                 {
-                  String _elem52;
-                  _elem52 = iprot.readString();
-                  struct.software.add(_elem52);
+                  _elem51 = iprot.readString();
+                  struct.software.add(_elem51);
                 }
                 iprot.readListEnd();
               }
@@ -1189,11 +1239,11 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         {
           org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.software = new ArrayList<String>(_list55.size);
-          for (int _i56 = 0; _i56 < _list55.size; ++_i56)
+          String _elem56;
+          for (int _i57 = 0; _i57 < _list55.size; ++_i57)
           {
-            String _elem57;
-            _elem57 = iprot.readString();
-            struct.software.add(_elem57);
+            _elem56 = iprot.readString();
+            struct.software.add(_elem56);
           }
         }
         struct.setSoftwareIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
index b159bdb..70a41fd 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWrite, ImageVersionWrite._Fields>, java.io.Serializable, Cloneable, Comparable<ImageVersionWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageVersionWrite");
 
@@ -183,7 +186,7 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case IS_RESTRICTED:
-      return Boolean.valueOf(isIsRestricted());
+      return isIsRestricted();
 
     }
     throw new IllegalStateException();
@@ -229,7 +232,14 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_isRestricted = true;
+    list.add(present_isRestricted);
+    if (present_isRestricted)
+      list.add(isRestricted);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java b/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
index e94bd60..5f2b9a9 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java b/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
index 5538ce1..a3b8d8a 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class LecturePermissions implements org.apache.thrift.TBase<LecturePermissions, LecturePermissions._Fields>, java.io.Serializable, Cloneable, Comparable<LecturePermissions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LecturePermissions");
 
@@ -228,10 +231,10 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case EDIT:
-      return Boolean.valueOf(isEdit());
+      return isEdit();
 
     case ADMIN:
-      return Boolean.valueOf(isAdmin());
+      return isAdmin();
 
     }
     throw new IllegalStateException();
@@ -288,7 +291,19 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_edit = true;
+    list.add(present_edit);
+    if (present_edit)
+      list.add(edit);
+
+    boolean present_admin = true;
+    list.add(present_admin);
+    if (present_admin)
+      list.add(admin);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
index 0cd2051..0fddbff 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class LectureRead implements org.apache.thrift.TBase<LectureRead, LectureRead._Fields>, java.io.Serializable, Cloneable, Comparable<LectureRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureRead");
 
@@ -58,6 +61,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final org.apache.thrift.protocol.TField HAS_INTERNET_ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("hasInternetAccess", org.apache.thrift.protocol.TType.BOOL, (short)18);
   private static final org.apache.thrift.protocol.TField DEFAULT_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)19);
   private static final org.apache.thrift.protocol.TField USER_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("userPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)22);
+  private static final org.apache.thrift.protocol.TField LOCATION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("locationIds", org.apache.thrift.protocol.TType.LIST, (short)25);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -88,6 +92,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   public boolean hasInternetAccess; // required
   public LecturePermissions defaultPermissions; // required
   public LecturePermissions userPermissions; // optional
+  public List<Integer> locationIds; // 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 {
@@ -113,7 +118,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     IS_EXAM((short)17, "isExam"),
     HAS_INTERNET_ACCESS((short)18, "hasInternetAccess"),
     DEFAULT_PERMISSIONS((short)19, "defaultPermissions"),
-    USER_PERMISSIONS((short)22, "userPermissions");
+    USER_PERMISSIONS((short)22, "userPermissions"),
+    LOCATION_IDS((short)25, "locationIds");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -174,6 +180,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           return DEFAULT_PERMISSIONS;
         case 22: // USER_PERMISSIONS
           return USER_PERMISSIONS;
+        case 25: // LOCATION_IDS
+          return LOCATION_IDS;
         default:
           return null;
       }
@@ -225,7 +233,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final int __ISEXAM_ISSET_ID = 8;
   private static final int __HASINTERNETACCESS_ISSET_ID = 9;
   private short __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.USER_PERMISSIONS};
+  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
   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);
@@ -278,6 +286,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LecturePermissions.class)));
     tmpMap.put(_Fields.USER_PERMISSIONS, new org.apache.thrift.meta_data.FieldMetaData("userPermissions", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LecturePermissions.class)));
+    tmpMap.put(_Fields.LOCATION_IDS, new org.apache.thrift.meta_data.FieldMetaData("locationIds", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureRead.class, metaDataMap);
   }
@@ -307,7 +318,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     List<NetRule> networkExceptions,
     boolean isExam,
     boolean hasInternetAccess,
-    LecturePermissions defaultPermissions)
+    LecturePermissions defaultPermissions,
+    List<Integer> locationIds)
   {
     this();
     this.lectureId = lectureId;
@@ -342,6 +354,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     this.hasInternetAccess = hasInternetAccess;
     setHasInternetAccessIsSet(true);
     this.defaultPermissions = defaultPermissions;
+    this.locationIds = locationIds;
   }
 
   /**
@@ -404,6 +417,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     if (other.isSetUserPermissions()) {
       this.userPermissions = new LecturePermissions(other.userPermissions);
     }
+    if (other.isSetLocationIds()) {
+      List<Integer> __this__locationIds = new ArrayList<Integer>(other.locationIds);
+      this.locationIds = __this__locationIds;
+    }
   }
 
   public LectureRead deepCopy() {
@@ -445,6 +462,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     this.hasInternetAccess = false;
     this.defaultPermissions = null;
     this.userPermissions = null;
+    this.locationIds = null;
   }
 
   public String getLectureId() {
@@ -1034,6 +1052,45 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
+  public int getLocationIdsSize() {
+    return (this.locationIds == null) ? 0 : this.locationIds.size();
+  }
+
+  public java.util.Iterator<Integer> getLocationIdsIterator() {
+    return (this.locationIds == null) ? null : this.locationIds.iterator();
+  }
+
+  public void addToLocationIds(int elem) {
+    if (this.locationIds == null) {
+      this.locationIds = new ArrayList<Integer>();
+    }
+    this.locationIds.add(elem);
+  }
+
+  public List<Integer> getLocationIds() {
+    return this.locationIds;
+  }
+
+  public LectureRead setLocationIds(List<Integer> locationIds) {
+    this.locationIds = locationIds;
+    return this;
+  }
+
+  public void unsetLocationIds() {
+    this.locationIds = null;
+  }
+
+  /** Returns true if field locationIds is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocationIds() {
+    return this.locationIds != null;
+  }
+
+  public void setLocationIdsIsSet(boolean value) {
+    if (!value) {
+      this.locationIds = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case LECTURE_ID:
@@ -1220,6 +1277,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       break;
 
+    case LOCATION_IDS:
+      if (value == null) {
+        unsetLocationIds();
+      } else {
+        setLocationIds((List<Integer>)value);
+      }
+      break;
+
     }
   }
 
@@ -1241,28 +1306,28 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return getImageBaseId();
 
     case AUTO_UPDATE:
-      return Boolean.valueOf(isAutoUpdate());
+      return isAutoUpdate();
 
     case IS_ENABLED:
-      return Boolean.valueOf(isIsEnabled());
+      return isIsEnabled();
 
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case END_TIME:
-      return Long.valueOf(getEndTime());
+      return getEndTime();
 
     case LAST_USED:
-      return Long.valueOf(getLastUsed());
+      return getLastUsed();
 
     case USE_COUNT:
-      return Integer.valueOf(getUseCount());
+      return getUseCount();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     case UPDATE_TIME:
-      return Long.valueOf(getUpdateTime());
+      return getUpdateTime();
 
     case OWNER_ID:
       return getOwnerId();
@@ -1283,10 +1348,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return getNetworkExceptions();
 
     case IS_EXAM:
-      return Boolean.valueOf(isIsExam());
+      return isIsExam();
 
     case HAS_INTERNET_ACCESS:
-      return Boolean.valueOf(isHasInternetAccess());
+      return isHasInternetAccess();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -1294,6 +1359,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     case USER_PERMISSIONS:
       return getUserPermissions();
 
+    case LOCATION_IDS:
+      return getLocationIds();
+
     }
     throw new IllegalStateException();
   }
@@ -1351,6 +1419,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return isSetDefaultPermissions();
     case USER_PERMISSIONS:
       return isSetUserPermissions();
+    case LOCATION_IDS:
+      return isSetLocationIds();
     }
     throw new IllegalStateException();
   }
@@ -1575,12 +1645,143 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return false;
     }
 
+    boolean this_present_locationIds = true && this.isSetLocationIds();
+    boolean that_present_locationIds = true && that.isSetLocationIds();
+    if (this_present_locationIds || that_present_locationIds) {
+      if (!(this_present_locationIds && that_present_locationIds))
+        return false;
+      if (!this.locationIds.equals(that.locationIds))
+        return false;
+    }
+
     return true;
   }
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_lectureId = true && (isSetLectureId());
+    list.add(present_lectureId);
+    if (present_lectureId)
+      list.add(lectureId);
+
+    boolean present_lectureName = true && (isSetLectureName());
+    list.add(present_lectureName);
+    if (present_lectureName)
+      list.add(lectureName);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_imageVersionId = true && (isSetImageVersionId());
+    list.add(present_imageVersionId);
+    if (present_imageVersionId)
+      list.add(imageVersionId);
+
+    boolean present_imageBaseId = true && (isSetImageBaseId());
+    list.add(present_imageBaseId);
+    if (present_imageBaseId)
+      list.add(imageBaseId);
+
+    boolean present_autoUpdate = true;
+    list.add(present_autoUpdate);
+    if (present_autoUpdate)
+      list.add(autoUpdate);
+
+    boolean present_isEnabled = true;
+    list.add(present_isEnabled);
+    if (present_isEnabled)
+      list.add(isEnabled);
+
+    boolean present_startTime = true;
+    list.add(present_startTime);
+    if (present_startTime)
+      list.add(startTime);
+
+    boolean present_endTime = true;
+    list.add(present_endTime);
+    if (present_endTime)
+      list.add(endTime);
+
+    boolean present_lastUsed = true;
+    list.add(present_lastUsed);
+    if (present_lastUsed)
+      list.add(lastUsed);
+
+    boolean present_useCount = true;
+    list.add(present_useCount);
+    if (present_useCount)
+      list.add(useCount);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    boolean present_updateTime = true;
+    list.add(present_updateTime);
+    if (present_updateTime)
+      list.add(updateTime);
+
+    boolean present_ownerId = true && (isSetOwnerId());
+    list.add(present_ownerId);
+    if (present_ownerId)
+      list.add(ownerId);
+
+    boolean present_updaterId = true && (isSetUpdaterId());
+    list.add(present_updaterId);
+    if (present_updaterId)
+      list.add(updaterId);
+
+    boolean present_runscript = true && (isSetRunscript());
+    list.add(present_runscript);
+    if (present_runscript)
+      list.add(runscript);
+
+    boolean present_nics = true && (isSetNics());
+    list.add(present_nics);
+    if (present_nics)
+      list.add(nics);
+
+    boolean present_allowedUsers = true && (isSetAllowedUsers());
+    list.add(present_allowedUsers);
+    if (present_allowedUsers)
+      list.add(allowedUsers);
+
+    boolean present_networkExceptions = true && (isSetNetworkExceptions());
+    list.add(present_networkExceptions);
+    if (present_networkExceptions)
+      list.add(networkExceptions);
+
+    boolean present_isExam = true;
+    list.add(present_isExam);
+    if (present_isExam)
+      list.add(isExam);
+
+    boolean present_hasInternetAccess = true;
+    list.add(present_hasInternetAccess);
+    if (present_hasInternetAccess)
+      list.add(hasInternetAccess);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_userPermissions = true && (isSetUserPermissions());
+    list.add(present_userPermissions);
+    if (present_userPermissions)
+      list.add(userPermissions);
+
+    boolean present_locationIds = true && (isSetLocationIds());
+    list.add(present_locationIds);
+    if (present_locationIds)
+      list.add(locationIds);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1821,6 +2022,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetLocationIds()).compareTo(other.isSetLocationIds());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocationIds()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.locationIds, other.locationIds);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1986,6 +2197,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       first = false;
     }
+    if (!first) sb.append(", ");
+    sb.append("locationIds:");
+    if (this.locationIds == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.locationIds);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -2168,13 +2387,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 14: // NICS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list122 = iprot.readListBegin();
-                struct.nics = new ArrayList<String>(_list122.size);
-                for (int _i123 = 0; _i123 < _list122.size; ++_i123)
+                org.apache.thrift.protocol.TList _list130 = iprot.readListBegin();
+                struct.nics = new ArrayList<String>(_list130.size);
+                String _elem131;
+                for (int _i132 = 0; _i132 < _list130.size; ++_i132)
                 {
-                  String _elem124;
-                  _elem124 = iprot.readString();
-                  struct.nics.add(_elem124);
+                  _elem131 = iprot.readString();
+                  struct.nics.add(_elem131);
                 }
                 iprot.readListEnd();
               }
@@ -2186,13 +2405,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 15: // ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list125 = iprot.readListBegin();
-                struct.allowedUsers = new ArrayList<String>(_list125.size);
-                for (int _i126 = 0; _i126 < _list125.size; ++_i126)
+                org.apache.thrift.protocol.TList _list133 = iprot.readListBegin();
+                struct.allowedUsers = new ArrayList<String>(_list133.size);
+                String _elem134;
+                for (int _i135 = 0; _i135 < _list133.size; ++_i135)
                 {
-                  String _elem127;
-                  _elem127 = iprot.readString();
-                  struct.allowedUsers.add(_elem127);
+                  _elem134 = iprot.readString();
+                  struct.allowedUsers.add(_elem134);
                 }
                 iprot.readListEnd();
               }
@@ -2204,14 +2423,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 16: // NETWORK_EXCEPTIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list128 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<NetRule>(_list128.size);
-                for (int _i129 = 0; _i129 < _list128.size; ++_i129)
+                org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
+                struct.networkExceptions = new ArrayList<NetRule>(_list136.size);
+                NetRule _elem137;
+                for (int _i138 = 0; _i138 < _list136.size; ++_i138)
                 {
-                  NetRule _elem130;
-                  _elem130 = new NetRule();
-                  _elem130.read(iprot);
-                  struct.networkExceptions.add(_elem130);
+                  _elem137 = new NetRule();
+                  _elem137.read(iprot);
+                  struct.networkExceptions.add(_elem137);
                 }
                 iprot.readListEnd();
               }
@@ -2254,6 +2473,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 25: // LOCATION_IDS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list139 = iprot.readListBegin();
+                struct.locationIds = new ArrayList<Integer>(_list139.size);
+                int _elem140;
+                for (int _i141 = 0; _i141 < _list139.size; ++_i141)
+                {
+                  _elem140 = iprot.readI32();
+                  struct.locationIds.add(_elem140);
+                }
+                iprot.readListEnd();
+              }
+              struct.setLocationIdsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -2321,9 +2558,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NICS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size()));
-          for (String _iter131 : struct.nics)
+          for (String _iter142 : struct.nics)
           {
-            oprot.writeString(_iter131);
+            oprot.writeString(_iter142);
           }
           oprot.writeListEnd();
         }
@@ -2333,9 +2570,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(ALLOWED_USERS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.allowedUsers.size()));
-          for (String _iter132 : struct.allowedUsers)
+          for (String _iter143 : struct.allowedUsers)
           {
-            oprot.writeString(_iter132);
+            oprot.writeString(_iter143);
           }
           oprot.writeListEnd();
         }
@@ -2345,9 +2582,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size()));
-          for (NetRule _iter133 : struct.networkExceptions)
+          for (NetRule _iter144 : struct.networkExceptions)
           {
-            _iter133.write(oprot);
+            _iter144.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -2387,6 +2624,18 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeString(struct.imageBaseId);
         oprot.writeFieldEnd();
       }
+      if (struct.locationIds != null) {
+        oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size()));
+          for (int _iter145 : struct.locationIds)
+          {
+            oprot.writeI32(_iter145);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -2474,7 +2723,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetUserPermissions()) {
         optionals.set(22);
       }
-      oprot.writeBitSet(optionals, 23);
+      if (struct.isSetLocationIds()) {
+        optionals.set(23);
+      }
+      oprot.writeBitSet(optionals, 24);
       if (struct.isSetLectureId()) {
         oprot.writeString(struct.lectureId);
       }
@@ -2526,27 +2778,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter134 : struct.nics)
+          for (String _iter146 : struct.nics)
           {
-            oprot.writeString(_iter134);
+            oprot.writeString(_iter146);
           }
         }
       }
       if (struct.isSetAllowedUsers()) {
         {
           oprot.writeI32(struct.allowedUsers.size());
-          for (String _iter135 : struct.allowedUsers)
+          for (String _iter147 : struct.allowedUsers)
           {
-            oprot.writeString(_iter135);
+            oprot.writeString(_iter147);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter136 : struct.networkExceptions)
+          for (NetRule _iter148 : struct.networkExceptions)
           {
-            _iter136.write(oprot);
+            _iter148.write(oprot);
           }
         }
       }
@@ -2562,12 +2814,21 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetUserPermissions()) {
         struct.userPermissions.write(oprot);
       }
+      if (struct.isSetLocationIds()) {
+        {
+          oprot.writeI32(struct.locationIds.size());
+          for (int _iter149 : struct.locationIds)
+          {
+            oprot.writeI32(_iter149);
+          }
+        }
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureRead struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(23);
+      BitSet incoming = iprot.readBitSet(24);
       if (incoming.get(0)) {
         struct.lectureId = iprot.readString();
         struct.setLectureIdIsSet(true);
@@ -2634,40 +2895,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(16)) {
         {
-          org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list137.size);
-          for (int _i138 = 0; _i138 < _list137.size; ++_i138)
+          org.apache.thrift.protocol.TList _list150 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.nics = new ArrayList<String>(_list150.size);
+          String _elem151;
+          for (int _i152 = 0; _i152 < _list150.size; ++_i152)
           {
-            String _elem139;
-            _elem139 = iprot.readString();
-            struct.nics.add(_elem139);
+            _elem151 = iprot.readString();
+            struct.nics.add(_elem151);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(17)) {
         {
-          org.apache.thrift.protocol.TList _list140 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.allowedUsers = new ArrayList<String>(_list140.size);
-          for (int _i141 = 0; _i141 < _list140.size; ++_i141)
+          org.apache.thrift.protocol.TList _list153 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.allowedUsers = new ArrayList<String>(_list153.size);
+          String _elem154;
+          for (int _i155 = 0; _i155 < _list153.size; ++_i155)
           {
-            String _elem142;
-            _elem142 = iprot.readString();
-            struct.allowedUsers.add(_elem142);
+            _elem154 = iprot.readString();
+            struct.allowedUsers.add(_elem154);
           }
         }
         struct.setAllowedUsersIsSet(true);
       }
       if (incoming.get(18)) {
         {
-          org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list143.size);
-          for (int _i144 = 0; _i144 < _list143.size; ++_i144)
+          org.apache.thrift.protocol.TList _list156 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.networkExceptions = new ArrayList<NetRule>(_list156.size);
+          NetRule _elem157;
+          for (int _i158 = 0; _i158 < _list156.size; ++_i158)
           {
-            NetRule _elem145;
-            _elem145 = new NetRule();
-            _elem145.read(iprot);
-            struct.networkExceptions.add(_elem145);
+            _elem157 = new NetRule();
+            _elem157.read(iprot);
+            struct.networkExceptions.add(_elem157);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -2690,6 +2951,19 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         struct.userPermissions.read(iprot);
         struct.setUserPermissionsIsSet(true);
       }
+      if (incoming.get(23)) {
+        {
+          org.apache.thrift.protocol.TList _list159 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.locationIds = new ArrayList<Integer>(_list159.size);
+          int _elem160;
+          for (int _i161 = 0; _i161 < _list159.size; ++_i161)
+          {
+            _elem160 = iprot.readI32();
+            struct.locationIds.add(_elem160);
+          }
+        }
+        struct.setLocationIdsIsSet(true);
+      }
     }
   }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
index 646f9f5..d2edeab 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, LectureSummary._Fields>, java.io.Serializable, Cloneable, Comparable<LectureSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureSummary");
 
@@ -188,7 +191,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   private static final int __HASINTERNETACCESS_ISSET_ID = 6;
   private static final int __ISIMAGEVERSIONUSABLE_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.USER_PERMISSIONS};
+  private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
   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);
@@ -869,19 +872,19 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return getImageBaseId();
 
     case IS_ENABLED:
-      return Boolean.valueOf(isIsEnabled());
+      return isIsEnabled();
 
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case END_TIME:
-      return Long.valueOf(getEndTime());
+      return getEndTime();
 
     case LAST_USED:
-      return Long.valueOf(getLastUsed());
+      return getLastUsed();
 
     case USE_COUNT:
-      return Integer.valueOf(getUseCount());
+      return getUseCount();
 
     case OWNER_ID:
       return getOwnerId();
@@ -890,10 +893,10 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return getUpdaterId();
 
     case IS_EXAM:
-      return Boolean.valueOf(isIsExam());
+      return isIsExam();
 
     case HAS_INTERNET_ACCESS:
-      return Boolean.valueOf(isHasInternetAccess());
+      return isHasInternetAccess();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -902,7 +905,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return getUserPermissions();
 
     case IS_IMAGE_VERSION_USABLE:
-      return Boolean.valueOf(isIsImageVersionUsable());
+      return isIsImageVersionUsable();
 
     }
     throw new IllegalStateException();
@@ -1113,7 +1116,89 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_lectureId = true && (isSetLectureId());
+    list.add(present_lectureId);
+    if (present_lectureId)
+      list.add(lectureId);
+
+    boolean present_lectureName = true && (isSetLectureName());
+    list.add(present_lectureName);
+    if (present_lectureName)
+      list.add(lectureName);
+
+    boolean present_imageVersionId = true && (isSetImageVersionId());
+    list.add(present_imageVersionId);
+    if (present_imageVersionId)
+      list.add(imageVersionId);
+
+    boolean present_imageBaseId = true && (isSetImageBaseId());
+    list.add(present_imageBaseId);
+    if (present_imageBaseId)
+      list.add(imageBaseId);
+
+    boolean present_isEnabled = true;
+    list.add(present_isEnabled);
+    if (present_isEnabled)
+      list.add(isEnabled);
+
+    boolean present_startTime = true;
+    list.add(present_startTime);
+    if (present_startTime)
+      list.add(startTime);
+
+    boolean present_endTime = true;
+    list.add(present_endTime);
+    if (present_endTime)
+      list.add(endTime);
+
+    boolean present_lastUsed = true;
+    list.add(present_lastUsed);
+    if (present_lastUsed)
+      list.add(lastUsed);
+
+    boolean present_useCount = true;
+    list.add(present_useCount);
+    if (present_useCount)
+      list.add(useCount);
+
+    boolean present_ownerId = true && (isSetOwnerId());
+    list.add(present_ownerId);
+    if (present_ownerId)
+      list.add(ownerId);
+
+    boolean present_updaterId = true && (isSetUpdaterId());
+    list.add(present_updaterId);
+    if (present_updaterId)
+      list.add(updaterId);
+
+    boolean present_isExam = true;
+    list.add(present_isExam);
+    if (present_isExam)
+      list.add(isExam);
+
+    boolean present_hasInternetAccess = true;
+    list.add(present_hasInternetAccess);
+    if (present_hasInternetAccess)
+      list.add(hasInternetAccess);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_userPermissions = true && (isSetUserPermissions());
+    list.add(present_userPermissions);
+    if (present_userPermissions)
+      list.add(userPermissions);
+
+    boolean present_isImageVersionUsable = true;
+    list.add(present_isImageVersionUsable);
+    if (present_isImageVersionUsable)
+      list.add(isImageVersionUsable);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
index 5d74611..9f29fa8 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, LectureWrite._Fields>, java.io.Serializable, Cloneable, Comparable<LectureWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureWrite");
 
@@ -50,6 +53,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   private static final org.apache.thrift.protocol.TField DEFAULT_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)15);
   private static final org.apache.thrift.protocol.TField ADD_ALLOWED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("addAllowedUsers", org.apache.thrift.protocol.TType.LIST, (short)11);
   private static final org.apache.thrift.protocol.TField REM_ALLOWED_USERS_FIELD_DESC = new org.apache.thrift.protocol.TField("remAllowedUsers", org.apache.thrift.protocol.TType.LIST, (short)16);
+  private static final org.apache.thrift.protocol.TField LOCATION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("locationIds", org.apache.thrift.protocol.TType.LIST, (short)17);
+  private static final org.apache.thrift.protocol.TField LIMIT_TO_LOCATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("limitToLocations", org.apache.thrift.protocol.TType.BOOL, (short)18);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -72,6 +77,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   public LecturePermissions defaultPermissions; // required
   public List<String> addAllowedUsers; // optional
   public List<String> remAllowedUsers; // optional
+  public List<Integer> locationIds; // required
+  public boolean limitToLocations; // 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 {
@@ -89,7 +96,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     HAS_INTERNET_ACCESS((short)14, "hasInternetAccess"),
     DEFAULT_PERMISSIONS((short)15, "defaultPermissions"),
     ADD_ALLOWED_USERS((short)11, "addAllowedUsers"),
-    REM_ALLOWED_USERS((short)16, "remAllowedUsers");
+    REM_ALLOWED_USERS((short)16, "remAllowedUsers"),
+    LOCATION_IDS((short)17, "locationIds"),
+    LIMIT_TO_LOCATIONS((short)18, "limitToLocations");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -134,6 +143,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           return ADD_ALLOWED_USERS;
         case 16: // REM_ALLOWED_USERS
           return REM_ALLOWED_USERS;
+        case 17: // LOCATION_IDS
+          return LOCATION_IDS;
+        case 18: // LIMIT_TO_LOCATIONS
+          return LIMIT_TO_LOCATIONS;
         default:
           return null;
       }
@@ -180,8 +193,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   private static final int __ENDTIME_ISSET_ID = 3;
   private static final int __ISEXAM_ISSET_ID = 4;
   private static final int __HASINTERNETACCESS_ISSET_ID = 5;
+  private static final int __LIMITTOLOCATIONS_ISSET_ID = 6;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.NETWORK_EXCEPTIONS,_Fields.ADD_ALLOWED_USERS,_Fields.REM_ALLOWED_USERS};
+  private static final _Fields optionals[] = {_Fields.NETWORK_EXCEPTIONS,_Fields.ADD_ALLOWED_USERS,_Fields.REM_ALLOWED_USERS};
   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);
@@ -219,6 +233,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     tmpMap.put(_Fields.REM_ALLOWED_USERS, new org.apache.thrift.meta_data.FieldMetaData("remAllowedUsers", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.LOCATION_IDS, new org.apache.thrift.meta_data.FieldMetaData("locationIds", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.LIMIT_TO_LOCATIONS, new org.apache.thrift.meta_data.FieldMetaData("limitToLocations", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureWrite.class, metaDataMap);
   }
@@ -238,7 +257,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     List<String> nics,
     boolean isExam,
     boolean hasInternetAccess,
-    LecturePermissions defaultPermissions)
+    LecturePermissions defaultPermissions,
+    List<Integer> locationIds,
+    boolean limitToLocations)
   {
     this();
     this.lectureName = lectureName;
@@ -259,6 +280,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     this.hasInternetAccess = hasInternetAccess;
     setHasInternetAccessIsSet(true);
     this.defaultPermissions = defaultPermissions;
+    this.locationIds = locationIds;
+    this.limitToLocations = limitToLocations;
+    setLimitToLocationsIsSet(true);
   }
 
   /**
@@ -306,6 +330,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       List<String> __this__remAllowedUsers = new ArrayList<String>(other.remAllowedUsers);
       this.remAllowedUsers = __this__remAllowedUsers;
     }
+    if (other.isSetLocationIds()) {
+      List<Integer> __this__locationIds = new ArrayList<Integer>(other.locationIds);
+      this.locationIds = __this__locationIds;
+    }
+    this.limitToLocations = other.limitToLocations;
   }
 
   public LectureWrite deepCopy() {
@@ -335,6 +364,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     this.defaultPermissions = null;
     this.addAllowedUsers = null;
     this.remAllowedUsers = null;
+    this.locationIds = null;
+    setLimitToLocationsIsSet(false);
+    this.limitToLocations = false;
   }
 
   public String getLectureName() {
@@ -751,6 +783,68 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
+  public int getLocationIdsSize() {
+    return (this.locationIds == null) ? 0 : this.locationIds.size();
+  }
+
+  public java.util.Iterator<Integer> getLocationIdsIterator() {
+    return (this.locationIds == null) ? null : this.locationIds.iterator();
+  }
+
+  public void addToLocationIds(int elem) {
+    if (this.locationIds == null) {
+      this.locationIds = new ArrayList<Integer>();
+    }
+    this.locationIds.add(elem);
+  }
+
+  public List<Integer> getLocationIds() {
+    return this.locationIds;
+  }
+
+  public LectureWrite setLocationIds(List<Integer> locationIds) {
+    this.locationIds = locationIds;
+    return this;
+  }
+
+  public void unsetLocationIds() {
+    this.locationIds = null;
+  }
+
+  /** Returns true if field locationIds is set (has been assigned a value) and false otherwise */
+  public boolean isSetLocationIds() {
+    return this.locationIds != null;
+  }
+
+  public void setLocationIdsIsSet(boolean value) {
+    if (!value) {
+      this.locationIds = null;
+    }
+  }
+
+  public boolean isLimitToLocations() {
+    return this.limitToLocations;
+  }
+
+  public LectureWrite setLimitToLocations(boolean limitToLocations) {
+    this.limitToLocations = limitToLocations;
+    setLimitToLocationsIsSet(true);
+    return this;
+  }
+
+  public void unsetLimitToLocations() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+  }
+
+  /** Returns true if field limitToLocations is set (has been assigned a value) and false otherwise */
+  public boolean isSetLimitToLocations() {
+    return EncodingUtils.testBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+  }
+
+  public void setLimitToLocationsIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case LECTURE_NAME:
@@ -873,6 +967,22 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       break;
 
+    case LOCATION_IDS:
+      if (value == null) {
+        unsetLocationIds();
+      } else {
+        setLocationIds((List<Integer>)value);
+      }
+      break;
+
+    case LIMIT_TO_LOCATIONS:
+      if (value == null) {
+        unsetLimitToLocations();
+      } else {
+        setLimitToLocations((Boolean)value);
+      }
+      break;
+
     }
   }
 
@@ -888,16 +998,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       return getImageVersionId();
 
     case AUTO_UPDATE:
-      return Boolean.valueOf(isAutoUpdate());
+      return isAutoUpdate();
 
     case IS_ENABLED:
-      return Boolean.valueOf(isIsEnabled());
+      return isIsEnabled();
 
     case START_TIME:
-      return Long.valueOf(getStartTime());
+      return getStartTime();
 
     case END_TIME:
-      return Long.valueOf(getEndTime());
+      return getEndTime();
 
     case RUNSCRIPT:
       return getRunscript();
@@ -909,10 +1019,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       return getNetworkExceptions();
 
     case IS_EXAM:
-      return Boolean.valueOf(isIsExam());
+      return isIsExam();
 
     case HAS_INTERNET_ACCESS:
-      return Boolean.valueOf(isHasInternetAccess());
+      return isHasInternetAccess();
 
     case DEFAULT_PERMISSIONS:
       return getDefaultPermissions();
@@ -923,6 +1033,12 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     case REM_ALLOWED_USERS:
       return getRemAllowedUsers();
 
+    case LOCATION_IDS:
+      return getLocationIds();
+
+    case LIMIT_TO_LOCATIONS:
+      return isLimitToLocations();
+
     }
     throw new IllegalStateException();
   }
@@ -964,6 +1080,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       return isSetAddAllowedUsers();
     case REM_ALLOWED_USERS:
       return isSetRemAllowedUsers();
+    case LOCATION_IDS:
+      return isSetLocationIds();
+    case LIMIT_TO_LOCATIONS:
+      return isSetLimitToLocations();
     }
     throw new IllegalStateException();
   }
@@ -1116,12 +1236,117 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return false;
     }
 
+    boolean this_present_locationIds = true && this.isSetLocationIds();
+    boolean that_present_locationIds = true && that.isSetLocationIds();
+    if (this_present_locationIds || that_present_locationIds) {
+      if (!(this_present_locationIds && that_present_locationIds))
+        return false;
+      if (!this.locationIds.equals(that.locationIds))
+        return false;
+    }
+
+    boolean this_present_limitToLocations = true;
+    boolean that_present_limitToLocations = true;
+    if (this_present_limitToLocations || that_present_limitToLocations) {
+      if (!(this_present_limitToLocations && that_present_limitToLocations))
+        return false;
+      if (this.limitToLocations != that.limitToLocations)
+        return false;
+    }
+
     return true;
   }
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_lectureName = true && (isSetLectureName());
+    list.add(present_lectureName);
+    if (present_lectureName)
+      list.add(lectureName);
+
+    boolean present_description = true && (isSetDescription());
+    list.add(present_description);
+    if (present_description)
+      list.add(description);
+
+    boolean present_imageVersionId = true && (isSetImageVersionId());
+    list.add(present_imageVersionId);
+    if (present_imageVersionId)
+      list.add(imageVersionId);
+
+    boolean present_autoUpdate = true;
+    list.add(present_autoUpdate);
+    if (present_autoUpdate)
+      list.add(autoUpdate);
+
+    boolean present_isEnabled = true;
+    list.add(present_isEnabled);
+    if (present_isEnabled)
+      list.add(isEnabled);
+
+    boolean present_startTime = true;
+    list.add(present_startTime);
+    if (present_startTime)
+      list.add(startTime);
+
+    boolean present_endTime = true;
+    list.add(present_endTime);
+    if (present_endTime)
+      list.add(endTime);
+
+    boolean present_runscript = true && (isSetRunscript());
+    list.add(present_runscript);
+    if (present_runscript)
+      list.add(runscript);
+
+    boolean present_nics = true && (isSetNics());
+    list.add(present_nics);
+    if (present_nics)
+      list.add(nics);
+
+    boolean present_networkExceptions = true && (isSetNetworkExceptions());
+    list.add(present_networkExceptions);
+    if (present_networkExceptions)
+      list.add(networkExceptions);
+
+    boolean present_isExam = true;
+    list.add(present_isExam);
+    if (present_isExam)
+      list.add(isExam);
+
+    boolean present_hasInternetAccess = true;
+    list.add(present_hasInternetAccess);
+    if (present_hasInternetAccess)
+      list.add(hasInternetAccess);
+
+    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
+    list.add(present_defaultPermissions);
+    if (present_defaultPermissions)
+      list.add(defaultPermissions);
+
+    boolean present_addAllowedUsers = true && (isSetAddAllowedUsers());
+    list.add(present_addAllowedUsers);
+    if (present_addAllowedUsers)
+      list.add(addAllowedUsers);
+
+    boolean present_remAllowedUsers = true && (isSetRemAllowedUsers());
+    list.add(present_remAllowedUsers);
+    if (present_remAllowedUsers)
+      list.add(remAllowedUsers);
+
+    boolean present_locationIds = true && (isSetLocationIds());
+    list.add(present_locationIds);
+    if (present_locationIds)
+      list.add(locationIds);
+
+    boolean present_limitToLocations = true;
+    list.add(present_limitToLocations);
+    if (present_limitToLocations)
+      list.add(limitToLocations);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1282,6 +1507,26 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetLocationIds()).compareTo(other.isSetLocationIds());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLocationIds()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.locationIds, other.locationIds);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetLimitToLocations()).compareTo(other.isSetLimitToLocations());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLimitToLocations()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.limitToLocations, other.limitToLocations);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1403,6 +1648,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       first = false;
     }
+    if (!first) sb.append(", ");
+    sb.append("locationIds:");
+    if (this.locationIds == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.locationIds);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("limitToLocations:");
+    sb.append(this.limitToLocations);
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1520,11 +1777,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
               {
                 org.apache.thrift.protocol.TList _list90 = iprot.readListBegin();
                 struct.nics = new ArrayList<String>(_list90.size);
-                for (int _i91 = 0; _i91 < _list90.size; ++_i91)
+                String _elem91;
+                for (int _i92 = 0; _i92 < _list90.size; ++_i92)
                 {
-                  String _elem92;
-                  _elem92 = iprot.readString();
-                  struct.nics.add(_elem92);
+                  _elem91 = iprot.readString();
+                  struct.nics.add(_elem91);
                 }
                 iprot.readListEnd();
               }
@@ -1538,12 +1795,12 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
               {
                 org.apache.thrift.protocol.TList _list93 = iprot.readListBegin();
                 struct.networkExceptions = new ArrayList<NetRule>(_list93.size);
-                for (int _i94 = 0; _i94 < _list93.size; ++_i94)
+                NetRule _elem94;
+                for (int _i95 = 0; _i95 < _list93.size; ++_i95)
                 {
-                  NetRule _elem95;
-                  _elem95 = new NetRule();
-                  _elem95.read(iprot);
-                  struct.networkExceptions.add(_elem95);
+                  _elem94 = new NetRule();
+                  _elem94.read(iprot);
+                  struct.networkExceptions.add(_elem94);
                 }
                 iprot.readListEnd();
               }
@@ -1582,11 +1839,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
               {
                 org.apache.thrift.protocol.TList _list96 = iprot.readListBegin();
                 struct.addAllowedUsers = new ArrayList<String>(_list96.size);
-                for (int _i97 = 0; _i97 < _list96.size; ++_i97)
+                String _elem97;
+                for (int _i98 = 0; _i98 < _list96.size; ++_i98)
                 {
-                  String _elem98;
-                  _elem98 = iprot.readString();
-                  struct.addAllowedUsers.add(_elem98);
+                  _elem97 = iprot.readString();
+                  struct.addAllowedUsers.add(_elem97);
                 }
                 iprot.readListEnd();
               }
@@ -1600,11 +1857,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
               {
                 org.apache.thrift.protocol.TList _list99 = iprot.readListBegin();
                 struct.remAllowedUsers = new ArrayList<String>(_list99.size);
-                for (int _i100 = 0; _i100 < _list99.size; ++_i100)
+                String _elem100;
+                for (int _i101 = 0; _i101 < _list99.size; ++_i101)
                 {
-                  String _elem101;
-                  _elem101 = iprot.readString();
-                  struct.remAllowedUsers.add(_elem101);
+                  _elem100 = iprot.readString();
+                  struct.remAllowedUsers.add(_elem100);
                 }
                 iprot.readListEnd();
               }
@@ -1613,6 +1870,32 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 17: // LOCATION_IDS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list102 = iprot.readListBegin();
+                struct.locationIds = new ArrayList<Integer>(_list102.size);
+                int _elem103;
+                for (int _i104 = 0; _i104 < _list102.size; ++_i104)
+                {
+                  _elem103 = iprot.readI32();
+                  struct.locationIds.add(_elem103);
+                }
+                iprot.readListEnd();
+              }
+              struct.setLocationIdsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 18: // LIMIT_TO_LOCATIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.limitToLocations = iprot.readBool();
+              struct.setLimitToLocationsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1664,9 +1947,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         oprot.writeFieldBegin(NICS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size()));
-          for (String _iter102 : struct.nics)
+          for (String _iter105 : struct.nics)
           {
-            oprot.writeString(_iter102);
+            oprot.writeString(_iter105);
           }
           oprot.writeListEnd();
         }
@@ -1677,9 +1960,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(ADD_ALLOWED_USERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addAllowedUsers.size()));
-            for (String _iter103 : struct.addAllowedUsers)
+            for (String _iter106 : struct.addAllowedUsers)
             {
-              oprot.writeString(_iter103);
+              oprot.writeString(_iter106);
             }
             oprot.writeListEnd();
           }
@@ -1691,9 +1974,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size()));
-            for (NetRule _iter104 : struct.networkExceptions)
+            for (NetRule _iter107 : struct.networkExceptions)
             {
-              _iter104.write(oprot);
+              _iter107.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1716,15 +1999,30 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(REM_ALLOWED_USERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.remAllowedUsers.size()));
-            for (String _iter105 : struct.remAllowedUsers)
+            for (String _iter108 : struct.remAllowedUsers)
             {
-              oprot.writeString(_iter105);
+              oprot.writeString(_iter108);
             }
             oprot.writeListEnd();
           }
           oprot.writeFieldEnd();
         }
       }
+      if (struct.locationIds != null) {
+        oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size()));
+          for (int _iter109 : struct.locationIds)
+          {
+            oprot.writeI32(_iter109);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(LIMIT_TO_LOCATIONS_FIELD_DESC);
+      oprot.writeBool(struct.limitToLocations);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1788,7 +2086,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetRemAllowedUsers()) {
         optionals.set(14);
       }
-      oprot.writeBitSet(optionals, 15);
+      if (struct.isSetLocationIds()) {
+        optionals.set(15);
+      }
+      if (struct.isSetLimitToLocations()) {
+        optionals.set(16);
+      }
+      oprot.writeBitSet(optionals, 17);
       if (struct.isSetLectureName()) {
         oprot.writeString(struct.lectureName);
       }
@@ -1816,18 +2120,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter106 : struct.nics)
+          for (String _iter110 : struct.nics)
           {
-            oprot.writeString(_iter106);
+            oprot.writeString(_iter110);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter107 : struct.networkExceptions)
+          for (NetRule _iter111 : struct.networkExceptions)
           {
-            _iter107.write(oprot);
+            _iter111.write(oprot);
           }
         }
       }
@@ -1843,27 +2147,39 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetAddAllowedUsers()) {
         {
           oprot.writeI32(struct.addAllowedUsers.size());
-          for (String _iter108 : struct.addAllowedUsers)
+          for (String _iter112 : struct.addAllowedUsers)
           {
-            oprot.writeString(_iter108);
+            oprot.writeString(_iter112);
           }
         }
       }
       if (struct.isSetRemAllowedUsers()) {
         {
           oprot.writeI32(struct.remAllowedUsers.size());
-          for (String _iter109 : struct.remAllowedUsers)
+          for (String _iter113 : struct.remAllowedUsers)
+          {
+            oprot.writeString(_iter113);
+          }
+        }
+      }
+      if (struct.isSetLocationIds()) {
+        {
+          oprot.writeI32(struct.locationIds.size());
+          for (int _iter114 : struct.locationIds)
           {
-            oprot.writeString(_iter109);
+            oprot.writeI32(_iter114);
           }
         }
       }
+      if (struct.isSetLimitToLocations()) {
+        oprot.writeBool(struct.limitToLocations);
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureWrite struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(15);
+      BitSet incoming = iprot.readBitSet(17);
       if (incoming.get(0)) {
         struct.lectureName = iprot.readString();
         struct.setLectureNameIsSet(true);
@@ -1898,27 +2214,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list110 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list110.size);
-          for (int _i111 = 0; _i111 < _list110.size; ++_i111)
+          org.apache.thrift.protocol.TList _list115 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.nics = new ArrayList<String>(_list115.size);
+          String _elem116;
+          for (int _i117 = 0; _i117 < _list115.size; ++_i117)
           {
-            String _elem112;
-            _elem112 = iprot.readString();
-            struct.nics.add(_elem112);
+            _elem116 = iprot.readString();
+            struct.nics.add(_elem116);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list113 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list113.size);
-          for (int _i114 = 0; _i114 < _list113.size; ++_i114)
+          org.apache.thrift.protocol.TList _list118 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.networkExceptions = new ArrayList<NetRule>(_list118.size);
+          NetRule _elem119;
+          for (int _i120 = 0; _i120 < _list118.size; ++_i120)
           {
-            NetRule _elem115;
-            _elem115 = new NetRule();
-            _elem115.read(iprot);
-            struct.networkExceptions.add(_elem115);
+            _elem119 = new NetRule();
+            _elem119.read(iprot);
+            struct.networkExceptions.add(_elem119);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -1938,30 +2254,47 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(13)) {
         {
-          org.apache.thrift.protocol.TList _list116 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.addAllowedUsers = new ArrayList<String>(_list116.size);
-          for (int _i117 = 0; _i117 < _list116.size; ++_i117)
+          org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.addAllowedUsers = new ArrayList<String>(_list121.size);
+          String _elem122;
+          for (int _i123 = 0; _i123 < _list121.size; ++_i123)
           {
-            String _elem118;
-            _elem118 = iprot.readString();
-            struct.addAllowedUsers.add(_elem118);
+            _elem122 = iprot.readString();
+            struct.addAllowedUsers.add(_elem122);
           }
         }
         struct.setAddAllowedUsersIsSet(true);
       }
       if (incoming.get(14)) {
         {
-          org.apache.thrift.protocol.TList _list119 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.remAllowedUsers = new ArrayList<String>(_list119.size);
-          for (int _i120 = 0; _i120 < _list119.size; ++_i120)
+          org.apache.thrift.protocol.TList _list124 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.remAllowedUsers = new ArrayList<String>(_list124.size);
+          String _elem125;
+          for (int _i126 = 0; _i126 < _list124.size; ++_i126)
           {
-            String _elem121;
-            _elem121 = iprot.readString();
-            struct.remAllowedUsers.add(_elem121);
+            _elem125 = iprot.readString();
+            struct.remAllowedUsers.add(_elem125);
           }
         }
         struct.setRemAllowedUsersIsSet(true);
       }
+      if (incoming.get(15)) {
+        {
+          org.apache.thrift.protocol.TList _list127 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.locationIds = new ArrayList<Integer>(_list127.size);
+          int _elem128;
+          for (int _i129 = 0; _i129 < _list127.size; ++_i129)
+          {
+            _elem128 = iprot.readI32();
+            struct.locationIds.add(_elem128);
+          }
+        }
+        struct.setLocationIdsIsSet(true);
+      }
+      if (incoming.get(16)) {
+        struct.limitToLocations = iprot.readBool();
+        struct.setLimitToLocationsIsSet(true);
+      }
     }
   }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Location.java b/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
index 0c3fe06..14d0b82 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class Location implements org.apache.thrift.TBase<Location, Location._Fields>, java.io.Serializable, Cloneable, Comparable<Location> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Location");
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
index a4b0238..1635f58 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class MasterServer {
 
   public interface Iface {
@@ -3304,7 +3307,9 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -3571,7 +3576,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       }
       throw new IllegalStateException();
@@ -3617,7 +3622,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -4028,7 +4040,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_login = true && (isSetLogin());
+      list.add(present_login);
+      if (present_login)
+        list.add(login);
+
+      boolean present_password = true && (isSetPassword());
+      list.add(present_password);
+      if (present_password)
+        list.add(password);
+
+      return list.hashCode();
     }
 
     @Override
@@ -4541,7 +4565,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -5045,7 +5086,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_login = true && (isSetLogin());
+      list.add(present_login);
+      if (present_login)
+        list.add(login);
+
+      boolean present_password = true && (isSetPassword());
+      list.add(present_password);
+      if (present_password)
+        list.add(password);
+
+      return list.hashCode();
     }
 
     @Override
@@ -5558,7 +5611,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -6121,7 +6191,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_sessionId = true && (isSetSessionId());
+      list.add(present_sessionId);
+      if (present_sessionId)
+        list.add(sessionId);
+
+      boolean present_organizationId = true && (isSetOrganizationId());
+      list.add(present_organizationId);
+      if (present_organizationId)
+        list.add(organizationId);
+
+      boolean present_searchTerm = true && (isSetSearchTerm());
+      list.add(present_searchTerm);
+      if (present_searchTerm)
+        list.add(searchTerm);
+
+      return list.hashCode();
     }
 
     @Override
@@ -6695,7 +6782,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -6825,14 +6929,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list266 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list266.size);
-                  for (int _i267 = 0; _i267 < _list266.size; ++_i267)
+                  org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
+                  struct.success = new ArrayList<UserInfo>(_list290.size);
+                  UserInfo _elem291;
+                  for (int _i292 = 0; _i292 < _list290.size; ++_i292)
                   {
-                    UserInfo _elem268;
-                    _elem268 = new UserInfo();
-                    _elem268.read(iprot);
-                    struct.success.add(_elem268);
+                    _elem291 = new UserInfo();
+                    _elem291.read(iprot);
+                    struct.success.add(_elem291);
                   }
                   iprot.readListEnd();
                 }
@@ -6878,9 +6982,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (UserInfo _iter269 : struct.success)
+            for (UserInfo _iter293 : struct.success)
             {
-              _iter269.write(oprot);
+              _iter293.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -6927,9 +7031,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter270 : struct.success)
+            for (UserInfo _iter294 : struct.success)
             {
-              _iter270.write(oprot);
+              _iter294.write(oprot);
             }
           }
         }
@@ -6947,14 +7051,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_list271.size);
-            for (int _i272 = 0; _i272 < _list271.size; ++_i272)
+            org.apache.thrift.protocol.TList _list295 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<UserInfo>(_list295.size);
+            UserInfo _elem296;
+            for (int _i297 = 0; _i297 < _list295.size; ++_i297)
             {
-              UserInfo _elem273;
-              _elem273 = new UserInfo();
-              _elem273.read(iprot);
-              struct.success.add(_elem273);
+              _elem296 = new UserInfo();
+              _elem296.read(iprot);
+              struct.success.add(_elem296);
             }
           }
           struct.setSuccessIsSet(true);
@@ -7173,7 +7277,7 @@ public class MasterServer {
         return getSessionId();
 
       case PAGE:
-        return Integer.valueOf(getPage());
+        return getPage();
 
       }
       throw new IllegalStateException();
@@ -7230,7 +7334,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_sessionId = true && (isSetSessionId());
+      list.add(present_sessionId);
+      if (present_sessionId)
+        list.add(sessionId);
+
+      boolean present_page = true;
+      list.add(present_page);
+      if (present_page)
+        list.add(page);
+
+      return list.hashCode();
     }
 
     @Override
@@ -7759,7 +7875,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -7889,14 +8022,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list274 = iprot.readListBegin();
-                  struct.success = new ArrayList<ImagePublishData>(_list274.size);
-                  for (int _i275 = 0; _i275 < _list274.size; ++_i275)
+                  org.apache.thrift.protocol.TList _list298 = iprot.readListBegin();
+                  struct.success = new ArrayList<ImagePublishData>(_list298.size);
+                  ImagePublishData _elem299;
+                  for (int _i300 = 0; _i300 < _list298.size; ++_i300)
                   {
-                    ImagePublishData _elem276;
-                    _elem276 = new ImagePublishData();
-                    _elem276.read(iprot);
-                    struct.success.add(_elem276);
+                    _elem299 = new ImagePublishData();
+                    _elem299.read(iprot);
+                    struct.success.add(_elem299);
                   }
                   iprot.readListEnd();
                 }
@@ -7942,9 +8075,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ImagePublishData _iter277 : struct.success)
+            for (ImagePublishData _iter301 : struct.success)
             {
-              _iter277.write(oprot);
+              _iter301.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7991,9 +8124,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImagePublishData _iter278 : struct.success)
+            for (ImagePublishData _iter302 : struct.success)
             {
-              _iter278.write(oprot);
+              _iter302.write(oprot);
             }
           }
         }
@@ -8011,14 +8144,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list279 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ImagePublishData>(_list279.size);
-            for (int _i280 = 0; _i280 < _list279.size; ++_i280)
+            org.apache.thrift.protocol.TList _list303 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<ImagePublishData>(_list303.size);
+            ImagePublishData _elem304;
+            for (int _i305 = 0; _i305 < _list303.size; ++_i305)
             {
-              ImagePublishData _elem281;
-              _elem281 = new ImagePublishData();
-              _elem281.read(iprot);
-              struct.success.add(_elem281);
+              _elem304 = new ImagePublishData();
+              _elem304.read(iprot);
+              struct.success.add(_elem304);
             }
           }
           struct.setSuccessIsSet(true);
@@ -8233,7 +8366,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_sessionId = true && (isSetSessionId());
+      list.add(present_sessionId);
+      if (present_sessionId)
+        list.add(sessionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -8587,7 +8727,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_ex = true && (isSetEx());
+      list.add(present_ex);
+      if (present_ex)
+        list.add(ex);
+
+      return list.hashCode();
     }
 
     @Override
@@ -8943,7 +9090,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_token = true && (isSetToken());
+      list.add(present_token);
+      if (present_token)
+        list.add(token);
+
+      return list.hashCode();
     }
 
     @Override
@@ -9356,7 +9510,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      return list.hashCode();
     }
 
     @Override
@@ -9758,7 +9924,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_serverSessionId = true && (isSetServerSessionId());
+      list.add(present_serverSessionId);
+      if (present_serverSessionId)
+        list.add(serverSessionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -10068,7 +10241,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       }
       throw new IllegalStateException();
@@ -10114,7 +10287,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -10422,7 +10602,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SATELLITE_ID:
-        return Integer.valueOf(getSatelliteId());
+        return getSatelliteId();
 
       }
       throw new IllegalStateException();
@@ -10468,7 +10648,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_satelliteId = true;
+      list.add(present_satelliteId);
+      if (present_satelliteId)
+        list.add(satelliteId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -10727,7 +10914,7 @@ public class MasterServer {
       TInvocationException error)
     {
       this();
-      this.success = success;
+      this.success = org.apache.thrift.TBaseHelper.copyBinary(success);
       this.failure = failure;
       this.error = error;
     }
@@ -10738,7 +10925,6 @@ public class MasterServer {
     public startServerAuthentication_result(startServerAuthentication_result other) {
       if (other.isSetSuccess()) {
         this.success = org.apache.thrift.TBaseHelper.copyBinary(other.success);
-;
       }
       if (other.isSetFailure()) {
         this.failure = new TAuthorizationException(other.failure);
@@ -10765,16 +10951,16 @@ public class MasterServer {
     }
 
     public ByteBuffer bufferForSuccess() {
-      return success;
+      return org.apache.thrift.TBaseHelper.copyBinary(success);
     }
 
     public startServerAuthentication_result setSuccess(byte[] success) {
-      setSuccess(success == null ? (ByteBuffer)null : ByteBuffer.wrap(success));
+      this.success = success == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(success, success.length));
       return this;
     }
 
     public startServerAuthentication_result setSuccess(ByteBuffer success) {
-      this.success = success;
+      this.success = org.apache.thrift.TBaseHelper.copyBinary(success);
       return this;
     }
 
@@ -10947,7 +11133,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -11292,7 +11495,7 @@ public class MasterServer {
       this();
       this.satelliteId = satelliteId;
       setSatelliteIdIsSet(true);
-      this.challengeResponse = challengeResponse;
+      this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(challengeResponse);
     }
 
     /**
@@ -11303,7 +11506,6 @@ public class MasterServer {
       this.satelliteId = other.satelliteId;
       if (other.isSetChallengeResponse()) {
         this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(other.challengeResponse);
-;
       }
     }
 
@@ -11347,16 +11549,16 @@ public class MasterServer {
     }
 
     public ByteBuffer bufferForChallengeResponse() {
-      return challengeResponse;
+      return org.apache.thrift.TBaseHelper.copyBinary(challengeResponse);
     }
 
     public serverAuthenticate_args setChallengeResponse(byte[] challengeResponse) {
-      setChallengeResponse(challengeResponse == null ? (ByteBuffer)null : ByteBuffer.wrap(challengeResponse));
+      this.challengeResponse = challengeResponse == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(challengeResponse, challengeResponse.length));
       return this;
     }
 
     public serverAuthenticate_args setChallengeResponse(ByteBuffer challengeResponse) {
-      this.challengeResponse = challengeResponse;
+      this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(challengeResponse);
       return this;
     }
 
@@ -11399,7 +11601,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SATELLITE_ID:
-        return Integer.valueOf(getSatelliteId());
+        return getSatelliteId();
 
       case CHALLENGE_RESPONSE:
         return getChallengeResponse();
@@ -11459,7 +11661,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_satelliteId = true;
+      list.add(present_satelliteId);
+      if (present_satelliteId)
+        list.add(satelliteId);
+
+      boolean present_challengeResponse = true && (isSetChallengeResponse());
+      list.add(present_challengeResponse);
+      if (present_challengeResponse)
+        list.add(challengeResponse);
+
+      return list.hashCode();
     }
 
     @Override
@@ -11968,7 +12182,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_errr = true && (isSetErrr());
+      list.add(present_errr);
+      if (present_errr)
+        list.add(errr);
+
+      return list.hashCode();
     }
 
     @Override
@@ -12472,7 +12703,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_serverSessionId = true && (isSetServerSessionId());
+      list.add(present_serverSessionId);
+      if (present_serverSessionId)
+        list.add(serverSessionId);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13044,7 +13287,29 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_failure2 = true && (isSetFailure2());
+      list.add(present_failure2);
+      if (present_failure2)
+        list.add(failure2);
+
+      boolean present_f3 = true && (isSetF3());
+      list.add(present_f3);
+      if (present_f3)
+        list.add(f3);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13667,7 +13932,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_serverSessionId = true && (isSetServerSessionId());
+      list.add(present_serverSessionId);
+      if (present_serverSessionId)
+        list.add(serverSessionId);
+
+      boolean present_imageDescription = true && (isSetImageDescription());
+      list.add(present_imageDescription);
+      if (present_imageDescription)
+        list.add(imageDescription);
+
+      boolean present_blockHashes = true && (isSetBlockHashes());
+      list.add(present_blockHashes);
+      if (present_blockHashes)
+        list.add(blockHashes);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13748,7 +14030,7 @@ public class MasterServer {
       if (this.blockHashes == null) {
         sb.append("null");
       } else {
-        sb.append(this.blockHashes);
+        org.apache.thrift.TBaseHelper.toString(this.blockHashes, sb);
       }
       first = false;
       sb.append(")");
@@ -13817,13 +14099,13 @@ public class MasterServer {
             case 3: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list282 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list282.size);
-                  for (int _i283 = 0; _i283 < _list282.size; ++_i283)
+                  org.apache.thrift.protocol.TList _list306 = iprot.readListBegin();
+                  struct.blockHashes = new ArrayList<ByteBuffer>(_list306.size);
+                  ByteBuffer _elem307;
+                  for (int _i308 = 0; _i308 < _list306.size; ++_i308)
                   {
-                    ByteBuffer _elem284;
-                    _elem284 = iprot.readBinary();
-                    struct.blockHashes.add(_elem284);
+                    _elem307 = iprot.readBinary();
+                    struct.blockHashes.add(_elem307);
                   }
                   iprot.readListEnd();
                 }
@@ -13861,9 +14143,9 @@ public class MasterServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter285 : struct.blockHashes)
+            for (ByteBuffer _iter309 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter285);
+              oprot.writeBinary(_iter309);
             }
             oprot.writeListEnd();
           }
@@ -13906,9 +14188,9 @@ public class MasterServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter286 : struct.blockHashes)
+            for (ByteBuffer _iter310 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter286);
+              oprot.writeBinary(_iter310);
             }
           }
         }
@@ -13929,13 +14211,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list287.size);
-            for (int _i288 = 0; _i288 < _list287.size; ++_i288)
+            org.apache.thrift.protocol.TList _list311 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.blockHashes = new ArrayList<ByteBuffer>(_list311.size);
+            ByteBuffer _elem312;
+            for (int _i313 = 0; _i313 < _list311.size; ++_i313)
             {
-              ByteBuffer _elem289;
-              _elem289 = iprot.readBinary();
-              struct.blockHashes.add(_elem289);
+              _elem312 = iprot.readBinary();
+              struct.blockHashes.add(_elem312);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -14317,7 +14599,29 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_failure2 = true && (isSetFailure2());
+      list.add(present_failure2);
+      if (present_failure2)
+        list.add(failure2);
+
+      boolean present_failure3 = true && (isSetFailure3());
+      list.add(present_failure3);
+      if (present_failure3)
+        list.add(failure3);
+
+      return list.hashCode();
     }
 
     @Override
@@ -14744,7 +15048,7 @@ public class MasterServer {
       this.addresses = addresses;
       this.modulus = modulus;
       this.exponent = exponent;
-      this.certsha256 = certsha256;
+      this.certsha256 = org.apache.thrift.TBaseHelper.copyBinary(certsha256);
     }
 
     /**
@@ -14769,7 +15073,6 @@ public class MasterServer {
       }
       if (other.isSetCertsha256()) {
         this.certsha256 = org.apache.thrift.TBaseHelper.copyBinary(other.certsha256);
-;
       }
     }
 
@@ -14928,16 +15231,16 @@ public class MasterServer {
     }
 
     public ByteBuffer bufferForCertsha256() {
-      return certsha256;
+      return org.apache.thrift.TBaseHelper.copyBinary(certsha256);
     }
 
     public registerSatellite_args setCertsha256(byte[] certsha256) {
-      setCertsha256(certsha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(certsha256));
+      this.certsha256 = certsha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(certsha256, certsha256.length));
       return this;
     }
 
     public registerSatellite_args setCertsha256(ByteBuffer certsha256) {
-      this.certsha256 = certsha256;
+      this.certsha256 = org.apache.thrift.TBaseHelper.copyBinary(certsha256);
       return this;
     }
 
@@ -15128,7 +15431,39 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_displayName = true && (isSetDisplayName());
+      list.add(present_displayName);
+      if (present_displayName)
+        list.add(displayName);
+
+      boolean present_addresses = true && (isSetAddresses());
+      list.add(present_addresses);
+      if (present_addresses)
+        list.add(addresses);
+
+      boolean present_modulus = true && (isSetModulus());
+      list.add(present_modulus);
+      if (present_modulus)
+        list.add(modulus);
+
+      boolean present_exponent = true && (isSetExponent());
+      list.add(present_exponent);
+      if (present_exponent)
+        list.add(exponent);
+
+      boolean present_certsha256 = true && (isSetCertsha256());
+      list.add(present_certsha256);
+      if (present_certsha256)
+        list.add(certsha256);
+
+      return list.hashCode();
     }
 
     @Override
@@ -15328,13 +15663,13 @@ public class MasterServer {
             case 2: // ADDRESSES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
-                  struct.addresses = new ArrayList<String>(_list290.size);
-                  for (int _i291 = 0; _i291 < _list290.size; ++_i291)
+                  org.apache.thrift.protocol.TList _list314 = iprot.readListBegin();
+                  struct.addresses = new ArrayList<String>(_list314.size);
+                  String _elem315;
+                  for (int _i316 = 0; _i316 < _list314.size; ++_i316)
                   {
-                    String _elem292;
-                    _elem292 = iprot.readString();
-                    struct.addresses.add(_elem292);
+                    _elem315 = iprot.readString();
+                    struct.addresses.add(_elem315);
                   }
                   iprot.readListEnd();
                 }
@@ -15391,9 +15726,9 @@ public class MasterServer {
           oprot.writeFieldBegin(ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size()));
-            for (String _iter293 : struct.addresses)
+            for (String _iter317 : struct.addresses)
             {
-              oprot.writeString(_iter293);
+              oprot.writeString(_iter317);
             }
             oprot.writeListEnd();
           }
@@ -15465,9 +15800,9 @@ public class MasterServer {
         if (struct.isSetAddresses()) {
           {
             oprot.writeI32(struct.addresses.size());
-            for (String _iter294 : struct.addresses)
+            for (String _iter318 : struct.addresses)
             {
-              oprot.writeString(_iter294);
+              oprot.writeString(_iter318);
             }
           }
         }
@@ -15496,13 +15831,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list295 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.addresses = new ArrayList<String>(_list295.size);
-            for (int _i296 = 0; _i296 < _list295.size; ++_i296)
+            org.apache.thrift.protocol.TList _list319 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.addresses = new ArrayList<String>(_list319.size);
+            String _elem320;
+            for (int _i321 = 0; _i321 < _list319.size; ++_i321)
             {
-              String _elem297;
-              _elem297 = iprot.readString();
-              struct.addresses.add(_elem297);
+              _elem320 = iprot.readString();
+              struct.addresses.add(_elem320);
             }
           }
           struct.setAddressesIsSet(true);
@@ -15720,7 +16055,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Integer.valueOf(getSuccess());
+        return getSuccess();
 
       case ERROR:
         return getError();
@@ -15780,7 +16115,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -16310,7 +16657,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_serverSessionId = true && (isSetServerSessionId());
+      list.add(present_serverSessionId);
+      if (present_serverSessionId)
+        list.add(serverSessionId);
+
+      boolean present_displayName = true && (isSetDisplayName());
+      list.add(present_displayName);
+      if (present_displayName)
+        list.add(displayName);
+
+      boolean present_addresses = true && (isSetAddresses());
+      list.add(present_addresses);
+      if (present_addresses)
+        list.add(addresses);
+
+      return list.hashCode();
     }
 
     @Override
@@ -16456,13 +16820,13 @@ public class MasterServer {
             case 3: // ADDRESSES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list298 = iprot.readListBegin();
-                  struct.addresses = new ArrayList<String>(_list298.size);
-                  for (int _i299 = 0; _i299 < _list298.size; ++_i299)
+                  org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
+                  struct.addresses = new ArrayList<String>(_list322.size);
+                  String _elem323;
+                  for (int _i324 = 0; _i324 < _list322.size; ++_i324)
                   {
-                    String _elem300;
-                    _elem300 = iprot.readString();
-                    struct.addresses.add(_elem300);
+                    _elem323 = iprot.readString();
+                    struct.addresses.add(_elem323);
                   }
                   iprot.readListEnd();
                 }
@@ -16500,9 +16864,9 @@ public class MasterServer {
           oprot.writeFieldBegin(ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size()));
-            for (String _iter301 : struct.addresses)
+            for (String _iter325 : struct.addresses)
             {
-              oprot.writeString(_iter301);
+              oprot.writeString(_iter325);
             }
             oprot.writeListEnd();
           }
@@ -16545,9 +16909,9 @@ public class MasterServer {
         if (struct.isSetAddresses()) {
           {
             oprot.writeI32(struct.addresses.size());
-            for (String _iter302 : struct.addresses)
+            for (String _iter326 : struct.addresses)
             {
-              oprot.writeString(_iter302);
+              oprot.writeString(_iter326);
             }
           }
         }
@@ -16567,13 +16931,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list303 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.addresses = new ArrayList<String>(_list303.size);
-            for (int _i304 = 0; _i304 < _list303.size; ++_i304)
+            org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.addresses = new ArrayList<String>(_list327.size);
+            String _elem328;
+            for (int _i329 = 0; _i329 < _list327.size; ++_i329)
             {
-              String _elem305;
-              _elem305 = iprot.readString();
-              struct.addresses.add(_elem305);
+              _elem328 = iprot.readString();
+              struct.addresses.add(_elem328);
             }
           }
           struct.setAddressesIsSet(true);
@@ -16824,7 +17188,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       case FAILURE:
         return getFailure();
@@ -16898,7 +17262,24 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -17395,7 +17776,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_sessionId = true && (isSetSessionId());
+      list.add(present_sessionId);
+      if (present_sessionId)
+        list.add(sessionId);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -17967,7 +18360,29 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_failure2 = true && (isSetFailure2());
+      list.add(present_failure2);
+      if (present_failure2)
+        list.add(failure2);
+
+      boolean present_f3 = true && (isSetF3());
+      list.add(present_f3);
+      if (present_f3)
+        list.add(f3);
+
+      return list.hashCode();
     }
 
     @Override
@@ -18390,7 +18805,9 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -18780,7 +19197,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -18892,14 +19321,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list306 = iprot.readListBegin();
-                  struct.success = new ArrayList<Organization>(_list306.size);
-                  for (int _i307 = 0; _i307 < _list306.size; ++_i307)
+                  org.apache.thrift.protocol.TList _list330 = iprot.readListBegin();
+                  struct.success = new ArrayList<Organization>(_list330.size);
+                  Organization _elem331;
+                  for (int _i332 = 0; _i332 < _list330.size; ++_i332)
                   {
-                    Organization _elem308;
-                    _elem308 = new Organization();
-                    _elem308.read(iprot);
-                    struct.success.add(_elem308);
+                    _elem331 = new Organization();
+                    _elem331.read(iprot);
+                    struct.success.add(_elem331);
                   }
                   iprot.readListEnd();
                 }
@@ -18936,9 +19365,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Organization _iter309 : struct.success)
+            for (Organization _iter333 : struct.success)
             {
-              _iter309.write(oprot);
+              _iter333.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -18977,9 +19406,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter310 : struct.success)
+            for (Organization _iter334 : struct.success)
             {
-              _iter310.write(oprot);
+              _iter334.write(oprot);
             }
           }
         }
@@ -18994,14 +19423,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list311 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Organization>(_list311.size);
-            for (int _i312 = 0; _i312 < _list311.size; ++_i312)
+            org.apache.thrift.protocol.TList _list335 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Organization>(_list335.size);
+            Organization _elem336;
+            for (int _i337 = 0; _i337 < _list335.size; ++_i337)
             {
-              Organization _elem313;
-              _elem313 = new Organization();
-              _elem313.read(iprot);
-              struct.success.add(_elem313);
+              _elem336 = new Organization();
+              _elem336.read(iprot);
+              struct.success.add(_elem336);
             }
           }
           struct.setSuccessIsSet(true);
@@ -19146,7 +19575,9 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -19536,7 +19967,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -19648,14 +20091,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list314 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list314.size);
-                  for (int _i315 = 0; _i315 < _list314.size; ++_i315)
+                  org.apache.thrift.protocol.TList _list338 = iprot.readListBegin();
+                  struct.success = new ArrayList<OperatingSystem>(_list338.size);
+                  OperatingSystem _elem339;
+                  for (int _i340 = 0; _i340 < _list338.size; ++_i340)
                   {
-                    OperatingSystem _elem316;
-                    _elem316 = new OperatingSystem();
-                    _elem316.read(iprot);
-                    struct.success.add(_elem316);
+                    _elem339 = new OperatingSystem();
+                    _elem339.read(iprot);
+                    struct.success.add(_elem339);
                   }
                   iprot.readListEnd();
                 }
@@ -19692,9 +20135,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (OperatingSystem _iter317 : struct.success)
+            for (OperatingSystem _iter341 : struct.success)
             {
-              _iter317.write(oprot);
+              _iter341.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -19733,9 +20176,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter318 : struct.success)
+            for (OperatingSystem _iter342 : struct.success)
             {
-              _iter318.write(oprot);
+              _iter342.write(oprot);
             }
           }
         }
@@ -19750,14 +20193,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list319 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_list319.size);
-            for (int _i320 = 0; _i320 < _list319.size; ++_i320)
+            org.apache.thrift.protocol.TList _list343 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<OperatingSystem>(_list343.size);
+            OperatingSystem _elem344;
+            for (int _i345 = 0; _i345 < _list343.size; ++_i345)
             {
-              OperatingSystem _elem321;
-              _elem321 = new OperatingSystem();
-              _elem321.read(iprot);
-              struct.success.add(_elem321);
+              _elem344 = new OperatingSystem();
+              _elem344.read(iprot);
+              struct.success.add(_elem344);
             }
           }
           struct.setSuccessIsSet(true);
@@ -19902,7 +20345,9 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -20292,7 +20737,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -20404,14 +20861,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
-                  struct.success = new ArrayList<Virtualizer>(_list322.size);
-                  for (int _i323 = 0; _i323 < _list322.size; ++_i323)
+                  org.apache.thrift.protocol.TList _list346 = iprot.readListBegin();
+                  struct.success = new ArrayList<Virtualizer>(_list346.size);
+                  Virtualizer _elem347;
+                  for (int _i348 = 0; _i348 < _list346.size; ++_i348)
                   {
-                    Virtualizer _elem324;
-                    _elem324 = new Virtualizer();
-                    _elem324.read(iprot);
-                    struct.success.add(_elem324);
+                    _elem347 = new Virtualizer();
+                    _elem347.read(iprot);
+                    struct.success.add(_elem347);
                   }
                   iprot.readListEnd();
                 }
@@ -20448,9 +20905,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Virtualizer _iter325 : struct.success)
+            for (Virtualizer _iter349 : struct.success)
             {
-              _iter325.write(oprot);
+              _iter349.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -20489,9 +20946,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter326 : struct.success)
+            for (Virtualizer _iter350 : struct.success)
             {
-              _iter326.write(oprot);
+              _iter350.write(oprot);
             }
           }
         }
@@ -20506,14 +20963,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Virtualizer>(_list327.size);
-            for (int _i328 = 0; _i328 < _list327.size; ++_i328)
+            org.apache.thrift.protocol.TList _list351 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Virtualizer>(_list351.size);
+            Virtualizer _elem352;
+            for (int _i353 = 0; _i353 < _list351.size; ++_i353)
             {
-              Virtualizer _elem329;
-              _elem329 = new Virtualizer();
-              _elem329.read(iprot);
-              struct.success.add(_elem329);
+              _elem352 = new Virtualizer();
+              _elem352.read(iprot);
+              struct.success.add(_elem352);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20679,7 +21136,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case START_DATE:
-        return Long.valueOf(getStartDate());
+        return getStartDate();
 
       }
       throw new IllegalStateException();
@@ -20725,7 +21182,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_startDate = true;
+      list.add(present_startDate);
+      if (present_startDate)
+        list.add(startDate);
+
+      return list.hashCode();
     }
 
     @Override
@@ -21154,7 +21618,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -21266,14 +21742,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list330 = iprot.readListBegin();
-                  struct.success = new ArrayList<MasterTag>(_list330.size);
-                  for (int _i331 = 0; _i331 < _list330.size; ++_i331)
+                  org.apache.thrift.protocol.TList _list354 = iprot.readListBegin();
+                  struct.success = new ArrayList<MasterTag>(_list354.size);
+                  MasterTag _elem355;
+                  for (int _i356 = 0; _i356 < _list354.size; ++_i356)
                   {
-                    MasterTag _elem332;
-                    _elem332 = new MasterTag();
-                    _elem332.read(iprot);
-                    struct.success.add(_elem332);
+                    _elem355 = new MasterTag();
+                    _elem355.read(iprot);
+                    struct.success.add(_elem355);
                   }
                   iprot.readListEnd();
                 }
@@ -21310,9 +21786,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (MasterTag _iter333 : struct.success)
+            for (MasterTag _iter357 : struct.success)
             {
-              _iter333.write(oprot);
+              _iter357.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -21351,9 +21827,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterTag _iter334 : struct.success)
+            for (MasterTag _iter358 : struct.success)
             {
-              _iter334.write(oprot);
+              _iter358.write(oprot);
             }
           }
         }
@@ -21368,14 +21844,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list335 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<MasterTag>(_list335.size);
-            for (int _i336 = 0; _i336 < _list335.size; ++_i336)
+            org.apache.thrift.protocol.TList _list359 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<MasterTag>(_list359.size);
+            MasterTag _elem360;
+            for (int _i361 = 0; _i361 < _list359.size; ++_i361)
             {
-              MasterTag _elem337;
-              _elem337 = new MasterTag();
-              _elem337.read(iprot);
-              struct.success.add(_elem337);
+              _elem360 = new MasterTag();
+              _elem360.read(iprot);
+              struct.success.add(_elem360);
             }
           }
           struct.setSuccessIsSet(true);
@@ -21541,7 +22017,7 @@ public class MasterServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case START_DATE:
-        return Long.valueOf(getStartDate());
+        return getStartDate();
 
       }
       throw new IllegalStateException();
@@ -21587,7 +22063,14 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_startDate = true;
+      list.add(present_startDate);
+      if (present_startDate)
+        list.add(startDate);
+
+      return list.hashCode();
     }
 
     @Override
@@ -22016,7 +22499,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -22128,14 +22623,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list338 = iprot.readListBegin();
-                  struct.success = new ArrayList<MasterSoftware>(_list338.size);
-                  for (int _i339 = 0; _i339 < _list338.size; ++_i339)
+                  org.apache.thrift.protocol.TList _list362 = iprot.readListBegin();
+                  struct.success = new ArrayList<MasterSoftware>(_list362.size);
+                  MasterSoftware _elem363;
+                  for (int _i364 = 0; _i364 < _list362.size; ++_i364)
                   {
-                    MasterSoftware _elem340;
-                    _elem340 = new MasterSoftware();
-                    _elem340.read(iprot);
-                    struct.success.add(_elem340);
+                    _elem363 = new MasterSoftware();
+                    _elem363.read(iprot);
+                    struct.success.add(_elem363);
                   }
                   iprot.readListEnd();
                 }
@@ -22172,9 +22667,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (MasterSoftware _iter341 : struct.success)
+            for (MasterSoftware _iter365 : struct.success)
             {
-              _iter341.write(oprot);
+              _iter365.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -22213,9 +22708,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterSoftware _iter342 : struct.success)
+            for (MasterSoftware _iter366 : struct.success)
             {
-              _iter342.write(oprot);
+              _iter366.write(oprot);
             }
           }
         }
@@ -22230,14 +22725,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list343 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<MasterSoftware>(_list343.size);
-            for (int _i344 = 0; _i344 < _list343.size; ++_i344)
+            org.apache.thrift.protocol.TList _list367 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<MasterSoftware>(_list367.size);
+            MasterSoftware _elem368;
+            for (int _i369 = 0; _i369 < _list367.size; ++_i369)
             {
-              MasterSoftware _elem345;
-              _elem345 = new MasterSoftware();
-              _elem345.read(iprot);
-              struct.success.add(_elem345);
+              _elem368 = new MasterSoftware();
+              _elem368.read(iprot);
+              struct.success.add(_elem368);
             }
           }
           struct.setSuccessIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
index f18183d..8eb8c49 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, MasterSoftware._Fields>, java.io.Serializable, Cloneable, Comparable<MasterSoftware> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterSoftware");
 
@@ -276,10 +279,10 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
       return getSoftware();
 
     case IS_RESTRICTED:
-      return Boolean.valueOf(isIsRestricted());
+      return isIsRestricted();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     }
     throw new IllegalStateException();
@@ -347,7 +350,24 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_software = true && (isSetSoftware());
+    list.add(present_software);
+    if (present_software)
+      list.add(software);
+
+    boolean present_isRestricted = true;
+    list.add(present_isRestricted);
+    if (present_isRestricted)
+      list.add(isRestricted);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
index 8ec9a1a..962550b 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._Fields>, java.io.Serializable, Cloneable, Comparable<MasterTag> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterTag");
 
@@ -231,7 +234,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
       return getTag();
 
     case CREATE_TIME:
-      return Long.valueOf(getCreateTime());
+      return getCreateTime();
 
     }
     throw new IllegalStateException();
@@ -288,7 +291,19 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_tag = true && (isSetTag());
+    list.add(present_tag);
+    if (present_tag)
+      list.add(tag);
+
+    boolean present_createTime = true;
+    list.add(present_createTime);
+    if (present_createTime)
+      list.add(createTime);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
index 25a4bfe..ae22bfa 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
index 773aa5c..98d3370 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields>, java.io.Serializable, Cloneable, Comparable<NetRule> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NetRule");
 
@@ -334,7 +337,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case RULE_ID:
-      return Integer.valueOf(getRuleId());
+      return getRuleId();
 
     case DIRECTION:
       return getDirection();
@@ -343,7 +346,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
       return getHost();
 
     case PORT:
-      return Integer.valueOf(getPort());
+      return getPort();
 
     }
     throw new IllegalStateException();
@@ -422,7 +425,29 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_ruleId = true;
+    list.add(present_ruleId);
+    if (present_ruleId)
+      list.add(ruleId);
+
+    boolean present_direction = true && (isSetDirection());
+    list.add(present_direction);
+    if (present_direction)
+      list.add(direction.getValue());
+
+    boolean present_host = true && (isSetHost());
+    list.add(present_host);
+    if (present_host)
+      list.add(host);
+
+    boolean present_port = true;
+    list.add(present_port);
+    if (present_port)
+      list.add(port);
+
+    return list.hashCode();
   }
 
   @Override
@@ -571,7 +596,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
             break;
           case 2: // DIRECTION
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.direction = NetDirection.findByValue(iprot.readI32());
+              struct.direction = org.openslx.bwlp.thrift.iface.NetDirection.findByValue(iprot.readI32());
               struct.setDirectionIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -678,7 +703,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
         struct.setRuleIdIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.direction = NetDirection.findByValue(iprot.readI32());
+        struct.direction = org.openslx.bwlp.thrift.iface.NetDirection.findByValue(iprot.readI32());
         struct.setDirectionIsSet(true);
       }
       if (incoming.get(2)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java b/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
index 8466a67..364ad03 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem, OperatingSystem._Fields>, java.io.Serializable, Cloneable, Comparable<OperatingSystem> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OperatingSystem");
 
@@ -422,7 +425,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case OS_ID:
-      return Integer.valueOf(getOsId());
+      return getOsId();
 
     case OS_NAME:
       return getOsName();
@@ -434,10 +437,10 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       return getArchitecture();
 
     case MAX_MEM_MB:
-      return Integer.valueOf(getMaxMemMb());
+      return getMaxMemMb();
 
     case MAX_CORES:
-      return Integer.valueOf(getMaxCores());
+      return getMaxCores();
 
     }
     throw new IllegalStateException();
@@ -538,7 +541,39 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_osId = true;
+    list.add(present_osId);
+    if (present_osId)
+      list.add(osId);
+
+    boolean present_osName = true && (isSetOsName());
+    list.add(present_osName);
+    if (present_osName)
+      list.add(osName);
+
+    boolean present_virtualizerOsId = true && (isSetVirtualizerOsId());
+    list.add(present_virtualizerOsId);
+    if (present_virtualizerOsId)
+      list.add(virtualizerOsId);
+
+    boolean present_architecture = true && (isSetArchitecture());
+    list.add(present_architecture);
+    if (present_architecture)
+      list.add(architecture);
+
+    boolean present_maxMemMb = true;
+    list.add(present_maxMemMb);
+    if (present_maxMemMb)
+      list.add(maxMemMb);
+
+    boolean present_maxCores = true;
+    list.add(present_maxCores);
+    if (present_maxCores)
+      list.add(maxCores);
+
+    return list.hashCode();
   }
 
   @Override
@@ -730,13 +765,13 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
               {
                 org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
                 struct.virtualizerOsId = new HashMap<String,String>(2*_map24.size);
-                for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+                String _key25;
+                String _val26;
+                for (int _i27 = 0; _i27 < _map24.size; ++_i27)
                 {
-                  String _key26;
-                  String _val27;
-                  _key26 = iprot.readString();
-                  _val27 = iprot.readString();
-                  struct.virtualizerOsId.put(_key26, _val27);
+                  _key25 = iprot.readString();
+                  _val26 = iprot.readString();
+                  struct.virtualizerOsId.put(_key25, _val26);
                 }
                 iprot.readMapEnd();
               }
@@ -896,13 +931,13 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         {
           org.apache.thrift.protocol.TMap _map30 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.virtualizerOsId = new HashMap<String,String>(2*_map30.size);
-          for (int _i31 = 0; _i31 < _map30.size; ++_i31)
+          String _key31;
+          String _val32;
+          for (int _i33 = 0; _i33 < _map30.size; ++_i33)
           {
-            String _key32;
-            String _val33;
-            _key32 = iprot.readString();
-            _val33 = iprot.readString();
-            struct.virtualizerOsId.put(_key32, _val33);
+            _key31 = iprot.readString();
+            _val32 = iprot.readString();
+            struct.virtualizerOsId.put(_key31, _val32);
           }
         }
         struct.setVirtualizerOsIdIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java b/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
index deffe29..2021634 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class Organization implements org.apache.thrift.TBase<Organization, Organization._Fields>, java.io.Serializable, Cloneable, Comparable<Organization> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Organization");
 
@@ -421,7 +424,29 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_organizationId = true && (isSetOrganizationId());
+    list.add(present_organizationId);
+    if (present_organizationId)
+      list.add(organizationId);
+
+    boolean present_displayName = true && (isSetDisplayName());
+    list.add(present_displayName);
+    if (present_displayName)
+      list.add(displayName);
+
+    boolean present_ecpUrl = true && (isSetEcpUrl());
+    list.add(present_ecpUrl);
+    if (present_ecpUrl)
+      list.add(ecpUrl);
+
+    boolean present_suffixList = true && (isSetSuffixList());
+    list.add(present_suffixList);
+    if (present_suffixList)
+      list.add(suffixList);
+
+    return list.hashCode();
   }
 
   @Override
@@ -595,11 +620,11 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.suffixList = new ArrayList<String>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                String _elem1;
+                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
-                  String _elem2;
-                  _elem2 = iprot.readString();
-                  struct.suffixList.add(_elem2);
+                  _elem1 = iprot.readString();
+                  struct.suffixList.add(_elem1);
                 }
                 iprot.readListEnd();
               }
@@ -721,11 +746,11 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.suffixList = new ArrayList<String>(_list5.size);
-          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+          String _elem6;
+          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
           {
-            String _elem7;
-            _elem7 = iprot.readString();
-            struct.suffixList.add(_elem7);
+            _elem6 = iprot.readString();
+            struct.suffixList.add(_elem6);
           }
         }
         struct.setSuffixListIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Role.java b/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
index d15f3b0..bbdd984 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java b/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
index f2c205c..2d498af 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._Fields>, java.io.Serializable, Cloneable, Comparable<Satellite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Satellite");
 
@@ -139,7 +142,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     this();
     this.addressList = addressList;
     this.displayName = displayName;
-    this.certSha256 = certSha256;
+    this.certSha256 = org.apache.thrift.TBaseHelper.copyBinary(certSha256);
   }
 
   /**
@@ -155,7 +158,6 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
     if (other.isSetCertSha256()) {
       this.certSha256 = org.apache.thrift.TBaseHelper.copyBinary(other.certSha256);
-;
     }
   }
 
@@ -239,16 +241,16 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
   }
 
   public ByteBuffer bufferForCertSha256() {
-    return certSha256;
+    return org.apache.thrift.TBaseHelper.copyBinary(certSha256);
   }
 
   public Satellite setCertSha256(byte[] certSha256) {
-    setCertSha256(certSha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(certSha256));
+    this.certSha256 = certSha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(certSha256, certSha256.length));
     return this;
   }
 
   public Satellite setCertSha256(ByteBuffer certSha256) {
-    this.certSha256 = certSha256;
+    this.certSha256 = org.apache.thrift.TBaseHelper.copyBinary(certSha256);
     return this;
   }
 
@@ -373,7 +375,24 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_addressList = true && (isSetAddressList());
+    list.add(present_addressList);
+    if (present_addressList)
+      list.add(addressList);
+
+    boolean present_displayName = true && (isSetDisplayName());
+    list.add(present_displayName);
+    if (present_displayName)
+      list.add(displayName);
+
+    boolean present_certSha256 = true && (isSetCertSha256());
+    list.add(present_certSha256);
+    if (present_certSha256)
+      list.add(certSha256);
+
+    return list.hashCode();
   }
 
   @Override
@@ -505,11 +524,11 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
               {
                 org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
                 struct.addressList = new ArrayList<String>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                String _elem9;
+                for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
-                  String _elem10;
-                  _elem10 = iprot.readString();
-                  struct.addressList.add(_elem10);
+                  _elem9 = iprot.readString();
+                  struct.addressList.add(_elem9);
                 }
                 iprot.readListEnd();
               }
@@ -624,11 +643,11 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
         {
           org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.addressList = new ArrayList<String>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          String _elem14;
+          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
-            String _elem15;
-            _elem15 = iprot.readString();
-            struct.addressList.add(_elem15);
+            _elem14 = iprot.readString();
+            struct.addressList.add(_elem14);
           }
         }
         struct.setAddressListIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
index 2fa5929..6535b44 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig, SatelliteConfig._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteConfig");
 
@@ -140,7 +143,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   private static final int __MAXTRANSFERS_ISSET_ID = 3;
   private static final int __MAXCONNECTIONSPERTRANSFER_ISSET_ID = 4;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.MAX_TRANSFERS,_Fields.MAX_CONNECTIONS_PER_TRANSFER};
+  private static final _Fields optionals[] = {_Fields.MAX_TRANSFERS,_Fields.MAX_CONNECTIONS_PER_TRANSFER};
   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);
@@ -448,7 +451,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case PAGE_SIZE:
-      return Integer.valueOf(getPageSize());
+      return getPageSize();
 
     case DEFAULT_IMAGE_PERMISSIONS:
       return getDefaultImagePermissions();
@@ -457,16 +460,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       return getDefaultLecturePermissions();
 
     case MAX_IMAGE_VALIDITY_DAYS:
-      return Integer.valueOf(getMaxImageValidityDays());
+      return getMaxImageValidityDays();
 
     case MAX_LECTURE_VALIDITY_DAYS:
-      return Integer.valueOf(getMaxLectureValidityDays());
+      return getMaxLectureValidityDays();
 
     case MAX_TRANSFERS:
-      return Integer.valueOf(getMaxTransfers());
+      return getMaxTransfers();
 
     case MAX_CONNECTIONS_PER_TRANSFER:
-      return Integer.valueOf(getMaxConnectionsPerTransfer());
+      return getMaxConnectionsPerTransfer();
 
     }
     throw new IllegalStateException();
@@ -578,7 +581,44 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_pageSize = true;
+    list.add(present_pageSize);
+    if (present_pageSize)
+      list.add(pageSize);
+
+    boolean present_defaultImagePermissions = true && (isSetDefaultImagePermissions());
+    list.add(present_defaultImagePermissions);
+    if (present_defaultImagePermissions)
+      list.add(defaultImagePermissions);
+
+    boolean present_defaultLecturePermissions = true && (isSetDefaultLecturePermissions());
+    list.add(present_defaultLecturePermissions);
+    if (present_defaultLecturePermissions)
+      list.add(defaultLecturePermissions);
+
+    boolean present_maxImageValidityDays = true;
+    list.add(present_maxImageValidityDays);
+    if (present_maxImageValidityDays)
+      list.add(maxImageValidityDays);
+
+    boolean present_maxLectureValidityDays = true;
+    list.add(present_maxLectureValidityDays);
+    if (present_maxLectureValidityDays)
+      list.add(maxLectureValidityDays);
+
+    boolean present_maxTransfers = true && (isSetMaxTransfers());
+    list.add(present_maxTransfers);
+    if (present_maxTransfers)
+      list.add(maxTransfers);
+
+    boolean present_maxConnectionsPerTransfer = true && (isSetMaxConnectionsPerTransfer());
+    list.add(present_maxConnectionsPerTransfer);
+    if (present_maxConnectionsPerTransfer)
+      list.add(maxConnectionsPerTransfer);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
index 06e4df1..1b8da61 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class SatelliteServer {
 
   public interface Iface {
@@ -70,6 +73,8 @@ public class SatelliteServer {
 
     public List<Organization> getAllOrganizations() throws org.apache.thrift.TException;
 
+    public List<Location> getLocations() throws org.apache.thrift.TException;
+
     public SatelliteStatus getStatus() throws org.apache.thrift.TException;
 
     public List<ImageSummaryRead> getImageList(String userToken, List<String> tagSearch, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
@@ -150,6 +155,8 @@ public class SatelliteServer {
 
     public void getAllOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void getLocations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void getStatus(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getImageList(String userToken, List<String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -659,6 +666,28 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllOrganizations failed: unknown result");
     }
 
+    public List<Location> getLocations() throws org.apache.thrift.TException
+    {
+      send_getLocations();
+      return recv_getLocations();
+    }
+
+    public void send_getLocations() throws org.apache.thrift.TException
+    {
+      getLocations_args args = new getLocations_args();
+      sendBase("getLocations", args);
+    }
+
+    public List<Location> recv_getLocations() throws org.apache.thrift.TException
+    {
+      getLocations_result result = new getLocations_result();
+      receiveBase(result, "getLocations");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLocations failed: unknown result");
+    }
+
     public SatelliteStatus getStatus() throws org.apache.thrift.TException
     {
       send_getStatus();
@@ -1888,6 +1917,35 @@ public class SatelliteServer {
       }
     }
 
+    public void getLocations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getLocations_call method_call = new getLocations_call(resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getLocations_call extends org.apache.thrift.async.TAsyncMethodCall {
+      public getLocations_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getLocations", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getLocations_args args = new getLocations_args();
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<Location> getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        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_getLocations();
+      }
+    }
+
     public void getStatus(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getStatus_call method_call = new getStatus_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -2674,6 +2732,7 @@ public class SatelliteServer {
       processMap.put("getOperatingSystems", new getOperatingSystems());
       processMap.put("getVirtualizers", new getVirtualizers());
       processMap.put("getAllOrganizations", new getAllOrganizations());
+      processMap.put("getLocations", new getLocations());
       processMap.put("getStatus", new getStatus());
       processMap.put("getImageList", new getImageList());
       processMap.put("getImageDetails", new getImageDetails());
@@ -3109,6 +3168,26 @@ public class SatelliteServer {
       }
     }
 
+    public static class getLocations<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getLocations_args> {
+      public getLocations() {
+        super("getLocations");
+      }
+
+      public getLocations_args getEmptyArgsInstance() {
+        return new getLocations_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getLocations_result getResult(I iface, getLocations_args args) throws org.apache.thrift.TException {
+        getLocations_result result = new getLocations_result();
+        result.success = iface.getLocations();
+        return result;
+      }
+    }
+
     public static class getStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStatus_args> {
       public getStatus() {
         super("getStatus");
@@ -3719,6 +3798,7 @@ public class SatelliteServer {
       processMap.put("getOperatingSystems", new getOperatingSystems());
       processMap.put("getVirtualizers", new getVirtualizers());
       processMap.put("getAllOrganizations", new getAllOrganizations());
+      processMap.put("getLocations", new getLocations());
       processMap.put("getStatus", new getStatus());
       processMap.put("getImageList", new getImageList());
       processMap.put("getImageDetails", new getImageDetails());
@@ -4732,6 +4812,57 @@ public class SatelliteServer {
       }
     }
 
+    public static class getLocations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocations_args, List<Location>> {
+      public getLocations() {
+        super("getLocations");
+      }
+
+      public getLocations_args getEmptyArgsInstance() {
+        return new getLocations_args();
+      }
+
+      public AsyncMethodCallback<List<Location>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<List<Location>>() { 
+          public void onComplete(List<Location> o) {
+            getLocations_result result = new getLocations_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getLocations_result result = new getLocations_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, getLocations_args args, org.apache.thrift.async.AsyncMethodCallback<List<Location>> resultHandler) throws TException {
+        iface.getLocations(resultHandler);
+      }
+    }
+
     public static class getStatus<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getStatus_args, SatelliteStatus> {
       public getStatus() {
         super("getStatus");
@@ -6244,7 +6375,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -6511,7 +6644,7 @@ public class SatelliteServer {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Long.valueOf(getSuccess());
+        return getSuccess();
 
       }
       throw new IllegalStateException();
@@ -6557,7 +6690,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -6844,7 +6984,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -7155,7 +7297,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -7447,7 +7596,7 @@ public class SatelliteServer {
       this.fileSize = fileSize;
       setFileSizeIsSet(true);
       this.blockHashes = blockHashes;
-      this.machineDescription = machineDescription;
+      this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     }
 
     /**
@@ -7468,7 +7617,6 @@ public class SatelliteServer {
       }
       if (other.isSetMachineDescription()) {
         this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(other.machineDescription);
-;
       }
     }
 
@@ -7602,16 +7750,16 @@ public class SatelliteServer {
     }
 
     public ByteBuffer bufferForMachineDescription() {
-      return machineDescription;
+      return org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     }
 
     public requestImageVersionUpload_args setMachineDescription(byte[] machineDescription) {
-      setMachineDescription(machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(machineDescription));
+      this.machineDescription = machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(machineDescription, machineDescription.length));
       return this;
     }
 
     public requestImageVersionUpload_args setMachineDescription(ByteBuffer machineDescription) {
-      this.machineDescription = machineDescription;
+      this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
       return this;
     }
 
@@ -7684,7 +7832,7 @@ public class SatelliteServer {
         return getImageBaseId();
 
       case FILE_SIZE:
-        return Long.valueOf(getFileSize());
+        return getFileSize();
 
       case BLOCK_HASHES:
         return getBlockHashes();
@@ -7780,7 +7928,34 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      boolean present_fileSize = true;
+      list.add(present_fileSize);
+      if (present_fileSize)
+        list.add(fileSize);
+
+      boolean present_blockHashes = true && (isSetBlockHashes());
+      list.add(present_blockHashes);
+      if (present_blockHashes)
+        list.add(blockHashes);
+
+      boolean present_machineDescription = true && (isSetMachineDescription());
+      list.add(present_machineDescription);
+      if (present_machineDescription)
+        list.add(machineDescription);
+
+      return list.hashCode();
     }
 
     @Override
@@ -7885,7 +8060,7 @@ public class SatelliteServer {
       if (this.blockHashes == null) {
         sb.append("null");
       } else {
-        sb.append(this.blockHashes);
+        org.apache.thrift.TBaseHelper.toString(this.blockHashes, sb);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -7968,13 +8143,13 @@ public class SatelliteServer {
             case 4: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list154 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list154.size);
-                  for (int _i155 = 0; _i155 < _list154.size; ++_i155)
+                  org.apache.thrift.protocol.TList _list170 = iprot.readListBegin();
+                  struct.blockHashes = new ArrayList<ByteBuffer>(_list170.size);
+                  ByteBuffer _elem171;
+                  for (int _i172 = 0; _i172 < _list170.size; ++_i172)
                   {
-                    ByteBuffer _elem156;
-                    _elem156 = iprot.readBinary();
-                    struct.blockHashes.add(_elem156);
+                    _elem171 = iprot.readBinary();
+                    struct.blockHashes.add(_elem171);
                   }
                   iprot.readListEnd();
                 }
@@ -8023,9 +8198,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter157 : struct.blockHashes)
+            for (ByteBuffer _iter173 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter157);
+              oprot.writeBinary(_iter173);
             }
             oprot.writeListEnd();
           }
@@ -8082,9 +8257,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter158 : struct.blockHashes)
+            for (ByteBuffer _iter174 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter158);
+              oprot.writeBinary(_iter174);
             }
           }
         }
@@ -8111,13 +8286,13 @@ public class SatelliteServer {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list159 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list159.size);
-            for (int _i160 = 0; _i160 < _list159.size; ++_i160)
+            org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.blockHashes = new ArrayList<ByteBuffer>(_list175.size);
+            ByteBuffer _elem176;
+            for (int _i177 = 0; _i177 < _list175.size; ++_i177)
             {
-              ByteBuffer _elem161;
-              _elem161 = iprot.readBinary();
-              struct.blockHashes.add(_elem161);
+              _elem176 = iprot.readBinary();
+              struct.blockHashes.add(_elem176);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -8562,7 +8737,34 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_rejection = true && (isSetRejection());
+      list.add(present_rejection);
+      if (present_rejection)
+        list.add(rejection);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_ffff = true && (isSetFfff());
+      list.add(present_ffff);
+      if (present_ffff)
+        list.add(ffff);
+
+      boolean present_sdf = true && (isSetSdf());
+      list.add(present_sdf);
+      if (present_sdf)
+        list.add(sdf);
+
+      return list.hashCode();
     }
 
     @Override
@@ -9169,7 +9371,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_uploadToken = true && (isSetUploadToken());
+      list.add(present_uploadToken);
+      if (present_uploadToken)
+        list.add(uploadToken);
+
+      boolean present_blockHashes = true && (isSetBlockHashes());
+      list.add(present_blockHashes);
+      if (present_blockHashes)
+        list.add(blockHashes);
+
+      return list.hashCode();
     }
 
     @Override
@@ -9232,7 +9446,7 @@ public class SatelliteServer {
       if (this.blockHashes == null) {
         sb.append("null");
       } else {
-        sb.append(this.blockHashes);
+        org.apache.thrift.TBaseHelper.toString(this.blockHashes, sb);
       }
       first = false;
       sb.append(")");
@@ -9289,13 +9503,13 @@ public class SatelliteServer {
             case 2: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list162.size);
-                  for (int _i163 = 0; _i163 < _list162.size; ++_i163)
+                  org.apache.thrift.protocol.TList _list178 = iprot.readListBegin();
+                  struct.blockHashes = new ArrayList<ByteBuffer>(_list178.size);
+                  ByteBuffer _elem179;
+                  for (int _i180 = 0; _i180 < _list178.size; ++_i180)
                   {
-                    ByteBuffer _elem164;
-                    _elem164 = iprot.readBinary();
-                    struct.blockHashes.add(_elem164);
+                    _elem179 = iprot.readBinary();
+                    struct.blockHashes.add(_elem179);
                   }
                   iprot.readListEnd();
                 }
@@ -9328,9 +9542,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter165 : struct.blockHashes)
+            for (ByteBuffer _iter181 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter165);
+              oprot.writeBinary(_iter181);
             }
             oprot.writeListEnd();
           }
@@ -9367,9 +9581,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter166 : struct.blockHashes)
+            for (ByteBuffer _iter182 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter166);
+              oprot.writeBinary(_iter182);
             }
           }
         }
@@ -9385,13 +9599,13 @@ public class SatelliteServer {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list167 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list167.size);
-            for (int _i168 = 0; _i168 < _list167.size; ++_i168)
+            org.apache.thrift.protocol.TList _list183 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.blockHashes = new ArrayList<ByteBuffer>(_list183.size);
+            ByteBuffer _elem184;
+            for (int _i185 = 0; _i185 < _list183.size; ++_i185)
             {
-              ByteBuffer _elem169;
-              _elem169 = iprot.readBinary();
-              struct.blockHashes.add(_elem169);
+              _elem184 = iprot.readBinary();
+              struct.blockHashes.add(_elem184);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -9596,7 +9810,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_ex1 = true && (isSetEx1());
+      list.add(present_ex1);
+      if (present_ex1)
+        list.add(ex1);
+
+      return list.hashCode();
     }
 
     @Override
@@ -9952,7 +10173,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_uploadToken = true && (isSetUploadToken());
+      list.add(present_uploadToken);
+      if (present_uploadToken)
+        list.add(uploadToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -10306,7 +10534,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_ex1 = true && (isSetEx1());
+      list.add(present_ex1);
+      if (present_ex1)
+        list.add(ex1);
+
+      return list.hashCode();
     }
 
     @Override
@@ -10662,7 +10897,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_uploadToken = true && (isSetUploadToken());
+      list.add(present_uploadToken);
+      if (present_uploadToken)
+        list.add(uploadToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -11075,7 +11317,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_ex1 = true && (isSetEx1());
+      list.add(present_ex1);
+      if (present_ex1)
+        list.add(ex1);
+
+      return list.hashCode();
     }
 
     @Override
@@ -11536,7 +11790,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -12167,7 +12433,34 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_rejection = true && (isSetRejection());
+      list.add(present_rejection);
+      if (present_rejection)
+        list.add(rejection);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_ffff = true && (isSetFfff());
+      list.add(present_ffff);
+      if (present_ffff)
+        list.add(ffff);
+
+      boolean present_sdf = true && (isSetSdf());
+      list.add(present_sdf);
+      if (present_sdf)
+        list.add(sdf);
+
+      return list.hashCode();
     }
 
     @Override
@@ -12698,7 +12991,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_downloadToken = true && (isSetDownloadToken());
+      list.add(present_downloadToken);
+      if (present_downloadToken)
+        list.add(downloadToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13052,7 +13352,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_ex1 = true && (isSetEx1());
+      list.add(present_ex1);
+      if (present_ex1)
+        list.add(ex1);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13408,7 +13715,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -13821,7 +14135,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -14220,7 +14546,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -14692,7 +15025,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -15137,7 +15487,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -15491,7 +15848,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_ex = true && (isSetEx());
+      list.add(present_ex);
+      if (present_ex)
+        list.add(ex);
+
+      return list.hashCode();
     }
 
     @Override
@@ -15851,7 +16215,7 @@ public class SatelliteServer {
         return getUserToken();
 
       case PAGE:
-        return Integer.valueOf(getPage());
+        return getPage();
 
       }
       throw new IllegalStateException();
@@ -15908,7 +16272,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_page = true;
+      list.add(present_page);
+      if (present_page)
+        list.add(page);
+
+      return list.hashCode();
     }
 
     @Override
@@ -16437,7 +16813,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -16567,14 +16960,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list170 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list170.size);
-                  for (int _i171 = 0; _i171 < _list170.size; ++_i171)
+                  org.apache.thrift.protocol.TList _list186 = iprot.readListBegin();
+                  struct.success = new ArrayList<UserInfo>(_list186.size);
+                  UserInfo _elem187;
+                  for (int _i188 = 0; _i188 < _list186.size; ++_i188)
                   {
-                    UserInfo _elem172;
-                    _elem172 = new UserInfo();
-                    _elem172.read(iprot);
-                    struct.success.add(_elem172);
+                    _elem187 = new UserInfo();
+                    _elem187.read(iprot);
+                    struct.success.add(_elem187);
                   }
                   iprot.readListEnd();
                 }
@@ -16620,9 +17013,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (UserInfo _iter173 : struct.success)
+            for (UserInfo _iter189 : struct.success)
             {
-              _iter173.write(oprot);
+              _iter189.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -16669,9 +17062,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter174 : struct.success)
+            for (UserInfo _iter190 : struct.success)
             {
-              _iter174.write(oprot);
+              _iter190.write(oprot);
             }
           }
         }
@@ -16689,14 +17082,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_list175.size);
-            for (int _i176 = 0; _i176 < _list175.size; ++_i176)
+            org.apache.thrift.protocol.TList _list191 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<UserInfo>(_list191.size);
+            UserInfo _elem192;
+            for (int _i193 = 0; _i193 < _list191.size; ++_i193)
             {
-              UserInfo _elem177;
-              _elem177 = new UserInfo();
-              _elem177.read(iprot);
-              struct.success.add(_elem177);
+              _elem192 = new UserInfo();
+              _elem192.read(iprot);
+              struct.success.add(_elem192);
             }
           }
           struct.setSuccessIsSet(true);
@@ -16911,7 +17304,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      return list.hashCode();
     }
 
     @Override
@@ -17383,7 +17783,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -17887,7 +18304,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_config = true && (isSetConfig());
+      list.add(present_config);
+      if (present_config)
+        list.add(config);
+
+      return list.hashCode();
     }
 
     @Override
@@ -18346,7 +18775,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_failure = true && (isSetFailure());
+      list.add(present_failure);
+      if (present_failure)
+        list.add(failure);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -18680,7 +19121,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -19011,7 +19454,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -19105,14 +19555,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list178 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list178.size);
-                  for (int _i179 = 0; _i179 < _list178.size; ++_i179)
+                  org.apache.thrift.protocol.TList _list194 = iprot.readListBegin();
+                  struct.success = new ArrayList<OperatingSystem>(_list194.size);
+                  OperatingSystem _elem195;
+                  for (int _i196 = 0; _i196 < _list194.size; ++_i196)
                   {
-                    OperatingSystem _elem180;
-                    _elem180 = new OperatingSystem();
-                    _elem180.read(iprot);
-                    struct.success.add(_elem180);
+                    _elem195 = new OperatingSystem();
+                    _elem195.read(iprot);
+                    struct.success.add(_elem195);
                   }
                   iprot.readListEnd();
                 }
@@ -19140,9 +19590,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (OperatingSystem _iter181 : struct.success)
+            for (OperatingSystem _iter197 : struct.success)
             {
-              _iter181.write(oprot);
+              _iter197.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -19173,9 +19623,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter182 : struct.success)
+            for (OperatingSystem _iter198 : struct.success)
             {
-              _iter182.write(oprot);
+              _iter198.write(oprot);
             }
           }
         }
@@ -19187,14 +19637,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list183 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_list183.size);
-            for (int _i184 = 0; _i184 < _list183.size; ++_i184)
+            org.apache.thrift.protocol.TList _list199 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<OperatingSystem>(_list199.size);
+            OperatingSystem _elem200;
+            for (int _i201 = 0; _i201 < _list199.size; ++_i201)
             {
-              OperatingSystem _elem185;
-              _elem185 = new OperatingSystem();
-              _elem185.read(iprot);
-              struct.success.add(_elem185);
+              _elem200 = new OperatingSystem();
+              _elem200.read(iprot);
+              struct.success.add(_elem200);
             }
           }
           struct.setSuccessIsSet(true);
@@ -19334,7 +19784,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -19665,7 +20117,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -19759,14 +20218,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list186 = iprot.readListBegin();
-                  struct.success = new ArrayList<Virtualizer>(_list186.size);
-                  for (int _i187 = 0; _i187 < _list186.size; ++_i187)
+                  org.apache.thrift.protocol.TList _list202 = iprot.readListBegin();
+                  struct.success = new ArrayList<Virtualizer>(_list202.size);
+                  Virtualizer _elem203;
+                  for (int _i204 = 0; _i204 < _list202.size; ++_i204)
                   {
-                    Virtualizer _elem188;
-                    _elem188 = new Virtualizer();
-                    _elem188.read(iprot);
-                    struct.success.add(_elem188);
+                    _elem203 = new Virtualizer();
+                    _elem203.read(iprot);
+                    struct.success.add(_elem203);
                   }
                   iprot.readListEnd();
                 }
@@ -19794,9 +20253,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Virtualizer _iter189 : struct.success)
+            for (Virtualizer _iter205 : struct.success)
             {
-              _iter189.write(oprot);
+              _iter205.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -19827,9 +20286,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter190 : struct.success)
+            for (Virtualizer _iter206 : struct.success)
             {
-              _iter190.write(oprot);
+              _iter206.write(oprot);
             }
           }
         }
@@ -19841,14 +20300,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list191 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Virtualizer>(_list191.size);
-            for (int _i192 = 0; _i192 < _list191.size; ++_i192)
+            org.apache.thrift.protocol.TList _list207 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Virtualizer>(_list207.size);
+            Virtualizer _elem208;
+            for (int _i209 = 0; _i209 < _list207.size; ++_i209)
             {
-              Virtualizer _elem193;
-              _elem193 = new Virtualizer();
-              _elem193.read(iprot);
-              struct.success.add(_elem193);
+              _elem208 = new Virtualizer();
+              _elem208.read(iprot);
+              struct.success.add(_elem208);
             }
           }
           struct.setSuccessIsSet(true);
@@ -19988,7 +20447,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -20319,7 +20780,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -20413,14 +20881,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list194 = iprot.readListBegin();
-                  struct.success = new ArrayList<Organization>(_list194.size);
-                  for (int _i195 = 0; _i195 < _list194.size; ++_i195)
+                  org.apache.thrift.protocol.TList _list210 = iprot.readListBegin();
+                  struct.success = new ArrayList<Organization>(_list210.size);
+                  Organization _elem211;
+                  for (int _i212 = 0; _i212 < _list210.size; ++_i212)
                   {
-                    Organization _elem196;
-                    _elem196 = new Organization();
-                    _elem196.read(iprot);
-                    struct.success.add(_elem196);
+                    _elem211 = new Organization();
+                    _elem211.read(iprot);
+                    struct.success.add(_elem211);
                   }
                   iprot.readListEnd();
                 }
@@ -20448,9 +20916,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Organization _iter197 : struct.success)
+            for (Organization _iter213 : struct.success)
             {
-              _iter197.write(oprot);
+              _iter213.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -20481,9 +20949,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter198 : struct.success)
+            for (Organization _iter214 : struct.success)
             {
-              _iter198.write(oprot);
+              _iter214.write(oprot);
             }
           }
         }
@@ -20495,14 +20963,677 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list199 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Organization>(_list199.size);
-            for (int _i200 = 0; _i200 < _list199.size; ++_i200)
+            org.apache.thrift.protocol.TList _list215 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Organization>(_list215.size);
+            Organization _elem216;
+            for (int _i217 = 0; _i217 < _list215.size; ++_i217)
             {
-              Organization _elem201;
-              _elem201 = new Organization();
-              _elem201.read(iprot);
-              struct.success.add(_elem201);
+              _elem216 = new Organization();
+              _elem216.read(iprot);
+              struct.success.add(_elem216);
+            }
+          }
+          struct.setSuccessIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class getLocations_args implements org.apache.thrift.TBase<getLocations_args, getLocations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLocations_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLocations_args");
+
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new getLocations_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getLocations_argsTupleSchemeFactory());
+    }
+
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+;
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      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) {
+          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;
+      }
+    }
+    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);
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocations_args.class, metaDataMap);
+    }
+
+    public getLocations_args() {
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getLocations_args(getLocations_args other) {
+    }
+
+    public getLocations_args deepCopy() {
+      return new getLocations_args(this);
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      }
+      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) {
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof getLocations_args)
+        return this.equals((getLocations_args)that);
+      return false;
+    }
+
+    public boolean equals(getLocations_args that) {
+      if (that == null)
+        return false;
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
+    }
+
+    @Override
+    public int compareTo(getLocations_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      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("getLocations_args(");
+      boolean first = true;
+
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class getLocations_argsStandardSchemeFactory implements SchemeFactory {
+      public getLocations_argsStandardScheme getScheme() {
+        return new getLocations_argsStandardScheme();
+      }
+    }
+
+    private static class getLocations_argsStandardScheme extends StandardScheme<getLocations_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getLocations_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            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, getLocations_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getLocations_argsTupleSchemeFactory implements SchemeFactory {
+      public getLocations_argsTupleScheme getScheme() {
+        return new getLocations_argsTupleScheme();
+      }
+    }
+
+    private static class getLocations_argsTupleScheme extends TupleScheme<getLocations_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getLocations_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getLocations_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+      }
+    }
+
+  }
+
+  public static class getLocations_result implements org.apache.thrift.TBase<getLocations_result, getLocations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLocations_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLocations_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);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new getLocations_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getLocations_resultTupleSchemeFactory());
+    }
+
+    public List<Location> success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      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.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Location.class))));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocations_result.class, metaDataMap);
+    }
+
+    public getLocations_result() {
+    }
+
+    public getLocations_result(
+      List<Location> success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public getLocations_result(getLocations_result other) {
+      if (other.isSetSuccess()) {
+        List<Location> __this__success = new ArrayList<Location>(other.success.size());
+        for (Location other_element : other.success) {
+          __this__success.add(new Location(other_element));
+        }
+        this.success = __this__success;
+      }
+    }
+
+    public getLocations_result deepCopy() {
+      return new getLocations_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public java.util.Iterator<Location> getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void addToSuccess(Location elem) {
+      if (this.success == null) {
+        this.success = new ArrayList<Location>();
+      }
+      this.success.add(elem);
+    }
+
+    public List<Location> getSuccess() {
+      return this.success;
+    }
+
+    public getLocations_result setSuccess(List<Location> 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((List<Location>)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 getLocations_result)
+        return this.equals((getLocations_result)that);
+      return false;
+    }
+
+    public boolean equals(getLocations_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() {
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
+    }
+
+    @Override
+    public int compareTo(getLocations_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("getLocations_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
+    }
+
+    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 getLocations_resultStandardSchemeFactory implements SchemeFactory {
+      public getLocations_resultStandardScheme getScheme() {
+        return new getLocations_resultStandardScheme();
+      }
+    }
+
+    private static class getLocations_resultStandardScheme extends StandardScheme<getLocations_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getLocations_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        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.LIST) {
+                {
+                  org.apache.thrift.protocol.TList _list218 = iprot.readListBegin();
+                  struct.success = new ArrayList<Location>(_list218.size);
+                  Location _elem219;
+                  for (int _i220 = 0; _i220 < _list218.size; ++_i220)
+                  {
+                    _elem219 = new Location();
+                    _elem219.read(iprot);
+                    struct.success.add(_elem219);
+                  }
+                  iprot.readListEnd();
+                }
+                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, getLocations_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          {
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
+            for (Location _iter221 : struct.success)
+            {
+              _iter221.write(oprot);
+            }
+            oprot.writeListEnd();
+          }
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class getLocations_resultTupleSchemeFactory implements SchemeFactory {
+      public getLocations_resultTupleScheme getScheme() {
+        return new getLocations_resultTupleScheme();
+      }
+    }
+
+    private static class getLocations_resultTupleScheme extends TupleScheme<getLocations_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, getLocations_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          {
+            oprot.writeI32(struct.success.size());
+            for (Location _iter222 : struct.success)
+            {
+              _iter222.write(oprot);
+            }
+          }
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, getLocations_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          {
+            org.apache.thrift.protocol.TList _list223 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Location>(_list223.size);
+            Location _elem224;
+            for (int _i225 = 0; _i225 < _list223.size; ++_i225)
+            {
+              _elem224 = new Location();
+              _elem224.read(iprot);
+              struct.success.add(_elem224);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20642,7 +21773,9 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -20953,7 +22086,14 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -21381,7 +22521,7 @@ public class SatelliteServer {
         return getTagSearch();
 
       case PAGE:
-        return Integer.valueOf(getPage());
+        return getPage();
 
       }
       throw new IllegalStateException();
@@ -21449,7 +22589,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_tagSearch = true && (isSetTagSearch());
+      list.add(present_tagSearch);
+      if (present_tagSearch)
+        list.add(tagSearch);
+
+      boolean present_page = true;
+      list.add(present_page);
+      if (present_page)
+        list.add(page);
+
+      return list.hashCode();
     }
 
     @Override
@@ -21585,13 +22742,13 @@ public class SatelliteServer {
             case 2: // TAG_SEARCH
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list202 = iprot.readListBegin();
-                  struct.tagSearch = new ArrayList<String>(_list202.size);
-                  for (int _i203 = 0; _i203 < _list202.size; ++_i203)
+                  org.apache.thrift.protocol.TList _list226 = iprot.readListBegin();
+                  struct.tagSearch = new ArrayList<String>(_list226.size);
+                  String _elem227;
+                  for (int _i228 = 0; _i228 < _list226.size; ++_i228)
                   {
-                    String _elem204;
-                    _elem204 = iprot.readString();
-                    struct.tagSearch.add(_elem204);
+                    _elem227 = iprot.readString();
+                    struct.tagSearch.add(_elem227);
                   }
                   iprot.readListEnd();
                 }
@@ -21632,9 +22789,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(TAG_SEARCH_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tagSearch.size()));
-            for (String _iter205 : struct.tagSearch)
+            for (String _iter229 : struct.tagSearch)
             {
-              oprot.writeString(_iter205);
+              oprot.writeString(_iter229);
             }
             oprot.writeListEnd();
           }
@@ -21677,9 +22834,9 @@ public class SatelliteServer {
         if (struct.isSetTagSearch()) {
           {
             oprot.writeI32(struct.tagSearch.size());
-            for (String _iter206 : struct.tagSearch)
+            for (String _iter230 : struct.tagSearch)
             {
-              oprot.writeString(_iter206);
+              oprot.writeString(_iter230);
             }
           }
         }
@@ -21698,13 +22855,13 @@ public class SatelliteServer {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list207 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.tagSearch = new ArrayList<String>(_list207.size);
-            for (int _i208 = 0; _i208 < _list207.size; ++_i208)
+            org.apache.thrift.protocol.TList _list231 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.tagSearch = new ArrayList<String>(_list231.size);
+            String _elem232;
+            for (int _i233 = 0; _i233 < _list231.size; ++_i233)
             {
-              String _elem209;
-              _elem209 = iprot.readString();
-              struct.tagSearch.add(_elem209);
+              _elem232 = iprot.readString();
+              struct.tagSearch.add(_elem232);
             }
           }
           struct.setTagSearchIsSet(true);
@@ -22051,7 +23208,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -22181,14 +23355,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list210 = iprot.readListBegin();
-                  struct.success = new ArrayList<ImageSummaryRead>(_list210.size);
-                  for (int _i211 = 0; _i211 < _list210.size; ++_i211)
+                  org.apache.thrift.protocol.TList _list234 = iprot.readListBegin();
+                  struct.success = new ArrayList<ImageSummaryRead>(_list234.size);
+                  ImageSummaryRead _elem235;
+                  for (int _i236 = 0; _i236 < _list234.size; ++_i236)
                   {
-                    ImageSummaryRead _elem212;
-                    _elem212 = new ImageSummaryRead();
-                    _elem212.read(iprot);
-                    struct.success.add(_elem212);
+                    _elem235 = new ImageSummaryRead();
+                    _elem235.read(iprot);
+                    struct.success.add(_elem235);
                   }
                   iprot.readListEnd();
                 }
@@ -22234,9 +23408,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ImageSummaryRead _iter213 : struct.success)
+            for (ImageSummaryRead _iter237 : struct.success)
             {
-              _iter213.write(oprot);
+              _iter237.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -22283,9 +23457,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImageSummaryRead _iter214 : struct.success)
+            for (ImageSummaryRead _iter238 : struct.success)
             {
-              _iter214.write(oprot);
+              _iter238.write(oprot);
             }
           }
         }
@@ -22303,14 +23477,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list215 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ImageSummaryRead>(_list215.size);
-            for (int _i216 = 0; _i216 < _list215.size; ++_i216)
+            org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<ImageSummaryRead>(_list239.size);
+            ImageSummaryRead _elem240;
+            for (int _i241 = 0; _i241 < _list239.size; ++_i241)
             {
-              ImageSummaryRead _elem217;
-              _elem217 = new ImageSummaryRead();
-              _elem217.read(iprot);
-              struct.success.add(_elem217);
+              _elem240 = new ImageSummaryRead();
+              _elem240.read(iprot);
+              struct.success.add(_elem240);
             }
           }
           struct.setSuccessIsSet(true);
@@ -22584,7 +23758,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -23156,7 +24342,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -23703,7 +24911,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageName = true && (isSetImageName());
+      list.add(present_imageName);
+      if (present_imageName)
+        list.add(imageName);
+
+      return list.hashCode();
     }
 
     @Override
@@ -24216,7 +25436,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_error = true && (isSetError());
+      list.add(present_error);
+      if (present_error)
+        list.add(error);
+
+      return list.hashCode();
     }
 
     @Override
@@ -24774,7 +26011,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      boolean present_image = true && (isSetImage());
+      list.add(present_image);
+      if (present_image)
+        list.add(image);
+
+      return list.hashCode();
     }
 
     @Override
@@ -25333,7 +26587,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_imgError = true && (isSetImgError());
+      list.add(present_imgError);
+      if (present_imgError)
+        list.add(imgError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -25893,7 +27164,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      boolean present_image = true && (isSetImage());
+      list.add(present_image);
+      if (present_image)
+        list.add(image);
+
+      return list.hashCode();
     }
 
     @Override
@@ -26452,7 +27740,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_imgError = true && (isSetImgError());
+      list.add(present_imgError);
+      if (present_imgError)
+        list.add(imgError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -26953,7 +28258,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -27466,7 +28783,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -27967,7 +29301,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -28480,7 +29826,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -29065,7 +30428,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      boolean present_permissions = true && (isSetPermissions());
+      list.add(present_permissions);
+      if (present_permissions)
+        list.add(permissions);
+
+      return list.hashCode();
     }
 
     @Override
@@ -29211,16 +30591,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map218 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,ImagePermissions>(2*_map218.size);
-                  for (int _i219 = 0; _i219 < _map218.size; ++_i219)
+                  org.apache.thrift.protocol.TMap _map242 = iprot.readMapBegin();
+                  struct.permissions = new HashMap<String,ImagePermissions>(2*_map242.size);
+                  String _key243;
+                  ImagePermissions _val244;
+                  for (int _i245 = 0; _i245 < _map242.size; ++_i245)
                   {
-                    String _key220;
-                    ImagePermissions _val221;
-                    _key220 = iprot.readString();
-                    _val221 = new ImagePermissions();
-                    _val221.read(iprot);
-                    struct.permissions.put(_key220, _val221);
+                    _key243 = iprot.readString();
+                    _val244 = new ImagePermissions();
+                    _val244.read(iprot);
+                    struct.permissions.put(_key243, _val244);
                   }
                   iprot.readMapEnd();
                 }
@@ -29258,10 +30638,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(PERMISSIONS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.permissions.size()));
-            for (Map.Entry<String, ImagePermissions> _iter222 : struct.permissions.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter246 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter222.getKey());
-              _iter222.getValue().write(oprot);
+              oprot.writeString(_iter246.getKey());
+              _iter246.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -29304,10 +30684,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, ImagePermissions> _iter223 : struct.permissions.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter247 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter223.getKey());
-              _iter223.getValue().write(oprot);
+              oprot.writeString(_iter247.getKey());
+              _iter247.getValue().write(oprot);
             }
           }
         }
@@ -29327,16 +30707,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map224 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.permissions = new HashMap<String,ImagePermissions>(2*_map224.size);
-            for (int _i225 = 0; _i225 < _map224.size; ++_i225)
+            org.apache.thrift.protocol.TMap _map248 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.permissions = new HashMap<String,ImagePermissions>(2*_map248.size);
+            String _key249;
+            ImagePermissions _val250;
+            for (int _i251 = 0; _i251 < _map248.size; ++_i251)
             {
-              String _key226;
-              ImagePermissions _val227;
-              _key226 = iprot.readString();
-              _val227 = new ImagePermissions();
-              _val227.read(iprot);
-              struct.permissions.put(_key226, _val227);
+              _key249 = iprot.readString();
+              _val250 = new ImagePermissions();
+              _val250.read(iprot);
+              struct.permissions.put(_key249, _val250);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -29659,7 +31039,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -30160,7 +31557,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -30757,7 +32166,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -30905,16 +32336,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map228 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,ImagePermissions>(2*_map228.size);
-                  for (int _i229 = 0; _i229 < _map228.size; ++_i229)
+                  org.apache.thrift.protocol.TMap _map252 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,ImagePermissions>(2*_map252.size);
+                  String _key253;
+                  ImagePermissions _val254;
+                  for (int _i255 = 0; _i255 < _map252.size; ++_i255)
                   {
-                    String _key230;
-                    ImagePermissions _val231;
-                    _key230 = iprot.readString();
-                    _val231 = new ImagePermissions();
-                    _val231.read(iprot);
-                    struct.success.put(_key230, _val231);
+                    _key253 = iprot.readString();
+                    _val254 = new ImagePermissions();
+                    _val254.read(iprot);
+                    struct.success.put(_key253, _val254);
                   }
                   iprot.readMapEnd();
                 }
@@ -30969,10 +32400,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Map.Entry<String, ImagePermissions> _iter232 : struct.success.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter256 : struct.success.entrySet())
             {
-              oprot.writeString(_iter232.getKey());
-              _iter232.getValue().write(oprot);
+              oprot.writeString(_iter256.getKey());
+              _iter256.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -31027,10 +32458,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, ImagePermissions> _iter233 : struct.success.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter257 : struct.success.entrySet())
             {
-              oprot.writeString(_iter233.getKey());
-              _iter233.getValue().write(oprot);
+              oprot.writeString(_iter257.getKey());
+              _iter257.getValue().write(oprot);
             }
           }
         }
@@ -31051,16 +32482,16 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map234 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new HashMap<String,ImagePermissions>(2*_map234.size);
-            for (int _i235 = 0; _i235 < _map234.size; ++_i235)
+            org.apache.thrift.protocol.TMap _map258 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new HashMap<String,ImagePermissions>(2*_map258.size);
+            String _key259;
+            ImagePermissions _val260;
+            for (int _i261 = 0; _i261 < _map258.size; ++_i261)
             {
-              String _key236;
-              ImagePermissions _val237;
-              _key236 = iprot.readString();
-              _val237 = new ImagePermissions();
-              _val237.read(iprot);
-              struct.success.put(_key236, _val237);
+              _key259 = iprot.readString();
+              _val260 = new ImagePermissions();
+              _val260.read(iprot);
+              struct.success.put(_key259, _val260);
             }
           }
           struct.setSuccessIsSet(true);
@@ -31398,7 +32829,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      boolean present_newOwnerId = true && (isSetNewOwnerId());
+      list.add(present_newOwnerId);
+      if (present_newOwnerId)
+        list.add(newOwnerId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -31952,7 +33400,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -32446,7 +33911,7 @@ public class SatelliteServer {
         return getImageBaseId();
 
       case EXPIRE_TIME:
-        return Long.valueOf(getExpireTime());
+        return getExpireTime();
 
       }
       throw new IllegalStateException();
@@ -32514,7 +33979,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageBaseId = true && (isSetImageBaseId());
+      list.add(present_imageBaseId);
+      if (present_imageBaseId)
+        list.add(imageBaseId);
+
+      boolean present_expireTime = true;
+      list.add(present_expireTime);
+      if (present_expireTime)
+        list.add(expireTime);
+
+      return list.hashCode();
     }
 
     @Override
@@ -33123,7 +34605,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      boolean present_dateError = true && (isSetDateError());
+      list.add(present_dateError);
+      if (present_dateError)
+        list.add(dateError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -33667,7 +35171,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_imageVersionId = true && (isSetImageVersionId());
+      list.add(present_imageVersionId);
+      if (present_imageVersionId)
+        list.add(imageVersionId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -34239,7 +35755,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -34781,7 +36319,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lecture = true && (isSetLecture());
+      list.add(present_lecture);
+      if (present_lecture)
+        list.add(lecture);
+
+      return list.hashCode();
     }
 
     @Override
@@ -35417,7 +36967,34 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      boolean present_dateError = true && (isSetDateError());
+      list.add(present_dateError);
+      if (present_dateError)
+        list.add(dateError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      return list.hashCode();
     }
 
     @Override
@@ -36061,7 +37638,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      boolean present_lecture = true && (isSetLecture());
+      list.add(present_lecture);
+      if (present_lecture)
+        list.add(lecture);
+
+      return list.hashCode();
     }
 
     @Override
@@ -36679,7 +38273,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      boolean present_dateError = true && (isSetDateError());
+      list.add(present_dateError);
+      if (present_dateError)
+        list.add(dateError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -37168,7 +38784,7 @@ public class SatelliteServer {
         return getUserToken();
 
       case PAGE:
-        return Integer.valueOf(getPage());
+        return getPage();
 
       }
       throw new IllegalStateException();
@@ -37225,7 +38841,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_page = true;
+      list.add(present_page);
+      if (present_page)
+        list.add(page);
+
+      return list.hashCode();
     }
 
     @Override
@@ -37754,7 +39382,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -37884,14 +39529,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list238 = iprot.readListBegin();
-                  struct.success = new ArrayList<LectureSummary>(_list238.size);
-                  for (int _i239 = 0; _i239 < _list238.size; ++_i239)
+                  org.apache.thrift.protocol.TList _list262 = iprot.readListBegin();
+                  struct.success = new ArrayList<LectureSummary>(_list262.size);
+                  LectureSummary _elem263;
+                  for (int _i264 = 0; _i264 < _list262.size; ++_i264)
                   {
-                    LectureSummary _elem240;
-                    _elem240 = new LectureSummary();
-                    _elem240.read(iprot);
-                    struct.success.add(_elem240);
+                    _elem263 = new LectureSummary();
+                    _elem263.read(iprot);
+                    struct.success.add(_elem263);
                   }
                   iprot.readListEnd();
                 }
@@ -37937,9 +39582,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (LectureSummary _iter241 : struct.success)
+            for (LectureSummary _iter265 : struct.success)
             {
-              _iter241.write(oprot);
+              _iter265.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -37986,9 +39631,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (LectureSummary _iter242 : struct.success)
+            for (LectureSummary _iter266 : struct.success)
             {
-              _iter242.write(oprot);
+              _iter266.write(oprot);
             }
           }
         }
@@ -38006,14 +39651,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list243 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<LectureSummary>(_list243.size);
-            for (int _i244 = 0; _i244 < _list243.size; ++_i244)
+            org.apache.thrift.protocol.TList _list267 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<LectureSummary>(_list267.size);
+            LectureSummary _elem268;
+            for (int _i269 = 0; _i269 < _list267.size; ++_i269)
             {
-              LectureSummary _elem245;
-              _elem245 = new LectureSummary();
-              _elem245.read(iprot);
-              struct.success.add(_elem245);
+              _elem268 = new LectureSummary();
+              _elem268.read(iprot);
+              struct.success.add(_elem268);
             }
           }
           struct.setSuccessIsSet(true);
@@ -38287,7 +39932,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -38859,7 +40516,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -39406,7 +41085,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -39919,7 +41610,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -40504,7 +42212,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      boolean present_permissions = true && (isSetPermissions());
+      list.add(present_permissions);
+      if (present_permissions)
+        list.add(permissions);
+
+      return list.hashCode();
     }
 
     @Override
@@ -40650,16 +42375,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map246 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,LecturePermissions>(2*_map246.size);
-                  for (int _i247 = 0; _i247 < _map246.size; ++_i247)
+                  org.apache.thrift.protocol.TMap _map270 = iprot.readMapBegin();
+                  struct.permissions = new HashMap<String,LecturePermissions>(2*_map270.size);
+                  String _key271;
+                  LecturePermissions _val272;
+                  for (int _i273 = 0; _i273 < _map270.size; ++_i273)
                   {
-                    String _key248;
-                    LecturePermissions _val249;
-                    _key248 = iprot.readString();
-                    _val249 = new LecturePermissions();
-                    _val249.read(iprot);
-                    struct.permissions.put(_key248, _val249);
+                    _key271 = iprot.readString();
+                    _val272 = new LecturePermissions();
+                    _val272.read(iprot);
+                    struct.permissions.put(_key271, _val272);
                   }
                   iprot.readMapEnd();
                 }
@@ -40697,10 +42422,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(PERMISSIONS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.permissions.size()));
-            for (Map.Entry<String, LecturePermissions> _iter250 : struct.permissions.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter274 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter250.getKey());
-              _iter250.getValue().write(oprot);
+              oprot.writeString(_iter274.getKey());
+              _iter274.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -40743,10 +42468,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, LecturePermissions> _iter251 : struct.permissions.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter275 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter251.getKey());
-              _iter251.getValue().write(oprot);
+              oprot.writeString(_iter275.getKey());
+              _iter275.getValue().write(oprot);
             }
           }
         }
@@ -40766,16 +42491,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map252 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.permissions = new HashMap<String,LecturePermissions>(2*_map252.size);
-            for (int _i253 = 0; _i253 < _map252.size; ++_i253)
+            org.apache.thrift.protocol.TMap _map276 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.permissions = new HashMap<String,LecturePermissions>(2*_map276.size);
+            String _key277;
+            LecturePermissions _val278;
+            for (int _i279 = 0; _i279 < _map276.size; ++_i279)
             {
-              String _key254;
-              LecturePermissions _val255;
-              _key254 = iprot.readString();
-              _val255 = new LecturePermissions();
-              _val255.read(iprot);
-              struct.permissions.put(_key254, _val255);
+              _key277 = iprot.readString();
+              _val278 = new LecturePermissions();
+              _val278.read(iprot);
+              struct.permissions.put(_key277, _val278);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -41098,7 +42823,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -41599,7 +43341,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -42196,7 +43950,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true && (isSetSuccess());
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
@@ -42344,16 +44120,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map256 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,LecturePermissions>(2*_map256.size);
-                  for (int _i257 = 0; _i257 < _map256.size; ++_i257)
+                  org.apache.thrift.protocol.TMap _map280 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,LecturePermissions>(2*_map280.size);
+                  String _key281;
+                  LecturePermissions _val282;
+                  for (int _i283 = 0; _i283 < _map280.size; ++_i283)
                   {
-                    String _key258;
-                    LecturePermissions _val259;
-                    _key258 = iprot.readString();
-                    _val259 = new LecturePermissions();
-                    _val259.read(iprot);
-                    struct.success.put(_key258, _val259);
+                    _key281 = iprot.readString();
+                    _val282 = new LecturePermissions();
+                    _val282.read(iprot);
+                    struct.success.put(_key281, _val282);
                   }
                   iprot.readMapEnd();
                 }
@@ -42408,10 +44184,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Map.Entry<String, LecturePermissions> _iter260 : struct.success.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter284 : struct.success.entrySet())
             {
-              oprot.writeString(_iter260.getKey());
-              _iter260.getValue().write(oprot);
+              oprot.writeString(_iter284.getKey());
+              _iter284.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -42466,10 +44242,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, LecturePermissions> _iter261 : struct.success.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter285 : struct.success.entrySet())
             {
-              oprot.writeString(_iter261.getKey());
-              _iter261.getValue().write(oprot);
+              oprot.writeString(_iter285.getKey());
+              _iter285.getValue().write(oprot);
             }
           }
         }
@@ -42490,16 +44266,16 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map262 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new HashMap<String,LecturePermissions>(2*_map262.size);
-            for (int _i263 = 0; _i263 < _map262.size; ++_i263)
+            org.apache.thrift.protocol.TMap _map286 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new HashMap<String,LecturePermissions>(2*_map286.size);
+            String _key287;
+            LecturePermissions _val288;
+            for (int _i289 = 0; _i289 < _map286.size; ++_i289)
             {
-              String _key264;
-              LecturePermissions _val265;
-              _key264 = iprot.readString();
-              _val265 = new LecturePermissions();
-              _val265.read(iprot);
-              struct.success.put(_key264, _val265);
+              _key287 = iprot.readString();
+              _val288 = new LecturePermissions();
+              _val288.read(iprot);
+              struct.success.put(_key287, _val288);
             }
           }
           struct.setSuccessIsSet(true);
@@ -42837,7 +44613,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_userToken = true && (isSetUserToken());
+      list.add(present_userToken);
+      if (present_userToken)
+        list.add(userToken);
+
+      boolean present_lectureId = true && (isSetLectureId());
+      list.add(present_lectureId);
+      if (present_lectureId)
+        list.add(lectureId);
+
+      boolean present_newOwnerId = true && (isSetNewOwnerId());
+      list.add(present_newOwnerId);
+      if (present_newOwnerId)
+        list.add(newOwnerId);
+
+      return list.hashCode();
     }
 
     @Override
@@ -43391,7 +45184,24 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_authError = true && (isSetAuthError());
+      list.add(present_authError);
+      if (present_authError)
+        list.add(authError);
+
+      boolean present_notFound = true && (isSetNotFound());
+      list.add(present_notFound);
+      if (present_notFound)
+        list.add(notFound);
+
+      boolean present_serverError = true && (isSetServerError());
+      list.add(present_serverError);
+      if (present_serverError)
+        list.add(serverError);
+
+      return list.hashCode();
     }
 
     @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
index 7cccb65..dc94988 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus, SatelliteStatus._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteStatus");
 
@@ -228,10 +231,10 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case AVAILABLE_STORAGE_BYTES:
-      return Long.valueOf(getAvailableStorageBytes());
+      return getAvailableStorageBytes();
 
     case SERVER_TIME:
-      return Long.valueOf(getServerTime());
+      return getServerTime();
 
     }
     throw new IllegalStateException();
@@ -288,7 +291,19 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_availableStorageBytes = true;
+    list.add(present_availableStorageBytes);
+    if (present_availableStorageBytes)
+      list.add(availableStorageBytes);
+
+    boolean present_serverTime = true;
+    list.add(present_serverTime);
+    if (present_serverTime)
+      list.add(serverTime);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
index fce3fce..c8c4247 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUserConfig, SatelliteUserConfig._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteUserConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteUserConfig");
 
@@ -183,7 +186,7 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case EMAIL_NOTIFICATIONS:
-      return Boolean.valueOf(isEmailNotifications());
+      return isEmailNotifications();
 
     }
     throw new IllegalStateException();
@@ -229,7 +232,14 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_emailNotifications = true;
+    list.add(present_emailNotifications);
+    if (present_emailNotifications)
+      list.add(emailNotifications);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
index ad100c2..5e45328 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class 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");
 
@@ -227,7 +230,14 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_sessionId = true && (isSetSessionId());
+    list.add(present_sessionId);
+    if (present_sessionId)
+      list.add(sessionId);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
index 7234e6a..838b5d2 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class 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");
 
@@ -345,7 +348,24 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_sessionId = true && (isSetSessionId());
+    list.add(present_sessionId);
+    if (present_sessionId)
+      list.add(sessionId);
+
+    boolean present_authToken = true && (isSetAuthToken());
+    list.add(present_authToken);
+    if (present_authToken)
+      list.add(authToken);
+
+    boolean present_serverAddress = true && (isSetServerAddress());
+    list.add(present_serverAddress);
+    if (present_serverAddress)
+      list.add(serverAddress);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java b/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
index 8e4486c..3774f9d 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
index 17d1db4..91cce5a 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TAuthorizationException extends TException implements org.apache.thrift.TBase<TAuthorizationException, TAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthorizationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthorizationException");
 
@@ -302,7 +305,19 @@ public class TAuthorizationException extends TException implements org.apache.th
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_number = true && (isSetNumber());
+    list.add(present_number);
+    if (present_number)
+      list.add(number.getValue());
+
+    boolean present_message = true && (isSetMessage());
+    list.add(present_message);
+    if (present_message)
+      list.add(message);
+
+    return list.hashCode();
   }
 
   @Override
@@ -413,7 +428,7 @@ public class TAuthorizationException extends TException implements org.apache.th
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = AuthorizationError.findByValue(iprot.readI32());
+              struct.number = org.openslx.bwlp.thrift.iface.AuthorizationError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -490,7 +505,7 @@ public class TAuthorizationException extends TException implements org.apache.th
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = AuthorizationError.findByValue(iprot.readI32());
+        struct.number = org.openslx.bwlp.thrift.iface.AuthorizationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
index 8a5eae0..4e01fbb 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TInvalidDateParam extends TException implements org.apache.thrift.TBase<TInvalidDateParam, TInvalidDateParam._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidDateParam> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvalidDateParam");
 
@@ -302,7 +305,19 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_number = true && (isSetNumber());
+    list.add(present_number);
+    if (present_number)
+      list.add(number.getValue());
+
+    boolean present_message = true && (isSetMessage());
+    list.add(present_message);
+    if (present_message)
+      list.add(message);
+
+    return list.hashCode();
   }
 
   @Override
@@ -413,7 +428,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = DateParamError.findByValue(iprot.readI32());
+              struct.number = org.openslx.bwlp.thrift.iface.DateParamError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -490,7 +505,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = DateParamError.findByValue(iprot.readI32());
+        struct.number = org.openslx.bwlp.thrift.iface.DateParamError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
index 9417e40..0893444 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TInvalidTokenException extends TException implements org.apache.thrift.TBase<TInvalidTokenException, TInvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidTokenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvalidTokenException");
 
@@ -162,7 +165,9 @@ public class TInvalidTokenException extends TException implements org.apache.thr
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
index e3cb257..3ea824b 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TInvocationException extends TException implements org.apache.thrift.TBase<TInvocationException, TInvocationException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvocationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvocationException");
 
@@ -302,7 +305,19 @@ public class TInvocationException extends TException implements org.apache.thrif
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_number = true && (isSetNumber());
+    list.add(present_number);
+    if (present_number)
+      list.add(number.getValue());
+
+    boolean present_message = true && (isSetMessage());
+    list.add(present_message);
+    if (present_message)
+      list.add(message);
+
+    return list.hashCode();
   }
 
   @Override
@@ -413,7 +428,7 @@ public class TInvocationException extends TException implements org.apache.thrif
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = InvocationError.findByValue(iprot.readI32());
+              struct.number = org.openslx.bwlp.thrift.iface.InvocationError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -490,7 +505,7 @@ public class TInvocationException extends TException implements org.apache.thrif
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = InvocationError.findByValue(iprot.readI32());
+        struct.number = org.openslx.bwlp.thrift.iface.InvocationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
index 03c0643..46776e8 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TNotFoundException extends TException implements org.apache.thrift.TBase<TNotFoundException, TNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TNotFoundException");
 
@@ -227,7 +230,14 @@ public class TNotFoundException extends TException implements org.apache.thrift.
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_message = true && (isSetMessage());
+    list.add(present_message);
+    if (present_message)
+      list.add(message);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
index b44f574..4ff27b2 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TTransferRejectedException extends TException implements org.apache.thrift.TBase<TTransferRejectedException, TTransferRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<TTransferRejectedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransferRejectedException");
 
@@ -227,7 +230,14 @@ public class TTransferRejectedException extends TException implements org.apache
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_message = true && (isSetMessage());
+    list.add(present_message);
+    if (present_message)
+      list.add(message);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
index 19a1d8c..7b25f2c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TransferInformation implements org.apache.thrift.TBase<TransferInformation, TransferInformation._Fields>, java.io.Serializable, Cloneable, Comparable<TransferInformation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransferInformation");
 
@@ -127,7 +130,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   private static final int __PLAINPORT_ISSET_ID = 0;
   private static final int __SSLPORT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.BLOCK_HASHES,_Fields.MACHINE_DESCRIPTION};
+  private static final _Fields optionals[] = {_Fields.BLOCK_HASHES,_Fields.MACHINE_DESCRIPTION};
   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);
@@ -178,7 +181,6 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
     if (other.isSetMachineDescription()) {
       this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(other.machineDescription);
-;
     }
   }
 
@@ -312,16 +314,16 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   }
 
   public ByteBuffer bufferForMachineDescription() {
-    return machineDescription;
+    return org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
   }
 
   public TransferInformation setMachineDescription(byte[] machineDescription) {
-    setMachineDescription(machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(machineDescription));
+    this.machineDescription = machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(machineDescription, machineDescription.length));
     return this;
   }
 
   public TransferInformation setMachineDescription(ByteBuffer machineDescription) {
-    this.machineDescription = machineDescription;
+    this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     return this;
   }
 
@@ -391,10 +393,10 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       return getToken();
 
     case PLAIN_PORT:
-      return Integer.valueOf(getPlainPort());
+      return getPlainPort();
 
     case SSL_PORT:
-      return Integer.valueOf(getSslPort());
+      return getSslPort();
 
     case BLOCK_HASHES:
       return getBlockHashes();
@@ -490,7 +492,34 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_token = true && (isSetToken());
+    list.add(present_token);
+    if (present_token)
+      list.add(token);
+
+    boolean present_plainPort = true;
+    list.add(present_plainPort);
+    if (present_plainPort)
+      list.add(plainPort);
+
+    boolean present_sslPort = true;
+    list.add(present_sslPort);
+    if (present_sslPort)
+      list.add(sslPort);
+
+    boolean present_blockHashes = true && (isSetBlockHashes());
+    list.add(present_blockHashes);
+    if (present_blockHashes)
+      list.add(blockHashes);
+
+    boolean present_machineDescription = true && (isSetMachineDescription());
+    list.add(present_machineDescription);
+    if (present_machineDescription)
+      list.add(machineDescription);
+
+    return list.hashCode();
   }
 
   @Override
@@ -592,7 +621,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (this.blockHashes == null) {
         sb.append("null");
       } else {
-        sb.append(this.blockHashes);
+        org.apache.thrift.TBaseHelper.toString(this.blockHashes, sb);
       }
       first = false;
     }
@@ -678,13 +707,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
           case 4: // BLOCK_HASHES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list146 = iprot.readListBegin();
-                struct.blockHashes = new ArrayList<ByteBuffer>(_list146.size);
-                for (int _i147 = 0; _i147 < _list146.size; ++_i147)
+                org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
+                struct.blockHashes = new ArrayList<ByteBuffer>(_list162.size);
+                ByteBuffer _elem163;
+                for (int _i164 = 0; _i164 < _list162.size; ++_i164)
                 {
-                  ByteBuffer _elem148;
-                  _elem148 = iprot.readBinary();
-                  struct.blockHashes.add(_elem148);
+                  _elem163 = iprot.readBinary();
+                  struct.blockHashes.add(_elem163);
                 }
                 iprot.readListEnd();
               }
@@ -732,9 +761,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter149 : struct.blockHashes)
+            for (ByteBuffer _iter165 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter149);
+              oprot.writeBinary(_iter165);
             }
             oprot.writeListEnd();
           }
@@ -794,9 +823,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (struct.isSetBlockHashes()) {
         {
           oprot.writeI32(struct.blockHashes.size());
-          for (ByteBuffer _iter150 : struct.blockHashes)
+          for (ByteBuffer _iter166 : struct.blockHashes)
           {
-            oprot.writeBinary(_iter150);
+            oprot.writeBinary(_iter166);
           }
         }
       }
@@ -823,13 +852,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list151 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.blockHashes = new ArrayList<ByteBuffer>(_list151.size);
-          for (int _i152 = 0; _i152 < _list151.size; ++_i152)
+          org.apache.thrift.protocol.TList _list167 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.blockHashes = new ArrayList<ByteBuffer>(_list167.size);
+          ByteBuffer _elem168;
+          for (int _i169 = 0; _i169 < _list167.size; ++_i169)
           {
-            ByteBuffer _elem153;
-            _elem153 = iprot.readBinary();
-            struct.blockHashes.add(_elem153);
+            _elem168 = iprot.readBinary();
+            struct.blockHashes.add(_elem168);
           }
         }
         struct.setBlockHashesIsSet(true);
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
index b0c7bd0..972c6c0 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
index 7d695dc..986e27d 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, TransferStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TransferStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransferStatus");
 
@@ -136,7 +139,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     TransferState state)
   {
     this();
-    this.blockStatus = blockStatus;
+    this.blockStatus = org.apache.thrift.TBaseHelper.copyBinary(blockStatus);
     this.state = state;
   }
 
@@ -146,7 +149,6 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
   public TransferStatus(TransferStatus other) {
     if (other.isSetBlockStatus()) {
       this.blockStatus = org.apache.thrift.TBaseHelper.copyBinary(other.blockStatus);
-;
     }
     if (other.isSetState()) {
       this.state = other.state;
@@ -169,16 +171,16 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
   }
 
   public ByteBuffer bufferForBlockStatus() {
-    return blockStatus;
+    return org.apache.thrift.TBaseHelper.copyBinary(blockStatus);
   }
 
   public TransferStatus setBlockStatus(byte[] blockStatus) {
-    setBlockStatus(blockStatus == null ? (ByteBuffer)null : ByteBuffer.wrap(blockStatus));
+    this.blockStatus = blockStatus == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(blockStatus, blockStatus.length));
     return this;
   }
 
   public TransferStatus setBlockStatus(ByteBuffer blockStatus) {
-    this.blockStatus = blockStatus;
+    this.blockStatus = org.apache.thrift.TBaseHelper.copyBinary(blockStatus);
     return this;
   }
 
@@ -313,7 +315,19 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_blockStatus = true && (isSetBlockStatus());
+    list.add(present_blockStatus);
+    if (present_blockStatus)
+      list.add(blockStatus);
+
+    boolean present_state = true && (isSetState());
+    list.add(present_state);
+    if (present_state)
+      list.add(state.getValue());
+
+    return list.hashCode();
   }
 
   @Override
@@ -432,7 +446,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
             break;
           case 2: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = TransferState.findByValue(iprot.readI32());
+              struct.state = org.openslx.bwlp.thrift.iface.TransferState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +519,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
         struct.setBlockStatusIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.state = TransferState.findByValue(iprot.readI32());
+        struct.state = org.openslx.bwlp.thrift.iface.TransferState.findByValue(iprot.readI32());
         struct.setStateIsSet(true);
       }
     }
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java b/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
index ea4381a..ced8149 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class 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");
 
@@ -137,7 +140,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.ROLE};
+  private static final _Fields optionals[] = {_Fields.ROLE};
   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);
@@ -537,7 +540,39 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_userId = true && (isSetUserId());
+    list.add(present_userId);
+    if (present_userId)
+      list.add(userId);
+
+    boolean present_firstName = true && (isSetFirstName());
+    list.add(present_firstName);
+    if (present_firstName)
+      list.add(firstName);
+
+    boolean present_lastName = true && (isSetLastName());
+    list.add(present_lastName);
+    if (present_lastName)
+      list.add(lastName);
+
+    boolean present_eMail = true && (isSetEMail());
+    list.add(present_eMail);
+    if (present_eMail)
+      list.add(eMail);
+
+    boolean present_organizationId = true && (isSetOrganizationId());
+    list.add(present_organizationId);
+    if (present_organizationId)
+      list.add(organizationId);
+
+    boolean present_role = true && (isSetRole());
+    list.add(present_role);
+    if (present_role)
+      list.add(role.getValue());
+
+    return list.hashCode();
   }
 
   @Override
@@ -762,7 +797,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
             break;
           case 6: // ROLE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.role = Role.findByValue(iprot.readI32());
+              struct.role = org.openslx.bwlp.thrift.iface.Role.findByValue(iprot.readI32());
               struct.setRoleIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -897,7 +932,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         struct.setOrganizationIdIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.role = Role.findByValue(iprot.readI32());
+        struct.role = org.openslx.bwlp.thrift.iface.Role.findByValue(iprot.readI32());
         struct.setRoleIsSet(true);
       }
     }
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java b/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
index 5239a9b..8cf4d13 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtualizer._Fields>, java.io.Serializable, Cloneable, Comparable<Virtualizer> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Virtualizer");
 
@@ -286,7 +289,19 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_virtId = true && (isSetVirtId());
+    list.add(present_virtId);
+    if (present_virtId)
+      list.add(virtId);
+
+    boolean present_virtName = true && (isSetVirtName());
+    list.add(present_virtName);
+    if (present_virtName)
+      list.add(virtName);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java b/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
index dc8b8f2..ad22344 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,9 +29,12 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
 public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WhoamiInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WhoamiInfo");
 
@@ -276,10 +279,10 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
       return getUser();
 
     case IS_SUPER_USER:
-      return Boolean.valueOf(isIsSuperUser());
+      return isIsSuperUser();
 
     case CAN_LIST_IMAGES:
-      return Boolean.valueOf(isCanListImages());
+      return isCanListImages();
 
     }
     throw new IllegalStateException();
@@ -347,7 +350,24 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_user = true && (isSetUser());
+    list.add(present_user);
+    if (present_user)
+      list.add(user);
+
+    boolean present_isSuperUser = true;
+    list.add(present_isSuperUser);
+    if (present_isSuperUser)
+      list.add(isSuperUser);
+
+    boolean present_canListImages = true;
+    list.add(present_canListImages);
+    if (present_canListImages)
+      list.add(canListImages);
+
+    return list.hashCode();
   }
 
   @Override
diff --git a/src/main/java/org/openslx/thrifthelper/Comparators.java b/src/main/java/org/openslx/thrifthelper/Comparators.java
index 5580cf6..99e55e5 100644
--- a/src/main/java/org/openslx/thrifthelper/Comparators.java
+++ b/src/main/java/org/openslx/thrifthelper/Comparators.java
@@ -4,6 +4,7 @@ import java.util.Comparator;
 
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
+import org.openslx.bwlp.thrift.iface.Location;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Organization;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
@@ -75,4 +76,16 @@ public class Comparators
 		}
 	};
 
+//	public static final Comparator<Location> location = new Comparator<Location>() {
+//		@Override
+//		public int compare( Location o1, Location o2 )
+//		{
+//			if ( o1 == null || o1.loca == null )
+//				return o2 == null || o2.organizationId == null ? 0 : 1;
+//			if ( o2 == null || o2.organizationId == null )
+//				return -1;
+//			return o1.organizationId.compareTo( o2.organizationId );
+//		}
+//	};
+
 }
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index 5034a03..9f8da33 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -254,6 +254,7 @@ struct LectureWrite {
 	11: optional list<string> addAllowedUsers, // add allowed to see/select image in vmchooser. These are local accounts, not bwIDM/Master
 	16: optional list<string> remAllowedUsers, // users to remove from that list
 	17: list<i32> locationIds,
+	18: bool limitToLocations,
 }
 
 struct LectureSummary {