Thrift API

7 files changed, 4444 insertions, 2803 deletions

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 e8c93a1..0de0072 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
@@ -36,16 +36,17 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImagePublishData");
 
   private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField CURRENT_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("currentVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField OS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("osId", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField VIRT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("virtId", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField BASE_CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("baseCreateTime", org.apache.thrift.protocol.TType.I64, (short)6);
-  private static final org.apache.thrift.protocol.TField VERSION_CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("versionCreateTime", org.apache.thrift.protocol.TType.I64, (short)7);
-  private static final org.apache.thrift.protocol.TField OWNER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerId", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField UPLOADER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("uploaderId", org.apache.thrift.protocol.TType.STRING, (short)9);
-  private static final org.apache.thrift.protocol.TField FILE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSize", org.apache.thrift.protocol.TType.I64, (short)11);
-  private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)16);
+  private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)6);
+  private static final org.apache.thrift.protocol.TField FILE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSize", org.apache.thrift.protocol.TType.I64, (short)7);
+  private static final org.apache.thrift.protocol.TField SOFTWARE_FIELD_DESC = new org.apache.thrift.protocol.TField("software", org.apache.thrift.protocol.TType.LIST, (short)8);
+  private static final org.apache.thrift.protocol.TField TAGS_FIELD_DESC = new org.apache.thrift.protocol.TField("tags", org.apache.thrift.protocol.TType.LIST, (short)9);
+  private static final org.apache.thrift.protocol.TField OS_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("osId", org.apache.thrift.protocol.TType.I32, (short)10);
+  private static final org.apache.thrift.protocol.TField VIRT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("virtId", org.apache.thrift.protocol.TType.STRING, (short)11);
+  private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)12);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -54,30 +55,32 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public String imageBaseId; // required
-  public String currentVersionId; // required
+  public String imageVersionId; // required
   public String imageName; // required
+  public String description; // required
+  public long createTime; // required
+  public String userId; // required
+  public long fileSize; // required
+  public List<String> software; // required
+  public List<String> tags; // required
   public int osId; // required
   public String virtId; // required
-  public long baseCreateTime; // required
-  public long versionCreateTime; // required
-  public String ownerId; // required
-  public String uploaderId; // required
-  public long fileSize; // required
   public boolean isTemplate; // 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 {
     IMAGE_BASE_ID((short)1, "imageBaseId"),
-    CURRENT_VERSION_ID((short)2, "currentVersionId"),
+    IMAGE_VERSION_ID((short)2, "imageVersionId"),
     IMAGE_NAME((short)3, "imageName"),
-    OS_ID((short)4, "osId"),
-    VIRT_ID((short)5, "virtId"),
-    BASE_CREATE_TIME((short)6, "baseCreateTime"),
-    VERSION_CREATE_TIME((short)7, "versionCreateTime"),
-    OWNER_ID((short)8, "ownerId"),
-    UPLOADER_ID((short)9, "uploaderId"),
-    FILE_SIZE((short)11, "fileSize"),
-    IS_TEMPLATE((short)16, "isTemplate");
+    DESCRIPTION((short)4, "description"),
+    CREATE_TIME((short)5, "createTime"),
+    USER_ID((short)6, "userId"),
+    FILE_SIZE((short)7, "fileSize"),
+    SOFTWARE((short)8, "software"),
+    TAGS((short)9, "tags"),
+    OS_ID((short)10, "osId"),
+    VIRT_ID((short)11, "virtId"),
+    IS_TEMPLATE((short)12, "isTemplate");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -94,25 +97,27 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       switch(fieldId) {
         case 1: // IMAGE_BASE_ID
           return IMAGE_BASE_ID;
-        case 2: // CURRENT_VERSION_ID
-          return CURRENT_VERSION_ID;
+        case 2: // IMAGE_VERSION_ID
+          return IMAGE_VERSION_ID;
         case 3: // IMAGE_NAME
           return IMAGE_NAME;
-        case 4: // OS_ID
+        case 4: // DESCRIPTION
+          return DESCRIPTION;
+        case 5: // CREATE_TIME
+          return CREATE_TIME;
+        case 6: // USER_ID
+          return USER_ID;
+        case 7: // FILE_SIZE
+          return FILE_SIZE;
+        case 8: // SOFTWARE
+          return SOFTWARE;
+        case 9: // TAGS
+          return TAGS;
+        case 10: // OS_ID
           return OS_ID;
-        case 5: // VIRT_ID
+        case 11: // VIRT_ID
           return VIRT_ID;
-        case 6: // BASE_CREATE_TIME
-          return BASE_CREATE_TIME;
-        case 7: // VERSION_CREATE_TIME
-          return VERSION_CREATE_TIME;
-        case 8: // OWNER_ID
-          return OWNER_ID;
-        case 9: // UPLOADER_ID
-          return UPLOADER_ID;
-        case 11: // FILE_SIZE
-          return FILE_SIZE;
-        case 16: // IS_TEMPLATE
+        case 12: // IS_TEMPLATE
           return IS_TEMPLATE;
         default:
           return null;
@@ -154,35 +159,38 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   // isset id assignments
-  private static final int __OSID_ISSET_ID = 0;
-  private static final int __BASECREATETIME_ISSET_ID = 1;
-  private static final int __VERSIONCREATETIME_ISSET_ID = 2;
-  private static final int __FILESIZE_ISSET_ID = 3;
-  private static final int __ISTEMPLATE_ISSET_ID = 4;
+  private static final int __CREATETIME_ISSET_ID = 0;
+  private static final int __FILESIZE_ISSET_ID = 1;
+  private static final int __OSID_ISSET_ID = 2;
+  private static final int __ISTEMPLATE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
-    tmpMap.put(_Fields.CURRENT_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("currentVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.IMAGE_NAME, new org.apache.thrift.meta_data.FieldMetaData("imageName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.OS_ID, new org.apache.thrift.meta_data.FieldMetaData("osId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.VIRT_ID, new org.apache.thrift.meta_data.FieldMetaData("virtId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BASE_CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("baseCreateTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
-    tmpMap.put(_Fields.VERSION_CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("versionCreateTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
-    tmpMap.put(_Fields.OWNER_ID, new org.apache.thrift.meta_data.FieldMetaData("ownerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
-    tmpMap.put(_Fields.UPLOADER_ID, new org.apache.thrift.meta_data.FieldMetaData("uploaderId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.FILE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("fileSize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.SOFTWARE, new org.apache.thrift.meta_data.FieldMetaData("software", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.TAGS, new org.apache.thrift.meta_data.FieldMetaData("tags", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.OS_ID, new org.apache.thrift.meta_data.FieldMetaData("osId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.VIRT_ID, new org.apache.thrift.meta_data.FieldMetaData("virtId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IS_TEMPLATE, new org.apache.thrift.meta_data.FieldMetaData("isTemplate", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -194,32 +202,33 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
   public ImagePublishData(
     String imageBaseId,
-    String currentVersionId,
+    String imageVersionId,
     String imageName,
+    String description,
+    long createTime,
+    String userId,
+    long fileSize,
+    List<String> software,
+    List<String> tags,
     int osId,
     String virtId,
-    long baseCreateTime,
-    long versionCreateTime,
-    String ownerId,
-    String uploaderId,
-    long fileSize,
     boolean isTemplate)
   {
     this();
     this.imageBaseId = imageBaseId;
-    this.currentVersionId = currentVersionId;
+    this.imageVersionId = imageVersionId;
     this.imageName = imageName;
+    this.description = description;
+    this.createTime = createTime;
+    setCreateTimeIsSet(true);
+    this.userId = userId;
+    this.fileSize = fileSize;
+    setFileSizeIsSet(true);
+    this.software = software;
+    this.tags = tags;
     this.osId = osId;
     setOsIdIsSet(true);
     this.virtId = virtId;
-    this.baseCreateTime = baseCreateTime;
-    setBaseCreateTimeIsSet(true);
-    this.versionCreateTime = versionCreateTime;
-    setVersionCreateTimeIsSet(true);
-    this.ownerId = ownerId;
-    this.uploaderId = uploaderId;
-    this.fileSize = fileSize;
-    setFileSizeIsSet(true);
     this.isTemplate = isTemplate;
     setIsTemplateIsSet(true);
   }
@@ -232,25 +241,32 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     if (other.isSetImageBaseId()) {
       this.imageBaseId = other.imageBaseId;
     }
-    if (other.isSetCurrentVersionId()) {
-      this.currentVersionId = other.currentVersionId;
+    if (other.isSetImageVersionId()) {
+      this.imageVersionId = other.imageVersionId;
     }
     if (other.isSetImageName()) {
       this.imageName = other.imageName;
     }
+    if (other.isSetDescription()) {
+      this.description = other.description;
+    }
+    this.createTime = other.createTime;
+    if (other.isSetUserId()) {
+      this.userId = other.userId;
+    }
+    this.fileSize = other.fileSize;
+    if (other.isSetSoftware()) {
+      List<String> __this__software = new ArrayList<String>(other.software);
+      this.software = __this__software;
+    }
+    if (other.isSetTags()) {
+      List<String> __this__tags = new ArrayList<String>(other.tags);
+      this.tags = __this__tags;
+    }
     this.osId = other.osId;
     if (other.isSetVirtId()) {
       this.virtId = other.virtId;
     }
-    this.baseCreateTime = other.baseCreateTime;
-    this.versionCreateTime = other.versionCreateTime;
-    if (other.isSetOwnerId()) {
-      this.ownerId = other.ownerId;
-    }
-    if (other.isSetUploaderId()) {
-      this.uploaderId = other.uploaderId;
-    }
-    this.fileSize = other.fileSize;
     this.isTemplate = other.isTemplate;
   }
 
@@ -261,19 +277,19 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   @Override
   public void clear() {
     this.imageBaseId = null;
-    this.currentVersionId = null;
+    this.imageVersionId = null;
     this.imageName = null;
+    this.description = null;
+    setCreateTimeIsSet(false);
+    this.createTime = 0;
+    this.userId = null;
+    setFileSizeIsSet(false);
+    this.fileSize = 0;
+    this.software = null;
+    this.tags = null;
     setOsIdIsSet(false);
     this.osId = 0;
     this.virtId = null;
-    setBaseCreateTimeIsSet(false);
-    this.baseCreateTime = 0;
-    setVersionCreateTimeIsSet(false);
-    this.versionCreateTime = 0;
-    this.ownerId = null;
-    this.uploaderId = null;
-    setFileSizeIsSet(false);
-    this.fileSize = 0;
     setIsTemplateIsSet(false);
     this.isTemplate = false;
   }
@@ -302,27 +318,27 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public String getCurrentVersionId() {
-    return this.currentVersionId;
+  public String getImageVersionId() {
+    return this.imageVersionId;
   }
 
-  public ImagePublishData setCurrentVersionId(String currentVersionId) {
-    this.currentVersionId = currentVersionId;
+  public ImagePublishData setImageVersionId(String imageVersionId) {
+    this.imageVersionId = imageVersionId;
     return this;
   }
 
-  public void unsetCurrentVersionId() {
-    this.currentVersionId = null;
+  public void unsetImageVersionId() {
+    this.imageVersionId = null;
   }
 
-  /** Returns true if field currentVersionId is set (has been assigned a value) and false otherwise */
-  public boolean isSetCurrentVersionId() {
-    return this.currentVersionId != null;
+  /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
+  public boolean isSetImageVersionId() {
+    return this.imageVersionId != null;
   }
 
-  public void setCurrentVersionIdIsSet(boolean value) {
+  public void setImageVersionIdIsSet(boolean value) {
     if (!value) {
-      this.currentVersionId = null;
+      this.imageVersionId = null;
     }
   }
 
@@ -350,168 +366,223 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public int getOsId() {
-    return this.osId;
+  public String getDescription() {
+    return this.description;
   }
 
-  public ImagePublishData setOsId(int osId) {
-    this.osId = osId;
-    setOsIdIsSet(true);
+  public ImagePublishData setDescription(String description) {
+    this.description = description;
     return this;
   }
 
-  public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+  public void unsetDescription() {
+    this.description = null;
   }
 
-  /** Returns true if field osId is set (has been assigned a value) and false otherwise */
-  public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+  /** Returns true if field description is set (has been assigned a value) and false otherwise */
+  public boolean isSetDescription() {
+    return this.description != null;
   }
 
-  public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+  public void setDescriptionIsSet(boolean value) {
+    if (!value) {
+      this.description = null;
+    }
   }
 
-  public String getVirtId() {
-    return this.virtId;
+  public long getCreateTime() {
+    return this.createTime;
   }
 
-  public ImagePublishData setVirtId(String virtId) {
-    this.virtId = virtId;
+  public ImagePublishData setCreateTime(long createTime) {
+    this.createTime = createTime;
+    setCreateTimeIsSet(true);
     return this;
   }
 
-  public void unsetVirtId() {
-    this.virtId = null;
+  public void unsetCreateTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
-  /** Returns true if field virtId is set (has been assigned a value) and false otherwise */
-  public boolean isSetVirtId() {
-    return this.virtId != null;
+  /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetCreateTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
-  public void setVirtIdIsSet(boolean value) {
-    if (!value) {
-      this.virtId = null;
-    }
+  public void setCreateTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
-  public long getBaseCreateTime() {
-    return this.baseCreateTime;
+  public String getUserId() {
+    return this.userId;
   }
 
-  public ImagePublishData setBaseCreateTime(long baseCreateTime) {
-    this.baseCreateTime = baseCreateTime;
-    setBaseCreateTimeIsSet(true);
+  public ImagePublishData setUserId(String userId) {
+    this.userId = userId;
     return this;
   }
 
-  public void unsetBaseCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BASECREATETIME_ISSET_ID);
+  public void unsetUserId() {
+    this.userId = null;
   }
 
-  /** Returns true if field baseCreateTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetBaseCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __BASECREATETIME_ISSET_ID);
+  /** Returns true if field userId is set (has been assigned a value) and false otherwise */
+  public boolean isSetUserId() {
+    return this.userId != null;
   }
 
-  public void setBaseCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BASECREATETIME_ISSET_ID, value);
+  public void setUserIdIsSet(boolean value) {
+    if (!value) {
+      this.userId = null;
+    }
   }
 
-  public long getVersionCreateTime() {
-    return this.versionCreateTime;
+  public long getFileSize() {
+    return this.fileSize;
   }
 
-  public ImagePublishData setVersionCreateTime(long versionCreateTime) {
-    this.versionCreateTime = versionCreateTime;
-    setVersionCreateTimeIsSet(true);
+  public ImagePublishData setFileSize(long fileSize) {
+    this.fileSize = fileSize;
+    setFileSizeIsSet(true);
     return this;
   }
 
-  public void unsetVersionCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSIONCREATETIME_ISSET_ID);
+  public void unsetFileSize() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
-  /** Returns true if field versionCreateTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetVersionCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __VERSIONCREATETIME_ISSET_ID);
+  /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
+  public boolean isSetFileSize() {
+    return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
-  public void setVersionCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSIONCREATETIME_ISSET_ID, value);
+  public void setFileSizeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+  }
+
+  public int getSoftwareSize() {
+    return (this.software == null) ? 0 : this.software.size();
   }
 
-  public String getOwnerId() {
-    return this.ownerId;
+  public java.util.Iterator<String> getSoftwareIterator() {
+    return (this.software == null) ? null : this.software.iterator();
   }
 
-  public ImagePublishData setOwnerId(String ownerId) {
-    this.ownerId = ownerId;
+  public void addToSoftware(String elem) {
+    if (this.software == null) {
+      this.software = new ArrayList<String>();
+    }
+    this.software.add(elem);
+  }
+
+  public List<String> getSoftware() {
+    return this.software;
+  }
+
+  public ImagePublishData setSoftware(List<String> software) {
+    this.software = software;
     return this;
   }
 
-  public void unsetOwnerId() {
-    this.ownerId = null;
+  public void unsetSoftware() {
+    this.software = null;
   }
 
-  /** Returns true if field ownerId is set (has been assigned a value) and false otherwise */
-  public boolean isSetOwnerId() {
-    return this.ownerId != null;
+  /** Returns true if field software is set (has been assigned a value) and false otherwise */
+  public boolean isSetSoftware() {
+    return this.software != null;
   }
 
-  public void setOwnerIdIsSet(boolean value) {
+  public void setSoftwareIsSet(boolean value) {
     if (!value) {
-      this.ownerId = null;
+      this.software = null;
+    }
+  }
+
+  public int getTagsSize() {
+    return (this.tags == null) ? 0 : this.tags.size();
+  }
+
+  public java.util.Iterator<String> getTagsIterator() {
+    return (this.tags == null) ? null : this.tags.iterator();
+  }
+
+  public void addToTags(String elem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<String>();
     }
+    this.tags.add(elem);
   }
 
-  public String getUploaderId() {
-    return this.uploaderId;
+  public List<String> getTags() {
+    return this.tags;
   }
 
-  public ImagePublishData setUploaderId(String uploaderId) {
-    this.uploaderId = uploaderId;
+  public ImagePublishData setTags(List<String> tags) {
+    this.tags = tags;
     return this;
   }
 
-  public void unsetUploaderId() {
-    this.uploaderId = null;
+  public void unsetTags() {
+    this.tags = null;
   }
 
-  /** Returns true if field uploaderId is set (has been assigned a value) and false otherwise */
-  public boolean isSetUploaderId() {
-    return this.uploaderId != null;
+  /** Returns true if field tags is set (has been assigned a value) and false otherwise */
+  public boolean isSetTags() {
+    return this.tags != null;
   }
 
-  public void setUploaderIdIsSet(boolean value) {
+  public void setTagsIsSet(boolean value) {
     if (!value) {
-      this.uploaderId = null;
+      this.tags = null;
     }
   }
 
-  public long getFileSize() {
-    return this.fileSize;
+  public int getOsId() {
+    return this.osId;
   }
 
-  public ImagePublishData setFileSize(long fileSize) {
-    this.fileSize = fileSize;
-    setFileSizeIsSet(true);
+  public ImagePublishData setOsId(int osId) {
+    this.osId = osId;
+    setOsIdIsSet(true);
     return this;
   }
 
-  public void unsetFileSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+  public void unsetOsId() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
-  /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
-  public boolean isSetFileSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+  /** Returns true if field osId is set (has been assigned a value) and false otherwise */
+  public boolean isSetOsId() {
+    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
-  public void setFileSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+  public void setOsIdIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+  }
+
+  public String getVirtId() {
+    return this.virtId;
+  }
+
+  public ImagePublishData setVirtId(String virtId) {
+    this.virtId = virtId;
+    return this;
+  }
+
+  public void unsetVirtId() {
+    this.virtId = null;
+  }
+
+  /** Returns true if field virtId is set (has been assigned a value) and false otherwise */
+  public boolean isSetVirtId() {
+    return this.virtId != null;
+  }
+
+  public void setVirtIdIsSet(boolean value) {
+    if (!value) {
+      this.virtId = null;
+    }
   }
 
   public boolean isIsTemplate() {
@@ -547,11 +618,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       }
       break;
 
-    case CURRENT_VERSION_ID:
+    case IMAGE_VERSION_ID:
       if (value == null) {
-        unsetCurrentVersionId();
+        unsetImageVersionId();
       } else {
-        setCurrentVersionId((String)value);
+        setImageVersionId((String)value);
       }
       break;
 
@@ -563,59 +634,67 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       }
       break;
 
-    case OS_ID:
+    case DESCRIPTION:
       if (value == null) {
-        unsetOsId();
+        unsetDescription();
       } else {
-        setOsId((Integer)value);
+        setDescription((String)value);
       }
       break;
 
-    case VIRT_ID:
+    case CREATE_TIME:
       if (value == null) {
-        unsetVirtId();
+        unsetCreateTime();
       } else {
-        setVirtId((String)value);
+        setCreateTime((Long)value);
       }
       break;
 
-    case BASE_CREATE_TIME:
+    case USER_ID:
       if (value == null) {
-        unsetBaseCreateTime();
+        unsetUserId();
       } else {
-        setBaseCreateTime((Long)value);
+        setUserId((String)value);
       }
       break;
 
-    case VERSION_CREATE_TIME:
+    case FILE_SIZE:
       if (value == null) {
-        unsetVersionCreateTime();
+        unsetFileSize();
       } else {
-        setVersionCreateTime((Long)value);
+        setFileSize((Long)value);
       }
       break;
 
-    case OWNER_ID:
+    case SOFTWARE:
       if (value == null) {
-        unsetOwnerId();
+        unsetSoftware();
       } else {
-        setOwnerId((String)value);
+        setSoftware((List<String>)value);
       }
       break;
 
-    case UPLOADER_ID:
+    case TAGS:
       if (value == null) {
-        unsetUploaderId();
+        unsetTags();
       } else {
-        setUploaderId((String)value);
+        setTags((List<String>)value);
       }
       break;
 
-    case FILE_SIZE:
+    case OS_ID:
       if (value == null) {
-        unsetFileSize();
+        unsetOsId();
       } else {
-        setFileSize((Long)value);
+        setOsId((Integer)value);
+      }
+      break;
+
+    case VIRT_ID:
+      if (value == null) {
+        unsetVirtId();
+      } else {
+        setVirtId((String)value);
       }
       break;
 
@@ -635,32 +714,35 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     case IMAGE_BASE_ID:
       return getImageBaseId();
 
-    case CURRENT_VERSION_ID:
-      return getCurrentVersionId();
+    case IMAGE_VERSION_ID:
+      return getImageVersionId();
 
     case IMAGE_NAME:
       return getImageName();
 
-    case OS_ID:
-      return Integer.valueOf(getOsId());
+    case DESCRIPTION:
+      return getDescription();
 
-    case VIRT_ID:
-      return getVirtId();
+    case CREATE_TIME:
+      return Long.valueOf(getCreateTime());
 
-    case BASE_CREATE_TIME:
-      return Long.valueOf(getBaseCreateTime());
+    case USER_ID:
+      return getUserId();
 
-    case VERSION_CREATE_TIME:
-      return Long.valueOf(getVersionCreateTime());
+    case FILE_SIZE:
+      return Long.valueOf(getFileSize());
 
-    case OWNER_ID:
-      return getOwnerId();
+    case SOFTWARE:
+      return getSoftware();
 
-    case UPLOADER_ID:
-      return getUploaderId();
+    case TAGS:
+      return getTags();
 
-    case FILE_SIZE:
-      return Long.valueOf(getFileSize());
+    case OS_ID:
+      return Integer.valueOf(getOsId());
+
+    case VIRT_ID:
+      return getVirtId();
 
     case IS_TEMPLATE:
       return Boolean.valueOf(isIsTemplate());
@@ -678,24 +760,26 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     switch (field) {
     case IMAGE_BASE_ID:
       return isSetImageBaseId();
-    case CURRENT_VERSION_ID:
-      return isSetCurrentVersionId();
+    case IMAGE_VERSION_ID:
+      return isSetImageVersionId();
     case IMAGE_NAME:
       return isSetImageName();
+    case DESCRIPTION:
+      return isSetDescription();
+    case CREATE_TIME:
+      return isSetCreateTime();
+    case USER_ID:
+      return isSetUserId();
+    case FILE_SIZE:
+      return isSetFileSize();
+    case SOFTWARE:
+      return isSetSoftware();
+    case TAGS:
+      return isSetTags();
     case OS_ID:
       return isSetOsId();
     case VIRT_ID:
       return isSetVirtId();
-    case BASE_CREATE_TIME:
-      return isSetBaseCreateTime();
-    case VERSION_CREATE_TIME:
-      return isSetVersionCreateTime();
-    case OWNER_ID:
-      return isSetOwnerId();
-    case UPLOADER_ID:
-      return isSetUploaderId();
-    case FILE_SIZE:
-      return isSetFileSize();
     case IS_TEMPLATE:
       return isSetIsTemplate();
     }
@@ -724,12 +808,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return false;
     }
 
-    boolean this_present_currentVersionId = true && this.isSetCurrentVersionId();
-    boolean that_present_currentVersionId = true && that.isSetCurrentVersionId();
-    if (this_present_currentVersionId || that_present_currentVersionId) {
-      if (!(this_present_currentVersionId && that_present_currentVersionId))
+    boolean this_present_imageVersionId = true && this.isSetImageVersionId();
+    boolean that_present_imageVersionId = true && that.isSetImageVersionId();
+    if (this_present_imageVersionId || that_present_imageVersionId) {
+      if (!(this_present_imageVersionId && that_present_imageVersionId))
         return false;
-      if (!this.currentVersionId.equals(that.currentVersionId))
+      if (!this.imageVersionId.equals(that.imageVersionId))
         return false;
     }
 
@@ -742,66 +826,75 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return false;
     }
 
-    boolean this_present_osId = true;
-    boolean that_present_osId = true;
-    if (this_present_osId || that_present_osId) {
-      if (!(this_present_osId && that_present_osId))
+    boolean this_present_description = true && this.isSetDescription();
+    boolean that_present_description = true && that.isSetDescription();
+    if (this_present_description || that_present_description) {
+      if (!(this_present_description && that_present_description))
         return false;
-      if (this.osId != that.osId)
+      if (!this.description.equals(that.description))
         return false;
     }
 
-    boolean this_present_virtId = true && this.isSetVirtId();
-    boolean that_present_virtId = true && that.isSetVirtId();
-    if (this_present_virtId || that_present_virtId) {
-      if (!(this_present_virtId && that_present_virtId))
+    boolean this_present_createTime = true;
+    boolean that_present_createTime = true;
+    if (this_present_createTime || that_present_createTime) {
+      if (!(this_present_createTime && that_present_createTime))
         return false;
-      if (!this.virtId.equals(that.virtId))
+      if (this.createTime != that.createTime)
         return false;
     }
 
-    boolean this_present_baseCreateTime = true;
-    boolean that_present_baseCreateTime = true;
-    if (this_present_baseCreateTime || that_present_baseCreateTime) {
-      if (!(this_present_baseCreateTime && that_present_baseCreateTime))
+    boolean this_present_userId = true && this.isSetUserId();
+    boolean that_present_userId = true && that.isSetUserId();
+    if (this_present_userId || that_present_userId) {
+      if (!(this_present_userId && that_present_userId))
         return false;
-      if (this.baseCreateTime != that.baseCreateTime)
+      if (!this.userId.equals(that.userId))
         return false;
     }
 
-    boolean this_present_versionCreateTime = true;
-    boolean that_present_versionCreateTime = true;
-    if (this_present_versionCreateTime || that_present_versionCreateTime) {
-      if (!(this_present_versionCreateTime && that_present_versionCreateTime))
+    boolean this_present_fileSize = true;
+    boolean that_present_fileSize = true;
+    if (this_present_fileSize || that_present_fileSize) {
+      if (!(this_present_fileSize && that_present_fileSize))
         return false;
-      if (this.versionCreateTime != that.versionCreateTime)
+      if (this.fileSize != that.fileSize)
         return false;
     }
 
-    boolean this_present_ownerId = true && this.isSetOwnerId();
-    boolean that_present_ownerId = true && that.isSetOwnerId();
-    if (this_present_ownerId || that_present_ownerId) {
-      if (!(this_present_ownerId && that_present_ownerId))
+    boolean this_present_software = true && this.isSetSoftware();
+    boolean that_present_software = true && that.isSetSoftware();
+    if (this_present_software || that_present_software) {
+      if (!(this_present_software && that_present_software))
         return false;
-      if (!this.ownerId.equals(that.ownerId))
+      if (!this.software.equals(that.software))
         return false;
     }
 
-    boolean this_present_uploaderId = true && this.isSetUploaderId();
-    boolean that_present_uploaderId = true && that.isSetUploaderId();
-    if (this_present_uploaderId || that_present_uploaderId) {
-      if (!(this_present_uploaderId && that_present_uploaderId))
+    boolean this_present_tags = true && this.isSetTags();
+    boolean that_present_tags = true && that.isSetTags();
+    if (this_present_tags || that_present_tags) {
+      if (!(this_present_tags && that_present_tags))
         return false;
-      if (!this.uploaderId.equals(that.uploaderId))
+      if (!this.tags.equals(that.tags))
         return false;
     }
 
-    boolean this_present_fileSize = true;
-    boolean that_present_fileSize = true;
-    if (this_present_fileSize || that_present_fileSize) {
-      if (!(this_present_fileSize && that_present_fileSize))
+    boolean this_present_osId = true;
+    boolean that_present_osId = true;
+    if (this_present_osId || that_present_osId) {
+      if (!(this_present_osId && that_present_osId))
         return false;
-      if (this.fileSize != that.fileSize)
+      if (this.osId != that.osId)
+        return false;
+    }
+
+    boolean this_present_virtId = true && this.isSetVirtId();
+    boolean that_present_virtId = true && that.isSetVirtId();
+    if (this_present_virtId || that_present_virtId) {
+      if (!(this_present_virtId && that_present_virtId))
+        return false;
+      if (!this.virtId.equals(that.virtId))
         return false;
     }
 
@@ -840,12 +933,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCurrentVersionId()).compareTo(other.isSetCurrentVersionId());
+    lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCurrentVersionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.currentVersionId, other.currentVersionId);
+    if (isSetImageVersionId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -860,72 +953,82 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetOsId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.osId, other.osId);
+    if (isSetDescription()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetVirtId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.virtId, other.virtId);
+    if (isSetCreateTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, other.createTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetUserId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetBaseCreateTime()).compareTo(other.isSetBaseCreateTime());
+    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetBaseCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.baseCreateTime, other.baseCreateTime);
+    if (isSetFileSize()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVersionCreateTime()).compareTo(other.isSetVersionCreateTime());
+    lastComparison = Boolean.valueOf(isSetSoftware()).compareTo(other.isSetSoftware());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetVersionCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.versionCreateTime, other.versionCreateTime);
+    if (isSetSoftware()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.software, other.software);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    lastComparison = Boolean.valueOf(isSetTags()).compareTo(other.isSetTags());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetOwnerId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerId, other.ownerId);
+    if (isSetTags()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tags, other.tags);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUploaderId()).compareTo(other.isSetUploaderId());
+    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetUploaderId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uploaderId, other.uploaderId);
+    if (isSetOsId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.osId, other.osId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetFileSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize);
+    if (isSetVirtId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.virtId, other.virtId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -968,11 +1071,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("currentVersionId:");
-    if (this.currentVersionId == null) {
+    sb.append("imageVersionId:");
+    if (this.imageVersionId == null) {
       sb.append("null");
     } else {
-      sb.append(this.currentVersionId);
+      sb.append(this.imageVersionId);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -984,44 +1087,56 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("osId:");
-    sb.append(this.osId);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("virtId:");
-    if (this.virtId == null) {
+    sb.append("description:");
+    if (this.description == null) {
       sb.append("null");
     } else {
-      sb.append(this.virtId);
+      sb.append(this.description);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("baseCreateTime:");
-    sb.append(this.baseCreateTime);
+    sb.append("createTime:");
+    sb.append(this.createTime);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("versionCreateTime:");
-    sb.append(this.versionCreateTime);
+    sb.append("userId:");
+    if (this.userId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.userId);
+    }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("ownerId:");
-    if (this.ownerId == null) {
+    sb.append("fileSize:");
+    sb.append(this.fileSize);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("software:");
+    if (this.software == null) {
       sb.append("null");
     } else {
-      sb.append(this.ownerId);
+      sb.append(this.software);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("uploaderId:");
-    if (this.uploaderId == null) {
+    sb.append("tags:");
+    if (this.tags == null) {
       sb.append("null");
     } else {
-      sb.append(this.uploaderId);
+      sb.append(this.tags);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("fileSize:");
-    sb.append(this.fileSize);
+    sb.append("osId:");
+    sb.append(this.osId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("virtId:");
+    if (this.virtId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.virtId);
+    }
     first = false;
     if (!first) sb.append(", ");
     sb.append("isTemplate:");
@@ -1080,10 +1195,10 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // CURRENT_VERSION_ID
+          case 2: // IMAGE_VERSION_ID
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.currentVersionId = iprot.readString();
-              struct.setCurrentVersionIdIsSet(true);
+              struct.imageVersionId = iprot.readString();
+              struct.setImageVersionIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1096,63 +1211,91 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // OS_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.osId = iprot.readI32();
-              struct.setOsIdIsSet(true);
+          case 4: // DESCRIPTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.description = iprot.readString();
+              struct.setDescriptionIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // VIRT_ID
+          case 5: // CREATE_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.createTime = iprot.readI64();
+              struct.setCreateTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // USER_ID
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.virtId = iprot.readString();
-              struct.setVirtIdIsSet(true);
+              struct.userId = iprot.readString();
+              struct.setUserIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 6: // BASE_CREATE_TIME
+          case 7: // FILE_SIZE
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.baseCreateTime = iprot.readI64();
-              struct.setBaseCreateTimeIsSet(true);
+              struct.fileSize = iprot.readI64();
+              struct.setFileSizeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 7: // VERSION_CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.versionCreateTime = iprot.readI64();
-              struct.setVersionCreateTimeIsSet(true);
+          case 8: // SOFTWARE
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
+                struct.software = new ArrayList<String>(_list74.size);
+                for (int _i75 = 0; _i75 < _list74.size; ++_i75)
+                {
+                  String _elem76;
+                  _elem76 = iprot.readString();
+                  struct.software.add(_elem76);
+                }
+                iprot.readListEnd();
+              }
+              struct.setSoftwareIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 8: // OWNER_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerId = iprot.readString();
-              struct.setOwnerIdIsSet(true);
+          case 9: // TAGS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
+                struct.tags = new ArrayList<String>(_list77.size);
+                for (int _i78 = 0; _i78 < _list77.size; ++_i78)
+                {
+                  String _elem79;
+                  _elem79 = iprot.readString();
+                  struct.tags.add(_elem79);
+                }
+                iprot.readListEnd();
+              }
+              struct.setTagsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 9: // UPLOADER_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.uploaderId = iprot.readString();
-              struct.setUploaderIdIsSet(true);
+          case 10: // OS_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.osId = iprot.readI32();
+              struct.setOsIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 11: // FILE_SIZE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.fileSize = iprot.readI64();
-              struct.setFileSizeIsSet(true);
+          case 11: // VIRT_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.virtId = iprot.readString();
+              struct.setVirtIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 16: // IS_TEMPLATE
+          case 12: // IS_TEMPLATE
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.isTemplate = iprot.readBool();
               struct.setIsTemplateIsSet(true);
@@ -1180,9 +1323,9 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         oprot.writeString(struct.imageBaseId);
         oprot.writeFieldEnd();
       }
-      if (struct.currentVersionId != null) {
-        oprot.writeFieldBegin(CURRENT_VERSION_ID_FIELD_DESC);
-        oprot.writeString(struct.currentVersionId);
+      if (struct.imageVersionId != null) {
+        oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
+        oprot.writeString(struct.imageVersionId);
         oprot.writeFieldEnd();
       }
       if (struct.imageName != null) {
@@ -1190,33 +1333,54 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         oprot.writeString(struct.imageName);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(OS_ID_FIELD_DESC);
-      oprot.writeI32(struct.osId);
-      oprot.writeFieldEnd();
-      if (struct.virtId != null) {
-        oprot.writeFieldBegin(VIRT_ID_FIELD_DESC);
-        oprot.writeString(struct.virtId);
+      if (struct.description != null) {
+        oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
+        oprot.writeString(struct.description);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(BASE_CREATE_TIME_FIELD_DESC);
-      oprot.writeI64(struct.baseCreateTime);
+      oprot.writeFieldBegin(CREATE_TIME_FIELD_DESC);
+      oprot.writeI64(struct.createTime);
       oprot.writeFieldEnd();
-      oprot.writeFieldBegin(VERSION_CREATE_TIME_FIELD_DESC);
-      oprot.writeI64(struct.versionCreateTime);
+      if (struct.userId != null) {
+        oprot.writeFieldBegin(USER_ID_FIELD_DESC);
+        oprot.writeString(struct.userId);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(FILE_SIZE_FIELD_DESC);
+      oprot.writeI64(struct.fileSize);
       oprot.writeFieldEnd();
-      if (struct.ownerId != null) {
-        oprot.writeFieldBegin(OWNER_ID_FIELD_DESC);
-        oprot.writeString(struct.ownerId);
+      if (struct.software != null) {
+        oprot.writeFieldBegin(SOFTWARE_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.software.size()));
+          for (String _iter80 : struct.software)
+          {
+            oprot.writeString(_iter80);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
-      if (struct.uploaderId != null) {
-        oprot.writeFieldBegin(UPLOADER_ID_FIELD_DESC);
-        oprot.writeString(struct.uploaderId);
+      if (struct.tags != null) {
+        oprot.writeFieldBegin(TAGS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tags.size()));
+          for (String _iter81 : struct.tags)
+          {
+            oprot.writeString(_iter81);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(FILE_SIZE_FIELD_DESC);
-      oprot.writeI64(struct.fileSize);
+      oprot.writeFieldBegin(OS_ID_FIELD_DESC);
+      oprot.writeI32(struct.osId);
       oprot.writeFieldEnd();
+      if (struct.virtId != null) {
+        oprot.writeFieldBegin(VIRT_ID_FIELD_DESC);
+        oprot.writeString(struct.virtId);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldBegin(IS_TEMPLATE_FIELD_DESC);
       oprot.writeBool(struct.isTemplate);
       oprot.writeFieldEnd();
@@ -1241,66 +1405,84 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (struct.isSetImageBaseId()) {
         optionals.set(0);
       }
-      if (struct.isSetCurrentVersionId()) {
+      if (struct.isSetImageVersionId()) {
         optionals.set(1);
       }
       if (struct.isSetImageName()) {
         optionals.set(2);
       }
-      if (struct.isSetOsId()) {
+      if (struct.isSetDescription()) {
         optionals.set(3);
       }
-      if (struct.isSetVirtId()) {
+      if (struct.isSetCreateTime()) {
         optionals.set(4);
       }
-      if (struct.isSetBaseCreateTime()) {
+      if (struct.isSetUserId()) {
         optionals.set(5);
       }
-      if (struct.isSetVersionCreateTime()) {
+      if (struct.isSetFileSize()) {
         optionals.set(6);
       }
-      if (struct.isSetOwnerId()) {
+      if (struct.isSetSoftware()) {
         optionals.set(7);
       }
-      if (struct.isSetUploaderId()) {
+      if (struct.isSetTags()) {
         optionals.set(8);
       }
-      if (struct.isSetFileSize()) {
+      if (struct.isSetOsId()) {
         optionals.set(9);
       }
-      if (struct.isSetIsTemplate()) {
+      if (struct.isSetVirtId()) {
         optionals.set(10);
       }
-      oprot.writeBitSet(optionals, 11);
+      if (struct.isSetIsTemplate()) {
+        optionals.set(11);
+      }
+      oprot.writeBitSet(optionals, 12);
       if (struct.isSetImageBaseId()) {
         oprot.writeString(struct.imageBaseId);
       }
-      if (struct.isSetCurrentVersionId()) {
-        oprot.writeString(struct.currentVersionId);
+      if (struct.isSetImageVersionId()) {
+        oprot.writeString(struct.imageVersionId);
       }
       if (struct.isSetImageName()) {
         oprot.writeString(struct.imageName);
       }
-      if (struct.isSetOsId()) {
-        oprot.writeI32(struct.osId);
+      if (struct.isSetDescription()) {
+        oprot.writeString(struct.description);
       }
-      if (struct.isSetVirtId()) {
-        oprot.writeString(struct.virtId);
+      if (struct.isSetCreateTime()) {
+        oprot.writeI64(struct.createTime);
       }
-      if (struct.isSetBaseCreateTime()) {
-        oprot.writeI64(struct.baseCreateTime);
+      if (struct.isSetUserId()) {
+        oprot.writeString(struct.userId);
       }
-      if (struct.isSetVersionCreateTime()) {
-        oprot.writeI64(struct.versionCreateTime);
+      if (struct.isSetFileSize()) {
+        oprot.writeI64(struct.fileSize);
       }
-      if (struct.isSetOwnerId()) {
-        oprot.writeString(struct.ownerId);
+      if (struct.isSetSoftware()) {
+        {
+          oprot.writeI32(struct.software.size());
+          for (String _iter82 : struct.software)
+          {
+            oprot.writeString(_iter82);
+          }
+        }
       }
-      if (struct.isSetUploaderId()) {
-        oprot.writeString(struct.uploaderId);
+      if (struct.isSetTags()) {
+        {
+          oprot.writeI32(struct.tags.size());
+          for (String _iter83 : struct.tags)
+          {
+            oprot.writeString(_iter83);
+          }
+        }
       }
-      if (struct.isSetFileSize()) {
-        oprot.writeI64(struct.fileSize);
+      if (struct.isSetOsId()) {
+        oprot.writeI32(struct.osId);
+      }
+      if (struct.isSetVirtId()) {
+        oprot.writeString(struct.virtId);
       }
       if (struct.isSetIsTemplate()) {
         oprot.writeBool(struct.isTemplate);
@@ -1310,48 +1492,70 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImagePublishData struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(11);
+      BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
         struct.imageBaseId = iprot.readString();
         struct.setImageBaseIdIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.currentVersionId = iprot.readString();
-        struct.setCurrentVersionIdIsSet(true);
+        struct.imageVersionId = iprot.readString();
+        struct.setImageVersionIdIsSet(true);
       }
       if (incoming.get(2)) {
         struct.imageName = iprot.readString();
         struct.setImageNameIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.osId = iprot.readI32();
-        struct.setOsIdIsSet(true);
+        struct.description = iprot.readString();
+        struct.setDescriptionIsSet(true);
       }
       if (incoming.get(4)) {
-        struct.virtId = iprot.readString();
-        struct.setVirtIdIsSet(true);
+        struct.createTime = iprot.readI64();
+        struct.setCreateTimeIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.baseCreateTime = iprot.readI64();
-        struct.setBaseCreateTimeIsSet(true);
+        struct.userId = iprot.readString();
+        struct.setUserIdIsSet(true);
       }
       if (incoming.get(6)) {
-        struct.versionCreateTime = iprot.readI64();
-        struct.setVersionCreateTimeIsSet(true);
+        struct.fileSize = iprot.readI64();
+        struct.setFileSizeIsSet(true);
       }
       if (incoming.get(7)) {
-        struct.ownerId = iprot.readString();
-        struct.setOwnerIdIsSet(true);
+        {
+          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 _elem86;
+            _elem86 = iprot.readString();
+            struct.software.add(_elem86);
+          }
+        }
+        struct.setSoftwareIsSet(true);
       }
       if (incoming.get(8)) {
-        struct.uploaderId = iprot.readString();
-        struct.setUploaderIdIsSet(true);
+        {
+          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 _elem89;
+            _elem89 = iprot.readString();
+            struct.tags.add(_elem89);
+          }
+        }
+        struct.setTagsIsSet(true);
       }
       if (incoming.get(9)) {
-        struct.fileSize = iprot.readI64();
-        struct.setFileSizeIsSet(true);
+        struct.osId = iprot.readI32();
+        struct.setOsIdIsSet(true);
       }
       if (incoming.get(10)) {
+        struct.virtId = iprot.readString();
+        struct.setVirtIdIsSet(true);
+      }
+      if (incoming.get(11)) {
         struct.isTemplate = iprot.readBool();
         struct.setIsTemplateIsSet(true);
       }
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 fc213b5..0cd2051 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
@@ -2168,13 +2168,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 _list106 = iprot.readListBegin();
-                struct.nics = new ArrayList<String>(_list106.size);
-                for (int _i107 = 0; _i107 < _list106.size; ++_i107)
+                org.apache.thrift.protocol.TList _list122 = iprot.readListBegin();
+                struct.nics = new ArrayList<String>(_list122.size);
+                for (int _i123 = 0; _i123 < _list122.size; ++_i123)
                 {
-                  String _elem108;
-                  _elem108 = iprot.readString();
-                  struct.nics.add(_elem108);
+                  String _elem124;
+                  _elem124 = iprot.readString();
+                  struct.nics.add(_elem124);
                 }
                 iprot.readListEnd();
               }
@@ -2186,13 +2186,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 _list109 = iprot.readListBegin();
-                struct.allowedUsers = new ArrayList<String>(_list109.size);
-                for (int _i110 = 0; _i110 < _list109.size; ++_i110)
+                org.apache.thrift.protocol.TList _list125 = iprot.readListBegin();
+                struct.allowedUsers = new ArrayList<String>(_list125.size);
+                for (int _i126 = 0; _i126 < _list125.size; ++_i126)
                 {
-                  String _elem111;
-                  _elem111 = iprot.readString();
-                  struct.allowedUsers.add(_elem111);
+                  String _elem127;
+                  _elem127 = iprot.readString();
+                  struct.allowedUsers.add(_elem127);
                 }
                 iprot.readListEnd();
               }
@@ -2204,14 +2204,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 _list112 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<NetRule>(_list112.size);
-                for (int _i113 = 0; _i113 < _list112.size; ++_i113)
+                org.apache.thrift.protocol.TList _list128 = iprot.readListBegin();
+                struct.networkExceptions = new ArrayList<NetRule>(_list128.size);
+                for (int _i129 = 0; _i129 < _list128.size; ++_i129)
                 {
-                  NetRule _elem114;
-                  _elem114 = new NetRule();
-                  _elem114.read(iprot);
-                  struct.networkExceptions.add(_elem114);
+                  NetRule _elem130;
+                  _elem130 = new NetRule();
+                  _elem130.read(iprot);
+                  struct.networkExceptions.add(_elem130);
                 }
                 iprot.readListEnd();
               }
@@ -2321,9 +2321,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 _iter115 : struct.nics)
+          for (String _iter131 : struct.nics)
           {
-            oprot.writeString(_iter115);
+            oprot.writeString(_iter131);
           }
           oprot.writeListEnd();
         }
@@ -2333,9 +2333,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 _iter116 : struct.allowedUsers)
+          for (String _iter132 : struct.allowedUsers)
           {
-            oprot.writeString(_iter116);
+            oprot.writeString(_iter132);
           }
           oprot.writeListEnd();
         }
@@ -2345,9 +2345,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 _iter117 : struct.networkExceptions)
+          for (NetRule _iter133 : struct.networkExceptions)
           {
-            _iter117.write(oprot);
+            _iter133.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -2526,27 +2526,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter118 : struct.nics)
+          for (String _iter134 : struct.nics)
           {
-            oprot.writeString(_iter118);
+            oprot.writeString(_iter134);
           }
         }
       }
       if (struct.isSetAllowedUsers()) {
         {
           oprot.writeI32(struct.allowedUsers.size());
-          for (String _iter119 : struct.allowedUsers)
+          for (String _iter135 : struct.allowedUsers)
           {
-            oprot.writeString(_iter119);
+            oprot.writeString(_iter135);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter120 : struct.networkExceptions)
+          for (NetRule _iter136 : struct.networkExceptions)
           {
-            _iter120.write(oprot);
+            _iter136.write(oprot);
           }
         }
       }
@@ -2634,40 +2634,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(16)) {
         {
-          org.apache.thrift.protocol.TList _list121 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list121.size);
-          for (int _i122 = 0; _i122 < _list121.size; ++_i122)
+          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)
           {
-            String _elem123;
-            _elem123 = iprot.readString();
-            struct.nics.add(_elem123);
+            String _elem139;
+            _elem139 = iprot.readString();
+            struct.nics.add(_elem139);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(17)) {
         {
-          org.apache.thrift.protocol.TList _list124 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.allowedUsers = new ArrayList<String>(_list124.size);
-          for (int _i125 = 0; _i125 < _list124.size; ++_i125)
+          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)
           {
-            String _elem126;
-            _elem126 = iprot.readString();
-            struct.allowedUsers.add(_elem126);
+            String _elem142;
+            _elem142 = iprot.readString();
+            struct.allowedUsers.add(_elem142);
           }
         }
         struct.setAllowedUsersIsSet(true);
       }
       if (incoming.get(18)) {
         {
-          org.apache.thrift.protocol.TList _list127 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list127.size);
-          for (int _i128 = 0; _i128 < _list127.size; ++_i128)
+          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)
           {
-            NetRule _elem129;
-            _elem129 = new NetRule();
-            _elem129.read(iprot);
-            struct.networkExceptions.add(_elem129);
+            NetRule _elem145;
+            _elem145 = new NetRule();
+            _elem145.read(iprot);
+            struct.networkExceptions.add(_elem145);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
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 3b9c52f..5d74611 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
@@ -1518,13 +1518,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 10: // NICS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
-                struct.nics = new ArrayList<String>(_list74.size);
-                for (int _i75 = 0; _i75 < _list74.size; ++_i75)
+                org.apache.thrift.protocol.TList _list90 = iprot.readListBegin();
+                struct.nics = new ArrayList<String>(_list90.size);
+                for (int _i91 = 0; _i91 < _list90.size; ++_i91)
                 {
-                  String _elem76;
-                  _elem76 = iprot.readString();
-                  struct.nics.add(_elem76);
+                  String _elem92;
+                  _elem92 = iprot.readString();
+                  struct.nics.add(_elem92);
                 }
                 iprot.readListEnd();
               }
@@ -1536,14 +1536,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 12: // NETWORK_EXCEPTIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<NetRule>(_list77.size);
-                for (int _i78 = 0; _i78 < _list77.size; ++_i78)
+                org.apache.thrift.protocol.TList _list93 = iprot.readListBegin();
+                struct.networkExceptions = new ArrayList<NetRule>(_list93.size);
+                for (int _i94 = 0; _i94 < _list93.size; ++_i94)
                 {
-                  NetRule _elem79;
-                  _elem79 = new NetRule();
-                  _elem79.read(iprot);
-                  struct.networkExceptions.add(_elem79);
+                  NetRule _elem95;
+                  _elem95 = new NetRule();
+                  _elem95.read(iprot);
+                  struct.networkExceptions.add(_elem95);
                 }
                 iprot.readListEnd();
               }
@@ -1580,13 +1580,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 11: // ADD_ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
-                struct.addAllowedUsers = new ArrayList<String>(_list80.size);
-                for (int _i81 = 0; _i81 < _list80.size; ++_i81)
+                org.apache.thrift.protocol.TList _list96 = iprot.readListBegin();
+                struct.addAllowedUsers = new ArrayList<String>(_list96.size);
+                for (int _i97 = 0; _i97 < _list96.size; ++_i97)
                 {
-                  String _elem82;
-                  _elem82 = iprot.readString();
-                  struct.addAllowedUsers.add(_elem82);
+                  String _elem98;
+                  _elem98 = iprot.readString();
+                  struct.addAllowedUsers.add(_elem98);
                 }
                 iprot.readListEnd();
               }
@@ -1598,13 +1598,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 16: // REM_ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list83 = iprot.readListBegin();
-                struct.remAllowedUsers = new ArrayList<String>(_list83.size);
-                for (int _i84 = 0; _i84 < _list83.size; ++_i84)
+                org.apache.thrift.protocol.TList _list99 = iprot.readListBegin();
+                struct.remAllowedUsers = new ArrayList<String>(_list99.size);
+                for (int _i100 = 0; _i100 < _list99.size; ++_i100)
                 {
-                  String _elem85;
-                  _elem85 = iprot.readString();
-                  struct.remAllowedUsers.add(_elem85);
+                  String _elem101;
+                  _elem101 = iprot.readString();
+                  struct.remAllowedUsers.add(_elem101);
                 }
                 iprot.readListEnd();
               }
@@ -1664,9 +1664,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 _iter86 : struct.nics)
+          for (String _iter102 : struct.nics)
           {
-            oprot.writeString(_iter86);
+            oprot.writeString(_iter102);
           }
           oprot.writeListEnd();
         }
@@ -1677,9 +1677,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 _iter87 : struct.addAllowedUsers)
+            for (String _iter103 : struct.addAllowedUsers)
             {
-              oprot.writeString(_iter87);
+              oprot.writeString(_iter103);
             }
             oprot.writeListEnd();
           }
@@ -1691,9 +1691,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 _iter88 : struct.networkExceptions)
+            for (NetRule _iter104 : struct.networkExceptions)
             {
-              _iter88.write(oprot);
+              _iter104.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1716,9 +1716,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(REM_ALLOWED_USERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.remAllowedUsers.size()));
-            for (String _iter89 : struct.remAllowedUsers)
+            for (String _iter105 : struct.remAllowedUsers)
             {
-              oprot.writeString(_iter89);
+              oprot.writeString(_iter105);
             }
             oprot.writeListEnd();
           }
@@ -1816,18 +1816,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter90 : struct.nics)
+          for (String _iter106 : struct.nics)
           {
-            oprot.writeString(_iter90);
+            oprot.writeString(_iter106);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter91 : struct.networkExceptions)
+          for (NetRule _iter107 : struct.networkExceptions)
           {
-            _iter91.write(oprot);
+            _iter107.write(oprot);
           }
         }
       }
@@ -1843,18 +1843,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetAddAllowedUsers()) {
         {
           oprot.writeI32(struct.addAllowedUsers.size());
-          for (String _iter92 : struct.addAllowedUsers)
+          for (String _iter108 : struct.addAllowedUsers)
           {
-            oprot.writeString(_iter92);
+            oprot.writeString(_iter108);
           }
         }
       }
       if (struct.isSetRemAllowedUsers()) {
         {
           oprot.writeI32(struct.remAllowedUsers.size());
-          for (String _iter93 : struct.remAllowedUsers)
+          for (String _iter109 : struct.remAllowedUsers)
           {
-            oprot.writeString(_iter93);
+            oprot.writeString(_iter109);
           }
         }
       }
@@ -1898,27 +1898,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list94 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list94.size);
-          for (int _i95 = 0; _i95 < _list94.size; ++_i95)
+          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)
           {
-            String _elem96;
-            _elem96 = iprot.readString();
-            struct.nics.add(_elem96);
+            String _elem112;
+            _elem112 = iprot.readString();
+            struct.nics.add(_elem112);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list97.size);
-          for (int _i98 = 0; _i98 < _list97.size; ++_i98)
+          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)
           {
-            NetRule _elem99;
-            _elem99 = new NetRule();
-            _elem99.read(iprot);
-            struct.networkExceptions.add(_elem99);
+            NetRule _elem115;
+            _elem115 = new NetRule();
+            _elem115.read(iprot);
+            struct.networkExceptions.add(_elem115);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -1938,26 +1938,26 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(13)) {
         {
-          org.apache.thrift.protocol.TList _list100 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.addAllowedUsers = new ArrayList<String>(_list100.size);
-          for (int _i101 = 0; _i101 < _list100.size; ++_i101)
+          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)
           {
-            String _elem102;
-            _elem102 = iprot.readString();
-            struct.addAllowedUsers.add(_elem102);
+            String _elem118;
+            _elem118 = iprot.readString();
+            struct.addAllowedUsers.add(_elem118);
           }
         }
         struct.setAddAllowedUsersIsSet(true);
       }
       if (incoming.get(14)) {
         {
-          org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.remAllowedUsers = new ArrayList<String>(_list103.size);
-          for (int _i104 = 0; _i104 < _list103.size; ++_i104)
+          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)
           {
-            String _elem105;
-            _elem105 = iprot.readString();
-            struct.remAllowedUsers.add(_elem105);
+            String _elem121;
+            _elem121 = iprot.readString();
+            struct.remAllowedUsers.add(_elem121);
           }
         }
         struct.setRemAllowedUsersIsSet(true);
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 88fa213..418f394 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
@@ -56,14 +56,16 @@ public class MasterServer {
 
     public ServerSessionData serverAuthenticate(String organizationId, ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public TransferInformation submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
+    public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
 
-    public TransferInformation getImage(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public TransferInformation submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
 
     public boolean registerSatellite(String organizationId, String address, String modulus, String exponent) throws TInvocationException, org.apache.thrift.TException;
 
     public boolean updateSatelliteAddress(String serverSessionId, String address) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
+    public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
+
     public List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException;
 
     public List<OperatingSystem> getOperatingSystems() throws TInvocationException, org.apache.thrift.TException;
@@ -98,14 +100,16 @@ public class MasterServer {
 
     public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getImage(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void updateSatelliteAddress(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -412,25 +416,24 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "serverAuthenticate failed: unknown result");
     }
 
-    public TransferInformation submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
+    public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
-      send_submitImage(serverSessionId, imageDescription, blockHashes);
-      return recv_submitImage();
+      send_getImageData(serverSessionId, imageVersionId);
+      return recv_getImageData();
     }
 
-    public void send_submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws org.apache.thrift.TException
+    public void send_getImageData(String serverSessionId, String imageVersionId) throws org.apache.thrift.TException
     {
-      submitImage_args args = new submitImage_args();
+      getImageData_args args = new getImageData_args();
       args.setServerSessionId(serverSessionId);
-      args.setImageDescription(imageDescription);
-      args.setBlockHashes(blockHashes);
-      sendBase("submitImage", args);
+      args.setImageVersionId(imageVersionId);
+      sendBase("getImageData", args);
     }
 
-    public TransferInformation recv_submitImage() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
+    public ImagePublishData recv_getImageData() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
-      submitImage_result result = new submitImage_result();
-      receiveBase(result, "submitImage");
+      getImageData_result result = new getImageData_result();
+      receiveBase(result, "getImageData");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -440,30 +443,31 @@ public class MasterServer {
       if (result.failure2 != null) {
         throw result.failure2;
       }
-      if (result.failure3 != null) {
-        throw result.failure3;
+      if (result.f3 != null) {
+        throw result.f3;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitImage failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result");
     }
 
-    public TransferInformation getImage(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public TransferInformation submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
     {
-      send_getImage(serverSessionId, imageVersionId);
-      return recv_getImage();
+      send_submitImage(serverSessionId, imageDescription, blockHashes);
+      return recv_submitImage();
     }
 
-    public void send_getImage(String serverSessionId, String imageVersionId) throws org.apache.thrift.TException
+    public void send_submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws org.apache.thrift.TException
     {
-      getImage_args args = new getImage_args();
+      submitImage_args args = new submitImage_args();
       args.setServerSessionId(serverSessionId);
-      args.setImageVersionId(imageVersionId);
-      sendBase("getImage", args);
+      args.setImageDescription(imageDescription);
+      args.setBlockHashes(blockHashes);
+      sendBase("submitImage", args);
     }
 
-    public TransferInformation recv_getImage() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public TransferInformation recv_submitImage() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
     {
-      getImage_result result = new getImage_result();
-      receiveBase(result, "getImage");
+      submitImage_result result = new submitImage_result();
+      receiveBase(result, "submitImage");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -473,7 +477,10 @@ public class MasterServer {
       if (result.failure2 != null) {
         throw result.failure2;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImage failed: unknown result");
+      if (result.failure3 != null) {
+        throw result.failure3;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitImage failed: unknown result");
     }
 
     public boolean registerSatellite(String organizationId, String address, String modulus, String exponent) throws TInvocationException, org.apache.thrift.TException
@@ -535,6 +542,39 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateSatelliteAddress failed: unknown result");
     }
 
+    public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    {
+      send_downloadImage(sessionId, imageVersionId);
+      return recv_downloadImage();
+    }
+
+    public void send_downloadImage(String sessionId, String imageVersionId) throws org.apache.thrift.TException
+    {
+      downloadImage_args args = new downloadImage_args();
+      args.setSessionId(sessionId);
+      args.setImageVersionId(imageVersionId);
+      sendBase("downloadImage", args);
+    }
+
+    public TransferInformation recv_downloadImage() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    {
+      downloadImage_result result = new downloadImage_result();
+      receiveBase(result, "downloadImage");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.failure != null) {
+        throw result.failure;
+      }
+      if (result.failure2 != null) {
+        throw result.failure2;
+      }
+      if (result.f3 != null) {
+        throw result.f3;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadImage failed: unknown result");
+    }
+
     public List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException
     {
       send_getOrganizations();
@@ -1015,76 +1055,76 @@ public class MasterServer {
       }
     }
 
-    public void submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      submitImage_call method_call = new submitImage_call(serverSessionId, imageDescription, blockHashes, resultHandler, this, ___protocolFactory, ___transport);
+      getImageData_call method_call = new getImageData_call(serverSessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
-      private ImagePublishData imageDescription;
-      private List<ByteBuffer> blockHashes;
-      public submitImage_call(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private String imageVersionId;
+      public getImageData_call(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
-        this.imageDescription = imageDescription;
-        this.blockHashes = blockHashes;
+        this.imageVersionId = imageVersionId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("submitImage", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        submitImage_args args = new submitImage_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImageData", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getImageData_args args = new getImageData_args();
         args.setServerSessionId(serverSessionId);
-        args.setImageDescription(imageDescription);
-        args.setBlockHashes(blockHashes);
+        args.setImageVersionId(imageVersionId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException {
+      public ImagePublishData getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         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_submitImage();
+        return (new Client(prot)).recv_getImageData();
       }
     }
 
-    public void getImage(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void submitImage(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getImage_call method_call = new getImage_call(serverSessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
+      submitImage_call method_call = new submitImage_call(serverSessionId, imageDescription, blockHashes, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImage_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
-      private String imageVersionId;
-      public getImage_call(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private ImagePublishData imageDescription;
+      private List<ByteBuffer> blockHashes;
+      public submitImage_call(String serverSessionId, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
-        this.imageVersionId = imageVersionId;
+        this.imageDescription = imageDescription;
+        this.blockHashes = blockHashes;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getImage", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getImage_args args = new getImage_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("submitImage", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        submitImage_args args = new submitImage_args();
         args.setServerSessionId(serverSessionId);
-        args.setImageVersionId(imageVersionId);
+        args.setImageDescription(imageDescription);
+        args.setBlockHashes(blockHashes);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public TransferInformation getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         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_getImage();
+        return (new Client(prot)).recv_submitImage();
       }
     }
 
@@ -1164,6 +1204,41 @@ public class MasterServer {
       }
     }
 
+    public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      downloadImage_call method_call = new downloadImage_call(sessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class downloadImage_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String sessionId;
+      private String imageVersionId;
+      public downloadImage_call(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.sessionId = sessionId;
+        this.imageVersionId = imageVersionId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("downloadImage", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        downloadImage_args args = new downloadImage_args();
+        args.setSessionId(sessionId);
+        args.setImageVersionId(imageVersionId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        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_downloadImage();
+      }
+    }
+
     public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getOrganizations_call method_call = new getOrganizations_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -1338,10 +1413,11 @@ public class MasterServer {
       processMap.put("isServerAuthenticated", new isServerAuthenticated());
       processMap.put("startServerAuthentication", new startServerAuthentication());
       processMap.put("serverAuthenticate", new serverAuthenticate());
+      processMap.put("getImageData", new getImageData());
       processMap.put("submitImage", new submitImage());
-      processMap.put("getImage", new getImage());
       processMap.put("registerSatellite", new registerSatellite());
       processMap.put("updateSatelliteAddress", new updateSatelliteAddress());
+      processMap.put("downloadImage", new downloadImage());
       processMap.put("getOrganizations", new getOrganizations());
       processMap.put("getOperatingSystems", new getOperatingSystems());
       processMap.put("getVirtualizers", new getVirtualizers());
@@ -1596,55 +1672,57 @@ public class MasterServer {
       }
     }
 
-    public static class submitImage<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitImage_args> {
-      public submitImage() {
-        super("submitImage");
+    public static class getImageData<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getImageData_args> {
+      public getImageData() {
+        super("getImageData");
       }
 
-      public submitImage_args getEmptyArgsInstance() {
-        return new submitImage_args();
+      public getImageData_args getEmptyArgsInstance() {
+        return new getImageData_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public submitImage_result getResult(I iface, submitImage_args args) throws org.apache.thrift.TException {
-        submitImage_result result = new submitImage_result();
+      public getImageData_result getResult(I iface, getImageData_args args) throws org.apache.thrift.TException {
+        getImageData_result result = new getImageData_result();
         try {
-          result.success = iface.submitImage(args.serverSessionId, args.imageDescription, args.blockHashes);
+          result.success = iface.getImageData(args.serverSessionId, args.imageVersionId);
         } catch (TAuthorizationException failure) {
           result.failure = failure;
         } catch (TInvocationException failure2) {
           result.failure2 = failure2;
-        } catch (TTransferRejectedException failure3) {
-          result.failure3 = failure3;
+        } catch (TNotFoundException f3) {
+          result.f3 = f3;
         }
         return result;
       }
     }
 
-    public static class getImage<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getImage_args> {
-      public getImage() {
-        super("getImage");
+    public static class submitImage<I extends Iface> extends org.apache.thrift.ProcessFunction<I, submitImage_args> {
+      public submitImage() {
+        super("submitImage");
       }
 
-      public getImage_args getEmptyArgsInstance() {
-        return new getImage_args();
+      public submitImage_args getEmptyArgsInstance() {
+        return new submitImage_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getImage_result getResult(I iface, getImage_args args) throws org.apache.thrift.TException {
-        getImage_result result = new getImage_result();
+      public submitImage_result getResult(I iface, submitImage_args args) throws org.apache.thrift.TException {
+        submitImage_result result = new submitImage_result();
         try {
-          result.success = iface.getImage(args.serverSessionId, args.imageVersionId);
+          result.success = iface.submitImage(args.serverSessionId, args.imageDescription, args.blockHashes);
         } catch (TAuthorizationException failure) {
           result.failure = failure;
         } catch (TInvocationException failure2) {
           result.failure2 = failure2;
+        } catch (TTransferRejectedException failure3) {
+          result.failure3 = failure3;
         }
         return result;
       }
@@ -1702,6 +1780,34 @@ public class MasterServer {
       }
     }
 
+    public static class downloadImage<I extends Iface> extends org.apache.thrift.ProcessFunction<I, downloadImage_args> {
+      public downloadImage() {
+        super("downloadImage");
+      }
+
+      public downloadImage_args getEmptyArgsInstance() {
+        return new downloadImage_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public downloadImage_result getResult(I iface, downloadImage_args args) throws org.apache.thrift.TException {
+        downloadImage_result result = new downloadImage_result();
+        try {
+          result.success = iface.downloadImage(args.sessionId, args.imageVersionId);
+        } catch (TAuthorizationException failure) {
+          result.failure = failure;
+        } catch (TInvocationException failure2) {
+          result.failure2 = failure2;
+        } catch (TNotFoundException f3) {
+          result.f3 = f3;
+        }
+        return result;
+      }
+    }
+
     public static class getOrganizations<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getOrganizations_args> {
       public getOrganizations() {
         super("getOrganizations");
@@ -1845,10 +1951,11 @@ public class MasterServer {
       processMap.put("isServerAuthenticated", new isServerAuthenticated());
       processMap.put("startServerAuthentication", new startServerAuthentication());
       processMap.put("serverAuthenticate", new serverAuthenticate());
+      processMap.put("getImageData", new getImageData());
       processMap.put("submitImage", new submitImage());
-      processMap.put("getImage", new getImage());
       processMap.put("registerSatellite", new registerSatellite());
       processMap.put("updateSatelliteAddress", new updateSatelliteAddress());
+      processMap.put("downloadImage", new downloadImage());
       processMap.put("getOrganizations", new getOrganizations());
       processMap.put("getOperatingSystems", new getOperatingSystems());
       processMap.put("getVirtualizers", new getVirtualizers());
@@ -2446,20 +2553,20 @@ public class MasterServer {
       }
     }
 
-    public static class submitImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitImage_args, TransferInformation> {
-      public submitImage() {
-        super("submitImage");
+    public static class getImageData<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImageData_args, ImagePublishData> {
+      public getImageData() {
+        super("getImageData");
       }
 
-      public submitImage_args getEmptyArgsInstance() {
-        return new submitImage_args();
+      public getImageData_args getEmptyArgsInstance() {
+        return new getImageData_args();
       }
 
-      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<ImagePublishData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferInformation>() { 
-          public void onComplete(TransferInformation o) {
-            submitImage_result result = new submitImage_result();
+        return new AsyncMethodCallback<ImagePublishData>() { 
+          public void onComplete(ImagePublishData o) {
+            getImageData_result result = new getImageData_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2472,7 +2579,7 @@ public class MasterServer {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            submitImage_result result = new submitImage_result();
+            getImageData_result result = new getImageData_result();
             if (e instanceof TAuthorizationException) {
                         result.failure = (TAuthorizationException) e;
                         result.setFailureIsSet(true);
@@ -2483,9 +2590,9 @@ public class MasterServer {
                         result.setFailure2IsSet(true);
                         msg = result;
             }
-            else             if (e instanceof TTransferRejectedException) {
-                        result.failure3 = (TTransferRejectedException) e;
-                        result.setFailure3IsSet(true);
+            else             if (e instanceof TNotFoundException) {
+                        result.f3 = (TNotFoundException) e;
+                        result.setF3IsSet(true);
                         msg = result;
             }
              else 
@@ -2508,25 +2615,25 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
-        iface.submitImage(args.serverSessionId, args.imageDescription, args.blockHashes,resultHandler);
+      public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler) throws TException {
+        iface.getImageData(args.serverSessionId, args.imageVersionId,resultHandler);
       }
     }
 
-    public static class getImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImage_args, TransferInformation> {
-      public getImage() {
-        super("getImage");
+    public static class submitImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitImage_args, TransferInformation> {
+      public submitImage() {
+        super("submitImage");
       }
 
-      public getImage_args getEmptyArgsInstance() {
-        return new getImage_args();
+      public submitImage_args getEmptyArgsInstance() {
+        return new submitImage_args();
       }
 
       public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<TransferInformation>() { 
           public void onComplete(TransferInformation o) {
-            getImage_result result = new getImage_result();
+            submitImage_result result = new submitImage_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2539,7 +2646,7 @@ public class MasterServer {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getImage_result result = new getImage_result();
+            submitImage_result result = new submitImage_result();
             if (e instanceof TAuthorizationException) {
                         result.failure = (TAuthorizationException) e;
                         result.setFailureIsSet(true);
@@ -2550,6 +2657,11 @@ public class MasterServer {
                         result.setFailure2IsSet(true);
                         msg = result;
             }
+            else             if (e instanceof TTransferRejectedException) {
+                        result.failure3 = (TTransferRejectedException) e;
+                        result.setFailure3IsSet(true);
+                        msg = result;
+            }
              else 
             {
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
@@ -2570,8 +2682,8 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
-        iface.getImage(args.serverSessionId, args.imageVersionId,resultHandler);
+      public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+        iface.submitImage(args.serverSessionId, args.imageDescription, args.blockHashes,resultHandler);
       }
     }
 
@@ -2696,6 +2808,73 @@ public class MasterServer {
       }
     }
 
+    public static class downloadImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, downloadImage_args, TransferInformation> {
+      public downloadImage() {
+        super("downloadImage");
+      }
+
+      public downloadImage_args getEmptyArgsInstance() {
+        return new downloadImage_args();
+      }
+
+      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<TransferInformation>() { 
+          public void onComplete(TransferInformation o) {
+            downloadImage_result result = new downloadImage_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            downloadImage_result result = new downloadImage_result();
+            if (e instanceof TAuthorizationException) {
+                        result.failure = (TAuthorizationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof TInvocationException) {
+                        result.failure2 = (TInvocationException) e;
+                        result.setFailure2IsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof TNotFoundException) {
+                        result.f3 = (TNotFoundException) e;
+                        result.setF3IsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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, downloadImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+        iface.downloadImage(args.sessionId, args.imageVersionId,resultHandler);
+      }
+    }
+
     public static class getOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOrganizations_args, List<Organization>> {
       public getOrganizations() {
         super("getOrganizations");
@@ -6634,14 +6813,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list250 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list250.size);
-                  for (int _i251 = 0; _i251 < _list250.size; ++_i251)
+                  org.apache.thrift.protocol.TList _list266 = iprot.readListBegin();
+                  struct.success = new ArrayList<UserInfo>(_list266.size);
+                  for (int _i267 = 0; _i267 < _list266.size; ++_i267)
                   {
-                    UserInfo _elem252;
-                    _elem252 = new UserInfo();
-                    _elem252.read(iprot);
-                    struct.success.add(_elem252);
+                    UserInfo _elem268;
+                    _elem268 = new UserInfo();
+                    _elem268.read(iprot);
+                    struct.success.add(_elem268);
                   }
                   iprot.readListEnd();
                 }
@@ -6687,9 +6866,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 _iter253 : struct.success)
+            for (UserInfo _iter269 : struct.success)
             {
-              _iter253.write(oprot);
+              _iter269.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -6736,9 +6915,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter254 : struct.success)
+            for (UserInfo _iter270 : struct.success)
             {
-              _iter254.write(oprot);
+              _iter270.write(oprot);
             }
           }
         }
@@ -6756,14 +6935,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_list255.size);
-            for (int _i256 = 0; _i256 < _list255.size; ++_i256)
+            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)
             {
-              UserInfo _elem257;
-              _elem257 = new UserInfo();
-              _elem257.read(iprot);
-              struct.success.add(_elem257);
+              UserInfo _elem273;
+              _elem273 = new UserInfo();
+              _elem273.read(iprot);
+              struct.success.add(_elem273);
             }
           }
           struct.setSuccessIsSet(true);
@@ -7698,14 +7877,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list258 = iprot.readListBegin();
-                  struct.success = new ArrayList<ImagePublishData>(_list258.size);
-                  for (int _i259 = 0; _i259 < _list258.size; ++_i259)
+                  org.apache.thrift.protocol.TList _list274 = iprot.readListBegin();
+                  struct.success = new ArrayList<ImagePublishData>(_list274.size);
+                  for (int _i275 = 0; _i275 < _list274.size; ++_i275)
                   {
-                    ImagePublishData _elem260;
-                    _elem260 = new ImagePublishData();
-                    _elem260.read(iprot);
-                    struct.success.add(_elem260);
+                    ImagePublishData _elem276;
+                    _elem276 = new ImagePublishData();
+                    _elem276.read(iprot);
+                    struct.success.add(_elem276);
                   }
                   iprot.readListEnd();
                 }
@@ -7751,9 +7930,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 _iter261 : struct.success)
+            for (ImagePublishData _iter277 : struct.success)
             {
-              _iter261.write(oprot);
+              _iter277.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7800,9 +7979,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImagePublishData _iter262 : struct.success)
+            for (ImagePublishData _iter278 : struct.success)
             {
-              _iter262.write(oprot);
+              _iter278.write(oprot);
             }
           }
         }
@@ -7820,14 +7999,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list263 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ImagePublishData>(_list263.size);
-            for (int _i264 = 0; _i264 < _list263.size; ++_i264)
+            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)
             {
-              ImagePublishData _elem265;
-              _elem265 = new ImagePublishData();
-              _elem265.read(iprot);
-              struct.success.add(_elem265);
+              ImagePublishData _elem281;
+              _elem281 = new ImagePublishData();
+              _elem281.read(iprot);
+              struct.success.add(_elem281);
             }
           }
           struct.setSuccessIsSet(true);
@@ -12031,28 +12210,25 @@ public class MasterServer {
 
   }
 
-  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_args");
+  public static class getImageData_args implements org.apache.thrift.TBase<getImageData_args, getImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageData_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageData_args");
 
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField IMAGE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageDescription", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)3);
+    private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new submitImage_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new submitImage_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getImageData_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getImageData_argsTupleSchemeFactory());
     }
 
     public String serverSessionId; // required
-    public ImagePublishData imageDescription; // required
-    public List<ByteBuffer> blockHashes; // required
+    public String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SERVER_SESSION_ID((short)1, "serverSessionId"),
-      IMAGE_DESCRIPTION((short)2, "imageDescription"),
-      BLOCK_HASHES((short)3, "blockHashes");
+      IMAGE_VERSION_ID((short)2, "imageVersionId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -12069,10 +12245,8 @@ public class MasterServer {
         switch(fieldId) {
           case 1: // SERVER_SESSION_ID
             return SERVER_SESSION_ID;
-          case 2: // IMAGE_DESCRIPTION
-            return IMAGE_DESCRIPTION;
-          case 3: // BLOCK_HASHES
-            return BLOCK_HASHES;
+          case 2: // IMAGE_VERSION_ID
+            return IMAGE_VERSION_ID;
           default:
             return null;
         }
@@ -12118,61 +12292,51 @@ public class MasterServer {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      tmpMap.put(_Fields.IMAGE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("imageDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePublishData.class)));
-      tmpMap.put(_Fields.BLOCK_HASHES, new org.apache.thrift.meta_data.FieldMetaData("blockHashes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
+      tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_args.class, metaDataMap);
     }
 
-    public submitImage_args() {
+    public getImageData_args() {
     }
 
-    public submitImage_args(
+    public getImageData_args(
       String serverSessionId,
-      ImagePublishData imageDescription,
-      List<ByteBuffer> blockHashes)
+      String imageVersionId)
     {
       this();
       this.serverSessionId = serverSessionId;
-      this.imageDescription = imageDescription;
-      this.blockHashes = blockHashes;
+      this.imageVersionId = imageVersionId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public submitImage_args(submitImage_args other) {
+    public getImageData_args(getImageData_args other) {
       if (other.isSetServerSessionId()) {
         this.serverSessionId = other.serverSessionId;
       }
-      if (other.isSetImageDescription()) {
-        this.imageDescription = new ImagePublishData(other.imageDescription);
-      }
-      if (other.isSetBlockHashes()) {
-        List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
-        this.blockHashes = __this__blockHashes;
+      if (other.isSetImageVersionId()) {
+        this.imageVersionId = other.imageVersionId;
       }
     }
 
-    public submitImage_args deepCopy() {
-      return new submitImage_args(this);
+    public getImageData_args deepCopy() {
+      return new getImageData_args(this);
     }
 
     @Override
     public void clear() {
       this.serverSessionId = null;
-      this.imageDescription = null;
-      this.blockHashes = null;
+      this.imageVersionId = null;
     }
 
     public String getServerSessionId() {
       return this.serverSessionId;
     }
 
-    public submitImage_args setServerSessionId(String serverSessionId) {
+    public getImageData_args setServerSessionId(String serverSessionId) {
       this.serverSessionId = serverSessionId;
       return this;
     }
@@ -12192,66 +12356,27 @@ public class MasterServer {
       }
     }
 
-    public ImagePublishData getImageDescription() {
-      return this.imageDescription;
-    }
-
-    public submitImage_args setImageDescription(ImagePublishData imageDescription) {
-      this.imageDescription = imageDescription;
-      return this;
-    }
-
-    public void unsetImageDescription() {
-      this.imageDescription = null;
-    }
-
-    /** Returns true if field imageDescription is set (has been assigned a value) and false otherwise */
-    public boolean isSetImageDescription() {
-      return this.imageDescription != null;
-    }
-
-    public void setImageDescriptionIsSet(boolean value) {
-      if (!value) {
-        this.imageDescription = null;
-      }
-    }
-
-    public int getBlockHashesSize() {
-      return (this.blockHashes == null) ? 0 : this.blockHashes.size();
-    }
-
-    public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
-      return (this.blockHashes == null) ? null : this.blockHashes.iterator();
-    }
-
-    public void addToBlockHashes(ByteBuffer elem) {
-      if (this.blockHashes == null) {
-        this.blockHashes = new ArrayList<ByteBuffer>();
-      }
-      this.blockHashes.add(elem);
-    }
-
-    public List<ByteBuffer> getBlockHashes() {
-      return this.blockHashes;
+    public String getImageVersionId() {
+      return this.imageVersionId;
     }
 
-    public submitImage_args setBlockHashes(List<ByteBuffer> blockHashes) {
-      this.blockHashes = blockHashes;
+    public getImageData_args setImageVersionId(String imageVersionId) {
+      this.imageVersionId = imageVersionId;
       return this;
     }
 
-    public void unsetBlockHashes() {
-      this.blockHashes = null;
+    public void unsetImageVersionId() {
+      this.imageVersionId = null;
     }
 
-    /** Returns true if field blockHashes is set (has been assigned a value) and false otherwise */
-    public boolean isSetBlockHashes() {
-      return this.blockHashes != null;
+    /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
+    public boolean isSetImageVersionId() {
+      return this.imageVersionId != null;
     }
 
-    public void setBlockHashesIsSet(boolean value) {
+    public void setImageVersionIdIsSet(boolean value) {
       if (!value) {
-        this.blockHashes = null;
+        this.imageVersionId = null;
       }
     }
 
@@ -12265,19 +12390,11 @@ public class MasterServer {
         }
         break;
 
-      case IMAGE_DESCRIPTION:
-        if (value == null) {
-          unsetImageDescription();
-        } else {
-          setImageDescription((ImagePublishData)value);
-        }
-        break;
-
-      case BLOCK_HASHES:
+      case IMAGE_VERSION_ID:
         if (value == null) {
-          unsetBlockHashes();
+          unsetImageVersionId();
         } else {
-          setBlockHashes((List<ByteBuffer>)value);
+          setImageVersionId((String)value);
         }
         break;
 
@@ -12289,11 +12406,8 @@ public class MasterServer {
       case SERVER_SESSION_ID:
         return getServerSessionId();
 
-      case IMAGE_DESCRIPTION:
-        return getImageDescription();
-
-      case BLOCK_HASHES:
-        return getBlockHashes();
+      case IMAGE_VERSION_ID:
+        return getImageVersionId();
 
       }
       throw new IllegalStateException();
@@ -12308,10 +12422,8 @@ public class MasterServer {
       switch (field) {
       case SERVER_SESSION_ID:
         return isSetServerSessionId();
-      case IMAGE_DESCRIPTION:
-        return isSetImageDescription();
-      case BLOCK_HASHES:
-        return isSetBlockHashes();
+      case IMAGE_VERSION_ID:
+        return isSetImageVersionId();
       }
       throw new IllegalStateException();
     }
@@ -12320,12 +12432,12 @@ public class MasterServer {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof submitImage_args)
-        return this.equals((submitImage_args)that);
+      if (that instanceof getImageData_args)
+        return this.equals((getImageData_args)that);
       return false;
     }
 
-    public boolean equals(submitImage_args that) {
+    public boolean equals(getImageData_args that) {
       if (that == null)
         return false;
 
@@ -12338,21 +12450,12 @@ public class MasterServer {
           return false;
       }
 
-      boolean this_present_imageDescription = true && this.isSetImageDescription();
-      boolean that_present_imageDescription = true && that.isSetImageDescription();
-      if (this_present_imageDescription || that_present_imageDescription) {
-        if (!(this_present_imageDescription && that_present_imageDescription))
-          return false;
-        if (!this.imageDescription.equals(that.imageDescription))
-          return false;
-      }
-
-      boolean this_present_blockHashes = true && this.isSetBlockHashes();
-      boolean that_present_blockHashes = true && that.isSetBlockHashes();
-      if (this_present_blockHashes || that_present_blockHashes) {
-        if (!(this_present_blockHashes && that_present_blockHashes))
+      boolean this_present_imageVersionId = true && this.isSetImageVersionId();
+      boolean that_present_imageVersionId = true && that.isSetImageVersionId();
+      if (this_present_imageVersionId || that_present_imageVersionId) {
+        if (!(this_present_imageVersionId && that_present_imageVersionId))
           return false;
-        if (!this.blockHashes.equals(that.blockHashes))
+        if (!this.imageVersionId.equals(that.imageVersionId))
           return false;
       }
 
@@ -12365,7 +12468,7 @@ public class MasterServer {
     }
 
     @Override
-    public int compareTo(submitImage_args other) {
+    public int compareTo(getImageData_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -12382,22 +12485,12 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetImageDescription()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetBlockHashes()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockHashes, other.blockHashes);
+      if (isSetImageVersionId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -12419,7 +12512,7 @@ public class MasterServer {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("submitImage_args(");
+      StringBuilder sb = new StringBuilder("getImageData_args(");
       boolean first = true;
 
       sb.append("serverSessionId:");
@@ -12430,19 +12523,11 @@ public class MasterServer {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("imageDescription:");
-      if (this.imageDescription == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.imageDescription);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("blockHashes:");
-      if (this.blockHashes == null) {
+      sb.append("imageVersionId:");
+      if (this.imageVersionId == null) {
         sb.append("null");
       } else {
-        sb.append(this.blockHashes);
+        sb.append(this.imageVersionId);
       }
       first = false;
       sb.append(")");
@@ -12452,9 +12537,6 @@ public class MasterServer {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
-      if (imageDescription != null) {
-        imageDescription.validate();
-      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -12473,15 +12555,15 @@ public class MasterServer {
       }
     }
 
-    private static class submitImage_argsStandardSchemeFactory implements SchemeFactory {
-      public submitImage_argsStandardScheme getScheme() {
-        return new submitImage_argsStandardScheme();
+    private static class getImageData_argsStandardSchemeFactory implements SchemeFactory {
+      public getImageData_argsStandardScheme getScheme() {
+        return new getImageData_argsStandardScheme();
       }
     }
 
-    private static class submitImage_argsStandardScheme extends StandardScheme<submitImage_args> {
+    private static class getImageData_argsStandardScheme extends StandardScheme<getImageData_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -12499,29 +12581,10 @@ public class MasterServer {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // IMAGE_DESCRIPTION
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.imageDescription = new ImagePublishData();
-                struct.imageDescription.read(iprot);
-                struct.setImageDescriptionIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // BLOCK_HASHES
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list266 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list266.size);
-                  for (int _i267 = 0; _i267 < _list266.size; ++_i267)
-                  {
-                    ByteBuffer _elem268;
-                    _elem268 = iprot.readBinary();
-                    struct.blockHashes.add(_elem268);
-                  }
-                  iprot.readListEnd();
-                }
-                struct.setBlockHashesIsSet(true);
+            case 2: // IMAGE_VERSION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.imageVersionId = iprot.readString();
+                struct.setImageVersionIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -12537,7 +12600,7 @@ public class MasterServer {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, submitImage_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getImageData_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -12546,21 +12609,9 @@ public class MasterServer {
           oprot.writeString(struct.serverSessionId);
           oprot.writeFieldEnd();
         }
-        if (struct.imageDescription != null) {
-          oprot.writeFieldBegin(IMAGE_DESCRIPTION_FIELD_DESC);
-          struct.imageDescription.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.blockHashes != null) {
-          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 _iter269 : struct.blockHashes)
-            {
-              oprot.writeBinary(_iter269);
-            }
-            oprot.writeListEnd();
-          }
+        if (struct.imageVersionId != null) {
+          oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
+          oprot.writeString(struct.imageVersionId);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -12569,101 +12620,75 @@ public class MasterServer {
 
     }
 
-    private static class submitImage_argsTupleSchemeFactory implements SchemeFactory {
-      public submitImage_argsTupleScheme getScheme() {
-        return new submitImage_argsTupleScheme();
+    private static class getImageData_argsTupleSchemeFactory implements SchemeFactory {
+      public getImageData_argsTupleScheme getScheme() {
+        return new getImageData_argsTupleScheme();
       }
     }
 
-    private static class submitImage_argsTupleScheme extends TupleScheme<submitImage_args> {
+    private static class getImageData_argsTupleScheme extends TupleScheme<getImageData_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetServerSessionId()) {
           optionals.set(0);
         }
-        if (struct.isSetImageDescription()) {
+        if (struct.isSetImageVersionId()) {
           optionals.set(1);
         }
-        if (struct.isSetBlockHashes()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetServerSessionId()) {
           oprot.writeString(struct.serverSessionId);
         }
-        if (struct.isSetImageDescription()) {
-          struct.imageDescription.write(oprot);
-        }
-        if (struct.isSetBlockHashes()) {
-          {
-            oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter270 : struct.blockHashes)
-            {
-              oprot.writeBinary(_iter270);
-            }
-          }
+        if (struct.isSetImageVersionId()) {
+          oprot.writeString(struct.imageVersionId);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.imageDescription = new ImagePublishData();
-          struct.imageDescription.read(iprot);
-          struct.setImageDescriptionIsSet(true);
-        }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list271.size);
-            for (int _i272 = 0; _i272 < _list271.size; ++_i272)
-            {
-              ByteBuffer _elem273;
-              _elem273 = iprot.readBinary();
-              struct.blockHashes.add(_elem273);
-            }
-          }
-          struct.setBlockHashesIsSet(true);
+          struct.imageVersionId = iprot.readString();
+          struct.setImageVersionIdIsSet(true);
         }
       }
     }
 
   }
 
-  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_result");
+  public static class getImageData_result implements org.apache.thrift.TBase<getImageData_result, getImageData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageData_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImageData_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField FAILURE3_FIELD_DESC = new org.apache.thrift.protocol.TField("failure3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new submitImage_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new submitImage_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getImageData_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getImageData_resultTupleSchemeFactory());
     }
 
-    public TransferInformation success; // required
+    public ImagePublishData success; // required
     public TAuthorizationException failure; // required
     public TInvocationException failure2; // required
-    public TTransferRejectedException failure3; // required
+    public TNotFoundException f3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       FAILURE((short)1, "failure"),
       FAILURE2((short)2, "failure2"),
-      FAILURE3((short)3, "failure3");
+      F3((short)3, "f3");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -12684,8 +12709,8 @@ public class MasterServer {
             return FAILURE;
           case 2: // FAILURE2
             return FAILURE2;
-          case 3: // FAILURE3
-            return FAILURE3;
+          case 3: // F3
+            return F3;
           default:
             return null;
         }
@@ -12730,39 +12755,39 @@ public class MasterServer {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePublishData.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      tmpMap.put(_Fields.FAILURE3, new org.apache.thrift.meta_data.FieldMetaData("failure3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+      tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_result.class, metaDataMap);
     }
 
-    public submitImage_result() {
+    public getImageData_result() {
     }
 
-    public submitImage_result(
-      TransferInformation success,
+    public getImageData_result(
+      ImagePublishData success,
       TAuthorizationException failure,
       TInvocationException failure2,
-      TTransferRejectedException failure3)
+      TNotFoundException f3)
     {
       this();
       this.success = success;
       this.failure = failure;
       this.failure2 = failure2;
-      this.failure3 = failure3;
+      this.f3 = f3;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public submitImage_result(submitImage_result other) {
+    public getImageData_result(getImageData_result other) {
       if (other.isSetSuccess()) {
-        this.success = new TransferInformation(other.success);
+        this.success = new ImagePublishData(other.success);
       }
       if (other.isSetFailure()) {
         this.failure = new TAuthorizationException(other.failure);
@@ -12770,13 +12795,13 @@ public class MasterServer {
       if (other.isSetFailure2()) {
         this.failure2 = new TInvocationException(other.failure2);
       }
-      if (other.isSetFailure3()) {
-        this.failure3 = new TTransferRejectedException(other.failure3);
+      if (other.isSetF3()) {
+        this.f3 = new TNotFoundException(other.f3);
       }
     }
 
-    public submitImage_result deepCopy() {
-      return new submitImage_result(this);
+    public getImageData_result deepCopy() {
+      return new getImageData_result(this);
     }
 
     @Override
@@ -12784,14 +12809,14 @@ public class MasterServer {
       this.success = null;
       this.failure = null;
       this.failure2 = null;
-      this.failure3 = null;
+      this.f3 = null;
     }
 
-    public TransferInformation getSuccess() {
+    public ImagePublishData getSuccess() {
       return this.success;
     }
 
-    public submitImage_result setSuccess(TransferInformation success) {
+    public getImageData_result setSuccess(ImagePublishData success) {
       this.success = success;
       return this;
     }
@@ -12815,7 +12840,7 @@ public class MasterServer {
       return this.failure;
     }
 
-    public submitImage_result setFailure(TAuthorizationException failure) {
+    public getImageData_result setFailure(TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -12839,7 +12864,7 @@ public class MasterServer {
       return this.failure2;
     }
 
-    public submitImage_result setFailure2(TInvocationException failure2) {
+    public getImageData_result setFailure2(TInvocationException failure2) {
       this.failure2 = failure2;
       return this;
     }
@@ -12859,27 +12884,27 @@ public class MasterServer {
       }
     }
 
-    public TTransferRejectedException getFailure3() {
-      return this.failure3;
+    public TNotFoundException getF3() {
+      return this.f3;
     }
 
-    public submitImage_result setFailure3(TTransferRejectedException failure3) {
-      this.failure3 = failure3;
+    public getImageData_result setF3(TNotFoundException f3) {
+      this.f3 = f3;
       return this;
     }
 
-    public void unsetFailure3() {
-      this.failure3 = null;
+    public void unsetF3() {
+      this.f3 = null;
     }
 
-    /** Returns true if field failure3 is set (has been assigned a value) and false otherwise */
-    public boolean isSetFailure3() {
-      return this.failure3 != null;
+    /** Returns true if field f3 is set (has been assigned a value) and false otherwise */
+    public boolean isSetF3() {
+      return this.f3 != null;
     }
 
-    public void setFailure3IsSet(boolean value) {
+    public void setF3IsSet(boolean value) {
       if (!value) {
-        this.failure3 = null;
+        this.f3 = null;
       }
     }
 
@@ -12889,7 +12914,7 @@ public class MasterServer {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((TransferInformation)value);
+          setSuccess((ImagePublishData)value);
         }
         break;
 
@@ -12909,11 +12934,11 @@ public class MasterServer {
         }
         break;
 
-      case FAILURE3:
+      case F3:
         if (value == null) {
-          unsetFailure3();
+          unsetF3();
         } else {
-          setFailure3((TTransferRejectedException)value);
+          setF3((TNotFoundException)value);
         }
         break;
 
@@ -12931,8 +12956,8 @@ public class MasterServer {
       case FAILURE2:
         return getFailure2();
 
-      case FAILURE3:
-        return getFailure3();
+      case F3:
+        return getF3();
 
       }
       throw new IllegalStateException();
@@ -12951,8 +12976,8 @@ public class MasterServer {
         return isSetFailure();
       case FAILURE2:
         return isSetFailure2();
-      case FAILURE3:
-        return isSetFailure3();
+      case F3:
+        return isSetF3();
       }
       throw new IllegalStateException();
     }
@@ -12961,12 +12986,12 @@ public class MasterServer {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof submitImage_result)
-        return this.equals((submitImage_result)that);
+      if (that instanceof getImageData_result)
+        return this.equals((getImageData_result)that);
       return false;
     }
 
-    public boolean equals(submitImage_result that) {
+    public boolean equals(getImageData_result that) {
       if (that == null)
         return false;
 
@@ -12997,12 +13022,12 @@ public class MasterServer {
           return false;
       }
 
-      boolean this_present_failure3 = true && this.isSetFailure3();
-      boolean that_present_failure3 = true && that.isSetFailure3();
-      if (this_present_failure3 || that_present_failure3) {
-        if (!(this_present_failure3 && that_present_failure3))
+      boolean this_present_f3 = true && this.isSetF3();
+      boolean that_present_f3 = true && that.isSetF3();
+      if (this_present_f3 || that_present_f3) {
+        if (!(this_present_f3 && that_present_f3))
           return false;
-        if (!this.failure3.equals(that.failure3))
+        if (!this.f3.equals(that.f3))
           return false;
       }
 
@@ -13015,7 +13040,7 @@ public class MasterServer {
     }
 
     @Override
-    public int compareTo(submitImage_result other) {
+    public int compareTo(getImageData_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -13052,12 +13077,12 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
+      lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetFailure3()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3);
+      if (isSetF3()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f3, other.f3);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13079,7 +13104,7 @@ public class MasterServer {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("submitImage_result(");
+      StringBuilder sb = new StringBuilder("getImageData_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -13106,11 +13131,11 @@ public class MasterServer {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("failure3:");
-      if (this.failure3 == null) {
+      sb.append("f3:");
+      if (this.f3 == null) {
         sb.append("null");
       } else {
-        sb.append(this.failure3);
+        sb.append(this.f3);
       }
       first = false;
       sb.append(")");
@@ -13141,15 +13166,15 @@ public class MasterServer {
       }
     }
 
-    private static class submitImage_resultStandardSchemeFactory implements SchemeFactory {
-      public submitImage_resultStandardScheme getScheme() {
-        return new submitImage_resultStandardScheme();
+    private static class getImageData_resultStandardSchemeFactory implements SchemeFactory {
+      public getImageData_resultStandardScheme getScheme() {
+        return new getImageData_resultStandardScheme();
       }
     }
 
-    private static class submitImage_resultStandardScheme extends StandardScheme<submitImage_result> {
+    private static class getImageData_resultStandardScheme extends StandardScheme<getImageData_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -13161,7 +13186,7 @@ public class MasterServer {
           switch (schemeField.id) {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.success = new TransferInformation();
+                struct.success = new ImagePublishData();
                 struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
               } else { 
@@ -13186,11 +13211,11 @@ public class MasterServer {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // FAILURE3
+            case 3: // F3
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.failure3 = new TTransferRejectedException();
-                struct.failure3.read(iprot);
-                struct.setFailure3IsSet(true);
+                struct.f3 = new TNotFoundException();
+                struct.f3.read(iprot);
+                struct.setF3IsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -13206,7 +13231,7 @@ public class MasterServer {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, submitImage_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getImageData_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -13225,9 +13250,9 @@ public class MasterServer {
           struct.failure2.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.failure3 != null) {
-          oprot.writeFieldBegin(FAILURE3_FIELD_DESC);
-          struct.failure3.write(oprot);
+        if (struct.f3 != null) {
+          oprot.writeFieldBegin(F3_FIELD_DESC);
+          struct.f3.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -13236,16 +13261,16 @@ public class MasterServer {
 
     }
 
-    private static class submitImage_resultTupleSchemeFactory implements SchemeFactory {
-      public submitImage_resultTupleScheme getScheme() {
-        return new submitImage_resultTupleScheme();
+    private static class getImageData_resultTupleSchemeFactory implements SchemeFactory {
+      public getImageData_resultTupleScheme getScheme() {
+        return new getImageData_resultTupleScheme();
       }
     }
 
-    private static class submitImage_resultTupleScheme extends TupleScheme<submitImage_result> {
+    private static class getImageData_resultTupleScheme extends TupleScheme<getImageData_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -13257,7 +13282,7 @@ public class MasterServer {
         if (struct.isSetFailure2()) {
           optionals.set(2);
         }
-        if (struct.isSetFailure3()) {
+        if (struct.isSetF3()) {
           optionals.set(3);
         }
         oprot.writeBitSet(optionals, 4);
@@ -13270,17 +13295,17 @@ public class MasterServer {
         if (struct.isSetFailure2()) {
           struct.failure2.write(oprot);
         }
-        if (struct.isSetFailure3()) {
-          struct.failure3.write(oprot);
+        if (struct.isSetF3()) {
+          struct.f3.write(oprot);
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
-          struct.success = new TransferInformation();
+          struct.success = new ImagePublishData();
           struct.success.read(iprot);
           struct.setSuccessIsSet(true);
         }
@@ -13295,34 +13320,37 @@ public class MasterServer {
           struct.setFailure2IsSet(true);
         }
         if (incoming.get(3)) {
-          struct.failure3 = new TTransferRejectedException();
-          struct.failure3.read(iprot);
-          struct.setFailure3IsSet(true);
+          struct.f3 = new TNotFoundException();
+          struct.f3.read(iprot);
+          struct.setF3IsSet(true);
         }
       }
     }
 
   }
 
-  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_args");
+  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_args");
 
-    private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField IMAGE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageDescription", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getImage_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImage_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new submitImage_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new submitImage_argsTupleSchemeFactory());
     }
 
     public String serverSessionId; // required
-    public String imageVersionId; // required
+    public ImagePublishData imageDescription; // required
+    public List<ByteBuffer> blockHashes; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      SERVER_SESSION_ID((short)2, "serverSessionId"),
-      IMAGE_VERSION_ID((short)1, "imageVersionId");
+      SERVER_SESSION_ID((short)1, "serverSessionId"),
+      IMAGE_DESCRIPTION((short)2, "imageDescription"),
+      BLOCK_HASHES((short)3, "blockHashes");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -13337,10 +13365,12 @@ public class MasterServer {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 2: // SERVER_SESSION_ID
+          case 1: // SERVER_SESSION_ID
             return SERVER_SESSION_ID;
-          case 1: // IMAGE_VERSION_ID
-            return IMAGE_VERSION_ID;
+          case 2: // IMAGE_DESCRIPTION
+            return IMAGE_DESCRIPTION;
+          case 3: // BLOCK_HASHES
+            return BLOCK_HASHES;
           default:
             return null;
         }
@@ -13386,51 +13416,61 @@ public class MasterServer {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
+      tmpMap.put(_Fields.IMAGE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("imageDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePublishData.class)));
+      tmpMap.put(_Fields.BLOCK_HASHES, new org.apache.thrift.meta_data.FieldMetaData("blockHashes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImage_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_args.class, metaDataMap);
     }
 
-    public getImage_args() {
+    public submitImage_args() {
     }
 
-    public getImage_args(
+    public submitImage_args(
       String serverSessionId,
-      String imageVersionId)
+      ImagePublishData imageDescription,
+      List<ByteBuffer> blockHashes)
     {
       this();
       this.serverSessionId = serverSessionId;
-      this.imageVersionId = imageVersionId;
+      this.imageDescription = imageDescription;
+      this.blockHashes = blockHashes;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getImage_args(getImage_args other) {
+    public submitImage_args(submitImage_args other) {
       if (other.isSetServerSessionId()) {
         this.serverSessionId = other.serverSessionId;
       }
-      if (other.isSetImageVersionId()) {
-        this.imageVersionId = other.imageVersionId;
+      if (other.isSetImageDescription()) {
+        this.imageDescription = new ImagePublishData(other.imageDescription);
+      }
+      if (other.isSetBlockHashes()) {
+        List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
+        this.blockHashes = __this__blockHashes;
       }
     }
 
-    public getImage_args deepCopy() {
-      return new getImage_args(this);
+    public submitImage_args deepCopy() {
+      return new submitImage_args(this);
     }
 
     @Override
     public void clear() {
       this.serverSessionId = null;
-      this.imageVersionId = null;
+      this.imageDescription = null;
+      this.blockHashes = null;
     }
 
     public String getServerSessionId() {
       return this.serverSessionId;
     }
 
-    public getImage_args setServerSessionId(String serverSessionId) {
+    public submitImage_args setServerSessionId(String serverSessionId) {
       this.serverSessionId = serverSessionId;
       return this;
     }
@@ -13450,27 +13490,66 @@ public class MasterServer {
       }
     }
 
-    public String getImageVersionId() {
-      return this.imageVersionId;
+    public ImagePublishData getImageDescription() {
+      return this.imageDescription;
     }
 
-    public getImage_args setImageVersionId(String imageVersionId) {
-      this.imageVersionId = imageVersionId;
+    public submitImage_args setImageDescription(ImagePublishData imageDescription) {
+      this.imageDescription = imageDescription;
       return this;
     }
 
-    public void unsetImageVersionId() {
-      this.imageVersionId = null;
+    public void unsetImageDescription() {
+      this.imageDescription = null;
     }
 
-    /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
-    public boolean isSetImageVersionId() {
-      return this.imageVersionId != null;
+    /** Returns true if field imageDescription is set (has been assigned a value) and false otherwise */
+    public boolean isSetImageDescription() {
+      return this.imageDescription != null;
     }
 
-    public void setImageVersionIdIsSet(boolean value) {
+    public void setImageDescriptionIsSet(boolean value) {
       if (!value) {
-        this.imageVersionId = null;
+        this.imageDescription = null;
+      }
+    }
+
+    public int getBlockHashesSize() {
+      return (this.blockHashes == null) ? 0 : this.blockHashes.size();
+    }
+
+    public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
+      return (this.blockHashes == null) ? null : this.blockHashes.iterator();
+    }
+
+    public void addToBlockHashes(ByteBuffer elem) {
+      if (this.blockHashes == null) {
+        this.blockHashes = new ArrayList<ByteBuffer>();
+      }
+      this.blockHashes.add(elem);
+    }
+
+    public List<ByteBuffer> getBlockHashes() {
+      return this.blockHashes;
+    }
+
+    public submitImage_args setBlockHashes(List<ByteBuffer> blockHashes) {
+      this.blockHashes = blockHashes;
+      return this;
+    }
+
+    public void unsetBlockHashes() {
+      this.blockHashes = null;
+    }
+
+    /** Returns true if field blockHashes is set (has been assigned a value) and false otherwise */
+    public boolean isSetBlockHashes() {
+      return this.blockHashes != null;
+    }
+
+    public void setBlockHashesIsSet(boolean value) {
+      if (!value) {
+        this.blockHashes = null;
       }
     }
 
@@ -13484,11 +13563,19 @@ public class MasterServer {
         }
         break;
 
-      case IMAGE_VERSION_ID:
+      case IMAGE_DESCRIPTION:
         if (value == null) {
-          unsetImageVersionId();
+          unsetImageDescription();
         } else {
-          setImageVersionId((String)value);
+          setImageDescription((ImagePublishData)value);
+        }
+        break;
+
+      case BLOCK_HASHES:
+        if (value == null) {
+          unsetBlockHashes();
+        } else {
+          setBlockHashes((List<ByteBuffer>)value);
         }
         break;
 
@@ -13500,8 +13587,11 @@ public class MasterServer {
       case SERVER_SESSION_ID:
         return getServerSessionId();
 
-      case IMAGE_VERSION_ID:
-        return getImageVersionId();
+      case IMAGE_DESCRIPTION:
+        return getImageDescription();
+
+      case BLOCK_HASHES:
+        return getBlockHashes();
 
       }
       throw new IllegalStateException();
@@ -13516,8 +13606,10 @@ public class MasterServer {
       switch (field) {
       case SERVER_SESSION_ID:
         return isSetServerSessionId();
-      case IMAGE_VERSION_ID:
-        return isSetImageVersionId();
+      case IMAGE_DESCRIPTION:
+        return isSetImageDescription();
+      case BLOCK_HASHES:
+        return isSetBlockHashes();
       }
       throw new IllegalStateException();
     }
@@ -13526,12 +13618,12 @@ public class MasterServer {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getImage_args)
-        return this.equals((getImage_args)that);
+      if (that instanceof submitImage_args)
+        return this.equals((submitImage_args)that);
       return false;
     }
 
-    public boolean equals(getImage_args that) {
+    public boolean equals(submitImage_args that) {
       if (that == null)
         return false;
 
@@ -13544,12 +13636,21 @@ public class MasterServer {
           return false;
       }
 
-      boolean this_present_imageVersionId = true && this.isSetImageVersionId();
-      boolean that_present_imageVersionId = true && that.isSetImageVersionId();
-      if (this_present_imageVersionId || that_present_imageVersionId) {
-        if (!(this_present_imageVersionId && that_present_imageVersionId))
+      boolean this_present_imageDescription = true && this.isSetImageDescription();
+      boolean that_present_imageDescription = true && that.isSetImageDescription();
+      if (this_present_imageDescription || that_present_imageDescription) {
+        if (!(this_present_imageDescription && that_present_imageDescription))
           return false;
-        if (!this.imageVersionId.equals(that.imageVersionId))
+        if (!this.imageDescription.equals(that.imageDescription))
+          return false;
+      }
+
+      boolean this_present_blockHashes = true && this.isSetBlockHashes();
+      boolean that_present_blockHashes = true && that.isSetBlockHashes();
+      if (this_present_blockHashes || that_present_blockHashes) {
+        if (!(this_present_blockHashes && that_present_blockHashes))
+          return false;
+        if (!this.blockHashes.equals(that.blockHashes))
           return false;
       }
 
@@ -13562,7 +13663,7 @@ public class MasterServer {
     }
 
     @Override
-    public int compareTo(getImage_args other) {
+    public int compareTo(submitImage_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -13579,12 +13680,22 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetImageVersionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
+      if (isSetImageDescription()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetBlockHashes()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockHashes, other.blockHashes);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13606,7 +13717,7 @@ public class MasterServer {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getImage_args(");
+      StringBuilder sb = new StringBuilder("submitImage_args(");
       boolean first = true;
 
       sb.append("serverSessionId:");
@@ -13617,11 +13728,19 @@ public class MasterServer {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("imageVersionId:");
-      if (this.imageVersionId == null) {
+      sb.append("imageDescription:");
+      if (this.imageDescription == null) {
         sb.append("null");
       } else {
-        sb.append(this.imageVersionId);
+        sb.append(this.imageDescription);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("blockHashes:");
+      if (this.blockHashes == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.blockHashes);
       }
       first = false;
       sb.append(")");
@@ -13631,6 +13750,9 @@ public class MasterServer {
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
+      if (imageDescription != null) {
+        imageDescription.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -13649,15 +13771,15 @@ public class MasterServer {
       }
     }
 
-    private static class getImage_argsStandardSchemeFactory implements SchemeFactory {
-      public getImage_argsStandardScheme getScheme() {
-        return new getImage_argsStandardScheme();
+    private static class submitImage_argsStandardSchemeFactory implements SchemeFactory {
+      public submitImage_argsStandardScheme getScheme() {
+        return new submitImage_argsStandardScheme();
       }
     }
 
-    private static class getImage_argsStandardScheme extends StandardScheme<getImage_args> {
+    private static class submitImage_argsStandardScheme extends StandardScheme<submitImage_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getImage_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -13667,7 +13789,7 @@ public class MasterServer {
             break;
           }
           switch (schemeField.id) {
-            case 2: // SERVER_SESSION_ID
+            case 1: // SERVER_SESSION_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.serverSessionId = iprot.readString();
                 struct.setServerSessionIdIsSet(true);
@@ -13675,10 +13797,29 @@ public class MasterServer {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 1: // IMAGE_VERSION_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.imageVersionId = iprot.readString();
-                struct.setImageVersionIdIsSet(true);
+            case 2: // IMAGE_DESCRIPTION
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.imageDescription = new ImagePublishData();
+                struct.imageDescription.read(iprot);
+                struct.setImageDescriptionIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            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)
+                  {
+                    ByteBuffer _elem284;
+                    _elem284 = iprot.readBinary();
+                    struct.blockHashes.add(_elem284);
+                  }
+                  iprot.readListEnd();
+                }
+                struct.setBlockHashesIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -13694,92 +13835,133 @@ public class MasterServer {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getImage_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, submitImage_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.imageVersionId != null) {
-          oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
-          oprot.writeString(struct.imageVersionId);
-          oprot.writeFieldEnd();
-        }
         if (struct.serverSessionId != null) {
           oprot.writeFieldBegin(SERVER_SESSION_ID_FIELD_DESC);
           oprot.writeString(struct.serverSessionId);
           oprot.writeFieldEnd();
         }
+        if (struct.imageDescription != null) {
+          oprot.writeFieldBegin(IMAGE_DESCRIPTION_FIELD_DESC);
+          struct.imageDescription.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.blockHashes != null) {
+          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)
+            {
+              oprot.writeBinary(_iter285);
+            }
+            oprot.writeListEnd();
+          }
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class getImage_argsTupleSchemeFactory implements SchemeFactory {
-      public getImage_argsTupleScheme getScheme() {
-        return new getImage_argsTupleScheme();
+    private static class submitImage_argsTupleSchemeFactory implements SchemeFactory {
+      public submitImage_argsTupleScheme getScheme() {
+        return new submitImage_argsTupleScheme();
       }
     }
 
-    private static class getImage_argsTupleScheme extends TupleScheme<getImage_args> {
+    private static class submitImage_argsTupleScheme extends TupleScheme<submitImage_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getImage_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetServerSessionId()) {
           optionals.set(0);
         }
-        if (struct.isSetImageVersionId()) {
+        if (struct.isSetImageDescription()) {
           optionals.set(1);
         }
-        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetBlockHashes()) {
+          optionals.set(2);
+        }
+        oprot.writeBitSet(optionals, 3);
         if (struct.isSetServerSessionId()) {
           oprot.writeString(struct.serverSessionId);
         }
-        if (struct.isSetImageVersionId()) {
-          oprot.writeString(struct.imageVersionId);
+        if (struct.isSetImageDescription()) {
+          struct.imageDescription.write(oprot);
+        }
+        if (struct.isSetBlockHashes()) {
+          {
+            oprot.writeI32(struct.blockHashes.size());
+            for (ByteBuffer _iter286 : struct.blockHashes)
+            {
+              oprot.writeBinary(_iter286);
+            }
+          }
         }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getImage_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.imageVersionId = iprot.readString();
-          struct.setImageVersionIdIsSet(true);
+          struct.imageDescription = new ImagePublishData();
+          struct.imageDescription.read(iprot);
+          struct.setImageDescriptionIsSet(true);
+        }
+        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)
+            {
+              ByteBuffer _elem289;
+              _elem289 = iprot.readBinary();
+              struct.blockHashes.add(_elem289);
+            }
+          }
+          struct.setBlockHashesIsSet(true);
         }
       }
     }
 
   }
 
-  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_result");
+  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField FAILURE3_FIELD_DESC = new org.apache.thrift.protocol.TField("failure3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new getImage_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImage_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new submitImage_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new submitImage_resultTupleSchemeFactory());
     }
 
     public TransferInformation success; // required
     public TAuthorizationException failure; // required
     public TInvocationException failure2; // required
+    public TTransferRejectedException failure3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       FAILURE((short)1, "failure"),
-      FAILURE2((short)2, "failure2");
+      FAILURE2((short)2, "failure2"),
+      FAILURE3((short)3, "failure3");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -13800,6 +13982,8 @@ public class MasterServer {
             return FAILURE;
           case 2: // FAILURE2
             return FAILURE2;
+          case 3: // FAILURE3
+            return FAILURE3;
           default:
             return null;
         }
@@ -13849,28 +14033,32 @@ public class MasterServer {
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.FAILURE3, new org.apache.thrift.meta_data.FieldMetaData("failure3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImage_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_result.class, metaDataMap);
     }
 
-    public getImage_result() {
+    public submitImage_result() {
     }
 
-    public getImage_result(
+    public submitImage_result(
       TransferInformation success,
       TAuthorizationException failure,
-      TInvocationException failure2)
+      TInvocationException failure2,
+      TTransferRejectedException failure3)
     {
       this();
       this.success = success;
       this.failure = failure;
       this.failure2 = failure2;
+      this.failure3 = failure3;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getImage_result(getImage_result other) {
+    public submitImage_result(submitImage_result other) {
       if (other.isSetSuccess()) {
         this.success = new TransferInformation(other.success);
       }
@@ -13880,10 +14068,13 @@ public class MasterServer {
       if (other.isSetFailure2()) {
         this.failure2 = new TInvocationException(other.failure2);
       }
+      if (other.isSetFailure3()) {
+        this.failure3 = new TTransferRejectedException(other.failure3);
+      }
     }
 
-    public getImage_result deepCopy() {
-      return new getImage_result(this);
+    public submitImage_result deepCopy() {
+      return new submitImage_result(this);
     }
 
     @Override
@@ -13891,13 +14082,14 @@ public class MasterServer {
       this.success = null;
       this.failure = null;
       this.failure2 = null;
+      this.failure3 = null;
     }
 
     public TransferInformation getSuccess() {
       return this.success;
     }
 
-    public getImage_result setSuccess(TransferInformation success) {
+    public submitImage_result setSuccess(TransferInformation success) {
       this.success = success;
       return this;
     }
@@ -13921,7 +14113,7 @@ public class MasterServer {
       return this.failure;
     }
 
-    public getImage_result setFailure(TAuthorizationException failure) {
+    public submitImage_result setFailure(TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -13945,7 +14137,7 @@ public class MasterServer {
       return this.failure2;
     }
 
-    public getImage_result setFailure2(TInvocationException failure2) {
+    public submitImage_result setFailure2(TInvocationException failure2) {
       this.failure2 = failure2;
       return this;
     }
@@ -13965,6 +14157,30 @@ public class MasterServer {
       }
     }
 
+    public TTransferRejectedException getFailure3() {
+      return this.failure3;
+    }
+
+    public submitImage_result setFailure3(TTransferRejectedException failure3) {
+      this.failure3 = failure3;
+      return this;
+    }
+
+    public void unsetFailure3() {
+      this.failure3 = null;
+    }
+
+    /** Returns true if field failure3 is set (has been assigned a value) and false otherwise */
+    public boolean isSetFailure3() {
+      return this.failure3 != null;
+    }
+
+    public void setFailure3IsSet(boolean value) {
+      if (!value) {
+        this.failure3 = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -13991,6 +14207,14 @@ public class MasterServer {
         }
         break;
 
+      case FAILURE3:
+        if (value == null) {
+          unsetFailure3();
+        } else {
+          setFailure3((TTransferRejectedException)value);
+        }
+        break;
+
       }
     }
 
@@ -14005,6 +14229,9 @@ public class MasterServer {
       case FAILURE2:
         return getFailure2();
 
+      case FAILURE3:
+        return getFailure3();
+
       }
       throw new IllegalStateException();
     }
@@ -14022,6 +14249,8 @@ public class MasterServer {
         return isSetFailure();
       case FAILURE2:
         return isSetFailure2();
+      case FAILURE3:
+        return isSetFailure3();
       }
       throw new IllegalStateException();
     }
@@ -14030,12 +14259,12 @@ public class MasterServer {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getImage_result)
-        return this.equals((getImage_result)that);
+      if (that instanceof submitImage_result)
+        return this.equals((submitImage_result)that);
       return false;
     }
 
-    public boolean equals(getImage_result that) {
+    public boolean equals(submitImage_result that) {
       if (that == null)
         return false;
 
@@ -14066,6 +14295,15 @@ public class MasterServer {
           return false;
       }
 
+      boolean this_present_failure3 = true && this.isSetFailure3();
+      boolean that_present_failure3 = true && that.isSetFailure3();
+      if (this_present_failure3 || that_present_failure3) {
+        if (!(this_present_failure3 && that_present_failure3))
+          return false;
+        if (!this.failure3.equals(that.failure3))
+          return false;
+      }
+
       return true;
     }
 
@@ -14075,7 +14313,7 @@ public class MasterServer {
     }
 
     @Override
-    public int compareTo(getImage_result other) {
+    public int compareTo(submitImage_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -14112,6 +14350,16 @@ public class MasterServer {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFailure3()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -14129,7 +14377,7 @@ public class MasterServer {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getImage_result(");
+      StringBuilder sb = new StringBuilder("submitImage_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -14155,6 +14403,14 @@ public class MasterServer {
         sb.append(this.failure2);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("failure3:");
+      if (this.failure3 == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.failure3);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -14183,15 +14439,15 @@ public class MasterServer {
       }
     }
 
-    private static class getImage_resultStandardSchemeFactory implements SchemeFactory {
-      public getImage_resultStandardScheme getScheme() {
-        return new getImage_resultStandardScheme();
+    private static class submitImage_resultStandardSchemeFactory implements SchemeFactory {
+      public submitImage_resultStandardScheme getScheme() {
+        return new submitImage_resultStandardScheme();
       }
     }
 
-    private static class getImage_resultStandardScheme extends StandardScheme<getImage_result> {
+    private static class submitImage_resultStandardScheme extends StandardScheme<submitImage_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getImage_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -14228,6 +14484,15 @@ public class MasterServer {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
+            case 3: // FAILURE3
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.failure3 = new TTransferRejectedException();
+                struct.failure3.read(iprot);
+                struct.setFailure3IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -14239,7 +14504,7 @@ public class MasterServer {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getImage_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, submitImage_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -14258,22 +14523,27 @@ public class MasterServer {
           struct.failure2.write(oprot);
           oprot.writeFieldEnd();
         }
+        if (struct.failure3 != null) {
+          oprot.writeFieldBegin(FAILURE3_FIELD_DESC);
+          struct.failure3.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class getImage_resultTupleSchemeFactory implements SchemeFactory {
-      public getImage_resultTupleScheme getScheme() {
-        return new getImage_resultTupleScheme();
+    private static class submitImage_resultTupleSchemeFactory implements SchemeFactory {
+      public submitImage_resultTupleScheme getScheme() {
+        return new submitImage_resultTupleScheme();
       }
     }
 
-    private static class getImage_resultTupleScheme extends TupleScheme<getImage_result> {
+    private static class submitImage_resultTupleScheme extends TupleScheme<submitImage_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getImage_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -14285,7 +14555,10 @@ public class MasterServer {
         if (struct.isSetFailure2()) {
           optionals.set(2);
         }
-        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetFailure3()) {
+          optionals.set(3);
+        }
+        oprot.writeBitSet(optionals, 4);
         if (struct.isSetSuccess()) {
           struct.success.write(oprot);
         }
@@ -14295,12 +14568,15 @@ public class MasterServer {
         if (struct.isSetFailure2()) {
           struct.failure2.write(oprot);
         }
+        if (struct.isSetFailure3()) {
+          struct.failure3.write(oprot);
+        }
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getImage_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new TransferInformation();
           struct.success.read(iprot);
@@ -14316,6 +14592,11 @@ public class MasterServer {
           struct.failure2.read(iprot);
           struct.setFailure2IsSet(true);
         }
+        if (incoming.get(3)) {
+          struct.failure3 = new TTransferRejectedException();
+          struct.failure3.read(iprot);
+          struct.setFailure3IsSet(true);
+        }
       }
     }
 
@@ -16443,6 +16724,1125 @@ public class MasterServer {
 
   }
 
+  public static class downloadImage_args implements org.apache.thrift.TBase<downloadImage_args, downloadImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<downloadImage_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("downloadImage_args");
+
+    private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new downloadImage_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new downloadImage_argsTupleSchemeFactory());
+    }
+
+    public String sessionId; // required
+    public String imageVersionId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SESSION_ID((short)2, "sessionId"),
+      IMAGE_VERSION_ID((short)1, "imageVersionId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      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 2: // SESSION_ID
+            return SESSION_ID;
+          case 1: // IMAGE_VERSION_ID
+            return IMAGE_VERSION_ID;
+          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.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
+      tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_args.class, metaDataMap);
+    }
+
+    public downloadImage_args() {
+    }
+
+    public downloadImage_args(
+      String sessionId,
+      String imageVersionId)
+    {
+      this();
+      this.sessionId = sessionId;
+      this.imageVersionId = imageVersionId;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public downloadImage_args(downloadImage_args other) {
+      if (other.isSetSessionId()) {
+        this.sessionId = other.sessionId;
+      }
+      if (other.isSetImageVersionId()) {
+        this.imageVersionId = other.imageVersionId;
+      }
+    }
+
+    public downloadImage_args deepCopy() {
+      return new downloadImage_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.sessionId = null;
+      this.imageVersionId = null;
+    }
+
+    public String getSessionId() {
+      return this.sessionId;
+    }
+
+    public downloadImage_args setSessionId(String sessionId) {
+      this.sessionId = sessionId;
+      return this;
+    }
+
+    public void unsetSessionId() {
+      this.sessionId = null;
+    }
+
+    /** Returns true if field sessionId is set (has been assigned a value) and false otherwise */
+    public boolean isSetSessionId() {
+      return this.sessionId != null;
+    }
+
+    public void setSessionIdIsSet(boolean value) {
+      if (!value) {
+        this.sessionId = null;
+      }
+    }
+
+    public String getImageVersionId() {
+      return this.imageVersionId;
+    }
+
+    public downloadImage_args setImageVersionId(String imageVersionId) {
+      this.imageVersionId = imageVersionId;
+      return this;
+    }
+
+    public void unsetImageVersionId() {
+      this.imageVersionId = null;
+    }
+
+    /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
+    public boolean isSetImageVersionId() {
+      return this.imageVersionId != null;
+    }
+
+    public void setImageVersionIdIsSet(boolean value) {
+      if (!value) {
+        this.imageVersionId = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SESSION_ID:
+        if (value == null) {
+          unsetSessionId();
+        } else {
+          setSessionId((String)value);
+        }
+        break;
+
+      case IMAGE_VERSION_ID:
+        if (value == null) {
+          unsetImageVersionId();
+        } else {
+          setImageVersionId((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SESSION_ID:
+        return getSessionId();
+
+      case IMAGE_VERSION_ID:
+        return getImageVersionId();
+
+      }
+      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 SESSION_ID:
+        return isSetSessionId();
+      case IMAGE_VERSION_ID:
+        return isSetImageVersionId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof downloadImage_args)
+        return this.equals((downloadImage_args)that);
+      return false;
+    }
+
+    public boolean equals(downloadImage_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_sessionId = true && this.isSetSessionId();
+      boolean that_present_sessionId = true && that.isSetSessionId();
+      if (this_present_sessionId || that_present_sessionId) {
+        if (!(this_present_sessionId && that_present_sessionId))
+          return false;
+        if (!this.sessionId.equals(that.sessionId))
+          return false;
+      }
+
+      boolean this_present_imageVersionId = true && this.isSetImageVersionId();
+      boolean that_present_imageVersionId = true && that.isSetImageVersionId();
+      if (this_present_imageVersionId || that_present_imageVersionId) {
+        if (!(this_present_imageVersionId && that_present_imageVersionId))
+          return false;
+        if (!this.imageVersionId.equals(that.imageVersionId))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(downloadImage_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSessionId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetImageVersionId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
+        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("downloadImage_args(");
+      boolean first = true;
+
+      sb.append("sessionId:");
+      if (this.sessionId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sessionId);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("imageVersionId:");
+      if (this.imageVersionId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.imageVersionId);
+      }
+      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 downloadImage_argsStandardSchemeFactory implements SchemeFactory {
+      public downloadImage_argsStandardScheme getScheme() {
+        return new downloadImage_argsStandardScheme();
+      }
+    }
+
+    private static class downloadImage_argsStandardScheme extends StandardScheme<downloadImage_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 2: // SESSION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.sessionId = iprot.readString();
+                struct.setSessionIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 1: // IMAGE_VERSION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.imageVersionId = iprot.readString();
+                struct.setImageVersionIdIsSet(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, downloadImage_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.imageVersionId != null) {
+          oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
+          oprot.writeString(struct.imageVersionId);
+          oprot.writeFieldEnd();
+        }
+        if (struct.sessionId != null) {
+          oprot.writeFieldBegin(SESSION_ID_FIELD_DESC);
+          oprot.writeString(struct.sessionId);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class downloadImage_argsTupleSchemeFactory implements SchemeFactory {
+      public downloadImage_argsTupleScheme getScheme() {
+        return new downloadImage_argsTupleScheme();
+      }
+    }
+
+    private static class downloadImage_argsTupleScheme extends TupleScheme<downloadImage_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSessionId()) {
+          optionals.set(0);
+        }
+        if (struct.isSetImageVersionId()) {
+          optionals.set(1);
+        }
+        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetSessionId()) {
+          oprot.writeString(struct.sessionId);
+        }
+        if (struct.isSetImageVersionId()) {
+          oprot.writeString(struct.imageVersionId);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.sessionId = iprot.readString();
+          struct.setSessionIdIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.imageVersionId = iprot.readString();
+          struct.setImageVersionIdIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class downloadImage_result implements org.apache.thrift.TBase<downloadImage_result, downloadImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<downloadImage_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("downloadImage_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new downloadImage_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new downloadImage_resultTupleSchemeFactory());
+    }
+
+    public TransferInformation success; // required
+    public TAuthorizationException failure; // required
+    public TInvocationException failure2; // required
+    public TNotFoundException f3; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      FAILURE((short)1, "failure"),
+      FAILURE2((short)2, "failure2"),
+      F3((short)3, "f3");
+
+      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;
+          case 1: // FAILURE
+            return FAILURE;
+          case 2: // FAILURE2
+            return FAILURE2;
+          case 3: // F3
+            return F3;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
+      tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_result.class, metaDataMap);
+    }
+
+    public downloadImage_result() {
+    }
+
+    public downloadImage_result(
+      TransferInformation success,
+      TAuthorizationException failure,
+      TInvocationException failure2,
+      TNotFoundException f3)
+    {
+      this();
+      this.success = success;
+      this.failure = failure;
+      this.failure2 = failure2;
+      this.f3 = f3;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public downloadImage_result(downloadImage_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new TransferInformation(other.success);
+      }
+      if (other.isSetFailure()) {
+        this.failure = new TAuthorizationException(other.failure);
+      }
+      if (other.isSetFailure2()) {
+        this.failure2 = new TInvocationException(other.failure2);
+      }
+      if (other.isSetF3()) {
+        this.f3 = new TNotFoundException(other.f3);
+      }
+    }
+
+    public downloadImage_result deepCopy() {
+      return new downloadImage_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.failure = null;
+      this.failure2 = null;
+      this.f3 = null;
+    }
+
+    public TransferInformation getSuccess() {
+      return this.success;
+    }
+
+    public downloadImage_result setSuccess(TransferInformation 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 TAuthorizationException getFailure() {
+      return this.failure;
+    }
+
+    public downloadImage_result setFailure(TAuthorizationException failure) {
+      this.failure = failure;
+      return this;
+    }
+
+    public void unsetFailure() {
+      this.failure = null;
+    }
+
+    /** Returns true if field failure is set (has been assigned a value) and false otherwise */
+    public boolean isSetFailure() {
+      return this.failure != null;
+    }
+
+    public void setFailureIsSet(boolean value) {
+      if (!value) {
+        this.failure = null;
+      }
+    }
+
+    public TInvocationException getFailure2() {
+      return this.failure2;
+    }
+
+    public downloadImage_result setFailure2(TInvocationException failure2) {
+      this.failure2 = failure2;
+      return this;
+    }
+
+    public void unsetFailure2() {
+      this.failure2 = null;
+    }
+
+    /** Returns true if field failure2 is set (has been assigned a value) and false otherwise */
+    public boolean isSetFailure2() {
+      return this.failure2 != null;
+    }
+
+    public void setFailure2IsSet(boolean value) {
+      if (!value) {
+        this.failure2 = null;
+      }
+    }
+
+    public TNotFoundException getF3() {
+      return this.f3;
+    }
+
+    public downloadImage_result setF3(TNotFoundException f3) {
+      this.f3 = f3;
+      return this;
+    }
+
+    public void unsetF3() {
+      this.f3 = null;
+    }
+
+    /** Returns true if field f3 is set (has been assigned a value) and false otherwise */
+    public boolean isSetF3() {
+      return this.f3 != null;
+    }
+
+    public void setF3IsSet(boolean value) {
+      if (!value) {
+        this.f3 = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((TransferInformation)value);
+        }
+        break;
+
+      case FAILURE:
+        if (value == null) {
+          unsetFailure();
+        } else {
+          setFailure((TAuthorizationException)value);
+        }
+        break;
+
+      case FAILURE2:
+        if (value == null) {
+          unsetFailure2();
+        } else {
+          setFailure2((TInvocationException)value);
+        }
+        break;
+
+      case F3:
+        if (value == null) {
+          unsetF3();
+        } else {
+          setF3((TNotFoundException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case FAILURE:
+        return getFailure();
+
+      case FAILURE2:
+        return getFailure2();
+
+      case F3:
+        return getF3();
+
+      }
+      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();
+      case FAILURE:
+        return isSetFailure();
+      case FAILURE2:
+        return isSetFailure2();
+      case F3:
+        return isSetF3();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof downloadImage_result)
+        return this.equals((downloadImage_result)that);
+      return false;
+    }
+
+    public boolean equals(downloadImage_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;
+      }
+
+      boolean this_present_failure = true && this.isSetFailure();
+      boolean that_present_failure = true && that.isSetFailure();
+      if (this_present_failure || that_present_failure) {
+        if (!(this_present_failure && that_present_failure))
+          return false;
+        if (!this.failure.equals(that.failure))
+          return false;
+      }
+
+      boolean this_present_failure2 = true && this.isSetFailure2();
+      boolean that_present_failure2 = true && that.isSetFailure2();
+      if (this_present_failure2 || that_present_failure2) {
+        if (!(this_present_failure2 && that_present_failure2))
+          return false;
+        if (!this.failure2.equals(that.failure2))
+          return false;
+      }
+
+      boolean this_present_f3 = true && this.isSetF3();
+      boolean that_present_f3 = true && that.isSetF3();
+      if (this_present_f3 || that_present_f3) {
+        if (!(this_present_f3 && that_present_f3))
+          return false;
+        if (!this.f3.equals(that.f3))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(downloadImage_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;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFailure()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetFailure2()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetF3()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.f3, other.f3);
+        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("downloadImage_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("failure:");
+      if (this.failure == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.failure);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("failure2:");
+      if (this.failure2 == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.failure2);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("f3:");
+      if (this.f3 == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.f3);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+      if (success != null) {
+        success.validate();
+      }
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class downloadImage_resultStandardSchemeFactory implements SchemeFactory {
+      public downloadImage_resultStandardScheme getScheme() {
+        return new downloadImage_resultStandardScheme();
+      }
+    }
+
+    private static class downloadImage_resultStandardScheme extends StandardScheme<downloadImage_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 0: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.success = new TransferInformation();
+                struct.success.read(iprot);
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 1: // FAILURE
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.failure = new TAuthorizationException();
+                struct.failure.read(iprot);
+                struct.setFailureIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // FAILURE2
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.failure2 = new TInvocationException();
+                struct.failure2.read(iprot);
+                struct.setFailure2IsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // F3
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.f3 = new TNotFoundException();
+                struct.f3.read(iprot);
+                struct.setF3IsSet(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, downloadImage_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          struct.success.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.failure != null) {
+          oprot.writeFieldBegin(FAILURE_FIELD_DESC);
+          struct.failure.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.failure2 != null) {
+          oprot.writeFieldBegin(FAILURE2_FIELD_DESC);
+          struct.failure2.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.f3 != null) {
+          oprot.writeFieldBegin(F3_FIELD_DESC);
+          struct.f3.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class downloadImage_resultTupleSchemeFactory implements SchemeFactory {
+      public downloadImage_resultTupleScheme getScheme() {
+        return new downloadImage_resultTupleScheme();
+      }
+    }
+
+    private static class downloadImage_resultTupleScheme extends TupleScheme<downloadImage_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        if (struct.isSetFailure()) {
+          optionals.set(1);
+        }
+        if (struct.isSetFailure2()) {
+          optionals.set(2);
+        }
+        if (struct.isSetF3()) {
+          optionals.set(3);
+        }
+        oprot.writeBitSet(optionals, 4);
+        if (struct.isSetSuccess()) {
+          struct.success.write(oprot);
+        }
+        if (struct.isSetFailure()) {
+          struct.failure.write(oprot);
+        }
+        if (struct.isSetFailure2()) {
+          struct.failure2.write(oprot);
+        }
+        if (struct.isSetF3()) {
+          struct.f3.write(oprot);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.success = new TransferInformation();
+          struct.success.read(iprot);
+          struct.setSuccessIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.failure = new TAuthorizationException();
+          struct.failure.read(iprot);
+          struct.setFailureIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.failure2 = new TInvocationException();
+          struct.failure2.read(iprot);
+          struct.setFailure2IsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.f3 = new TNotFoundException();
+          struct.f3.read(iprot);
+          struct.setF3IsSet(true);
+        }
+      }
+    }
+
+  }
+
   public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_args");
 
@@ -17075,14 +18475,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<Organization>(_list274.size);
-                  for (int _i275 = 0; _i275 < _list274.size; ++_i275)
+                  org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
+                  struct.success = new ArrayList<Organization>(_list290.size);
+                  for (int _i291 = 0; _i291 < _list290.size; ++_i291)
                   {
-                    Organization _elem276;
-                    _elem276 = new Organization();
-                    _elem276.read(iprot);
-                    struct.success.add(_elem276);
+                    Organization _elem292;
+                    _elem292 = new Organization();
+                    _elem292.read(iprot);
+                    struct.success.add(_elem292);
                   }
                   iprot.readListEnd();
                 }
@@ -17119,9 +18519,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 _iter277 : struct.success)
+            for (Organization _iter293 : struct.success)
             {
-              _iter277.write(oprot);
+              _iter293.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -17160,9 +18560,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter278 : struct.success)
+            for (Organization _iter294 : struct.success)
             {
-              _iter278.write(oprot);
+              _iter294.write(oprot);
             }
           }
         }
@@ -17177,14 +18577,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         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<Organization>(_list279.size);
-            for (int _i280 = 0; _i280 < _list279.size; ++_i280)
+            org.apache.thrift.protocol.TList _list295 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Organization>(_list295.size);
+            for (int _i296 = 0; _i296 < _list295.size; ++_i296)
             {
-              Organization _elem281;
-              _elem281 = new Organization();
-              _elem281.read(iprot);
-              struct.success.add(_elem281);
+              Organization _elem297;
+              _elem297 = new Organization();
+              _elem297.read(iprot);
+              struct.success.add(_elem297);
             }
           }
           struct.setSuccessIsSet(true);
@@ -17831,14 +19231,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list282 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list282.size);
-                  for (int _i283 = 0; _i283 < _list282.size; ++_i283)
+                  org.apache.thrift.protocol.TList _list298 = iprot.readListBegin();
+                  struct.success = new ArrayList<OperatingSystem>(_list298.size);
+                  for (int _i299 = 0; _i299 < _list298.size; ++_i299)
                   {
-                    OperatingSystem _elem284;
-                    _elem284 = new OperatingSystem();
-                    _elem284.read(iprot);
-                    struct.success.add(_elem284);
+                    OperatingSystem _elem300;
+                    _elem300 = new OperatingSystem();
+                    _elem300.read(iprot);
+                    struct.success.add(_elem300);
                   }
                   iprot.readListEnd();
                 }
@@ -17875,9 +19275,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 _iter285 : struct.success)
+            for (OperatingSystem _iter301 : struct.success)
             {
-              _iter285.write(oprot);
+              _iter301.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -17916,9 +19316,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter286 : struct.success)
+            for (OperatingSystem _iter302 : struct.success)
             {
-              _iter286.write(oprot);
+              _iter302.write(oprot);
             }
           }
         }
@@ -17933,14 +19333,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_list287.size);
-            for (int _i288 = 0; _i288 < _list287.size; ++_i288)
+            org.apache.thrift.protocol.TList _list303 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<OperatingSystem>(_list303.size);
+            for (int _i304 = 0; _i304 < _list303.size; ++_i304)
             {
-              OperatingSystem _elem289;
-              _elem289 = new OperatingSystem();
-              _elem289.read(iprot);
-              struct.success.add(_elem289);
+              OperatingSystem _elem305;
+              _elem305 = new OperatingSystem();
+              _elem305.read(iprot);
+              struct.success.add(_elem305);
             }
           }
           struct.setSuccessIsSet(true);
@@ -18587,14 +19987,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
-                  struct.success = new ArrayList<Virtualizer>(_list290.size);
-                  for (int _i291 = 0; _i291 < _list290.size; ++_i291)
+                  org.apache.thrift.protocol.TList _list306 = iprot.readListBegin();
+                  struct.success = new ArrayList<Virtualizer>(_list306.size);
+                  for (int _i307 = 0; _i307 < _list306.size; ++_i307)
                   {
-                    Virtualizer _elem292;
-                    _elem292 = new Virtualizer();
-                    _elem292.read(iprot);
-                    struct.success.add(_elem292);
+                    Virtualizer _elem308;
+                    _elem308 = new Virtualizer();
+                    _elem308.read(iprot);
+                    struct.success.add(_elem308);
                   }
                   iprot.readListEnd();
                 }
@@ -18631,9 +20031,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 _iter293 : struct.success)
+            for (Virtualizer _iter309 : struct.success)
             {
-              _iter293.write(oprot);
+              _iter309.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -18672,9 +20072,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter294 : struct.success)
+            for (Virtualizer _iter310 : struct.success)
             {
-              _iter294.write(oprot);
+              _iter310.write(oprot);
             }
           }
         }
@@ -18689,14 +20089,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list295 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Virtualizer>(_list295.size);
-            for (int _i296 = 0; _i296 < _list295.size; ++_i296)
+            org.apache.thrift.protocol.TList _list311 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<Virtualizer>(_list311.size);
+            for (int _i312 = 0; _i312 < _list311.size; ++_i312)
             {
-              Virtualizer _elem297;
-              _elem297 = new Virtualizer();
-              _elem297.read(iprot);
-              struct.success.add(_elem297);
+              Virtualizer _elem313;
+              _elem313 = new Virtualizer();
+              _elem313.read(iprot);
+              struct.success.add(_elem313);
             }
           }
           struct.setSuccessIsSet(true);
@@ -19449,14 +20849,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list298 = iprot.readListBegin();
-                  struct.success = new ArrayList<MasterTag>(_list298.size);
-                  for (int _i299 = 0; _i299 < _list298.size; ++_i299)
+                  org.apache.thrift.protocol.TList _list314 = iprot.readListBegin();
+                  struct.success = new ArrayList<MasterTag>(_list314.size);
+                  for (int _i315 = 0; _i315 < _list314.size; ++_i315)
                   {
-                    MasterTag _elem300;
-                    _elem300 = new MasterTag();
-                    _elem300.read(iprot);
-                    struct.success.add(_elem300);
+                    MasterTag _elem316;
+                    _elem316 = new MasterTag();
+                    _elem316.read(iprot);
+                    struct.success.add(_elem316);
                   }
                   iprot.readListEnd();
                 }
@@ -19493,9 +20893,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 _iter301 : struct.success)
+            for (MasterTag _iter317 : struct.success)
             {
-              _iter301.write(oprot);
+              _iter317.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -19534,9 +20934,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterTag _iter302 : struct.success)
+            for (MasterTag _iter318 : struct.success)
             {
-              _iter302.write(oprot);
+              _iter318.write(oprot);
             }
           }
         }
@@ -19551,14 +20951,14 @@ public class MasterServer {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list303 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<MasterTag>(_list303.size);
-            for (int _i304 = 0; _i304 < _list303.size; ++_i304)
+            org.apache.thrift.protocol.TList _list319 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<MasterTag>(_list319.size);
+            for (int _i320 = 0; _i320 < _list319.size; ++_i320)
             {
-              MasterTag _elem305;
-              _elem305 = new MasterTag();
-              _elem305.read(iprot);
-              struct.success.add(_elem305);
+              MasterTag _elem321;
+              _elem321 = new MasterTag();
+              _elem321.read(iprot);
+              struct.success.add(_elem321);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20311,14 +21711,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<MasterSoftware>(_list306.size);
-                  for (int _i307 = 0; _i307 < _list306.size; ++_i307)
+                  org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
+                  struct.success = new ArrayList<MasterSoftware>(_list322.size);
+                  for (int _i323 = 0; _i323 < _list322.size; ++_i323)
                   {
-                    MasterSoftware _elem308;
-                    _elem308 = new MasterSoftware();
-                    _elem308.read(iprot);
-                    struct.success.add(_elem308);
+                    MasterSoftware _elem324;
+                    _elem324 = new MasterSoftware();
+                    _elem324.read(iprot);
+                    struct.success.add(_elem324);
                   }
                   iprot.readListEnd();
                 }
@@ -20355,9 +21755,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 _iter309 : struct.success)
+            for (MasterSoftware _iter325 : struct.success)
             {
-              _iter309.write(oprot);
+              _iter325.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -20396,9 +21796,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterSoftware _iter310 : struct.success)
+            for (MasterSoftware _iter326 : struct.success)
             {
-              _iter310.write(oprot);
+              _iter326.write(oprot);
             }
           }
         }
@@ -20413,14 +21813,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<MasterSoftware>(_list311.size);
-            for (int _i312 = 0; _i312 < _list311.size; ++_i312)
+            org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<MasterSoftware>(_list327.size);
+            for (int _i328 = 0; _i328 < _list327.size; ++_i328)
             {
-              MasterSoftware _elem313;
-              _elem313 = new MasterSoftware();
-              _elem313.read(iprot);
-              struct.success.add(_elem313);
+              MasterSoftware _elem329;
+              _elem329 = new MasterSoftware();
+              _elem329.read(iprot);
+              struct.success.add(_elem329);
             }
           }
           struct.setSuccessIsSet(true);
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 c02eb36..c09d4f7 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
@@ -52,8 +52,6 @@ public class SatelliteServer {
 
     public void cancelDownload(String downloadToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public ByteBuffer getMachineDescription(String userToken, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
-
     public void isAuthenticated(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
     public WhoamiInfo whoami(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
@@ -96,6 +94,8 @@ public class SatelliteServer {
 
     public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
 
+    public String requestImageReplication(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+
     public String createLecture(String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
 
     public void updateLecture(String userToken, String lectureId, LectureWrite lecture) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
@@ -132,8 +132,6 @@ public class SatelliteServer {
 
     public void cancelDownload(String downloadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getMachineDescription(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
     public void isAuthenticated(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void whoami(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -176,6 +174,8 @@ public class SatelliteServer {
 
     public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
+    public void requestImageReplication(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
     public void createLecture(String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void updateLecture(String userToken, String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -429,39 +429,6 @@ public class SatelliteServer {
       return;
     }
 
-    public ByteBuffer getMachineDescription(String userToken, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
-    {
-      send_getMachineDescription(userToken, imageVersionId);
-      return recv_getMachineDescription();
-    }
-
-    public void send_getMachineDescription(String userToken, String imageVersionId) throws org.apache.thrift.TException
-    {
-      getMachineDescription_args args = new getMachineDescription_args();
-      args.setUserToken(userToken);
-      args.setImageVersionId(imageVersionId);
-      sendBase("getMachineDescription", args);
-    }
-
-    public ByteBuffer recv_getMachineDescription() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
-    {
-      getMachineDescription_result result = new getMachineDescription_result();
-      receiveBase(result, "getMachineDescription");
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.authError != null) {
-        throw result.authError;
-      }
-      if (result.ffff != null) {
-        throw result.ffff;
-      }
-      if (result.sdf != null) {
-        throw result.sdf;
-      }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getMachineDescription failed: unknown result");
-    }
-
     public void isAuthenticated(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_isAuthenticated(userToken);
@@ -1059,6 +1026,39 @@ public class SatelliteServer {
       return;
     }
 
+    public String requestImageReplication(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    {
+      send_requestImageReplication(userToken, imageVersionId);
+      return recv_requestImageReplication();
+    }
+
+    public void send_requestImageReplication(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    {
+      requestImageReplication_args args = new requestImageReplication_args();
+      args.setUserToken(userToken);
+      args.setImageVersionId(imageVersionId);
+      sendBase("requestImageReplication", args);
+    }
+
+    public String recv_requestImageReplication() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    {
+      requestImageReplication_result result = new requestImageReplication_result();
+      receiveBase(result, "requestImageReplication");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.authError != null) {
+        throw result.authError;
+      }
+      if (result.notFound != null) {
+        throw result.notFound;
+      }
+      if (result.serverError != null) {
+        throw result.serverError;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "requestImageReplication failed: unknown result");
+    }
+
     public String createLecture(String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException
     {
       send_createLecture(userToken, lecture);
@@ -1600,41 +1600,6 @@ public class SatelliteServer {
       }
     }
 
-    public void getMachineDescription(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
-      checkReady();
-      getMachineDescription_call method_call = new getMachineDescription_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getMachineDescription_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public getMachineDescription_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.userToken = userToken;
-        this.imageVersionId = imageVersionId;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getMachineDescription", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getMachineDescription_args args = new getMachineDescription_args();
-        args.setUserToken(userToken);
-        args.setImageVersionId(imageVersionId);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public ByteBuffer getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
-        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        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_getMachineDescription();
-      }
-    }
-
     public void isAuthenticated(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isAuthenticated_call method_call = new isAuthenticated_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
@@ -2352,6 +2317,41 @@ public class SatelliteServer {
       }
     }
 
+    public void requestImageReplication(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      requestImageReplication_call method_call = new requestImageReplication_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class requestImageReplication_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String userToken;
+      private String imageVersionId;
+      public requestImageReplication_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.userToken = userToken;
+        this.imageVersionId = imageVersionId;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("requestImageReplication", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        requestImageReplication_args args = new requestImageReplication_args();
+        args.setUserToken(userToken);
+        args.setImageVersionId(imageVersionId);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public String getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        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_requestImageReplication();
+      }
+    }
+
     public void createLecture(String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       createLecture_call method_call = new createLecture_call(userToken, lecture, resultHandler, this, ___protocolFactory, ___transport);
@@ -2662,7 +2662,6 @@ public class SatelliteServer {
       processMap.put("queryUploadStatus", new queryUploadStatus());
       processMap.put("requestDownload", new requestDownload());
       processMap.put("cancelDownload", new cancelDownload());
-      processMap.put("getMachineDescription", new getMachineDescription());
       processMap.put("isAuthenticated", new isAuthenticated());
       processMap.put("whoami", new whoami());
       processMap.put("invalidateSession", new invalidateSession());
@@ -2684,6 +2683,7 @@ public class SatelliteServer {
       processMap.put("getImagePermissions", new getImagePermissions());
       processMap.put("setImageOwner", new setImageOwner());
       processMap.put("setImageVersionExpiry", new setImageVersionExpiry());
+      processMap.put("requestImageReplication", new requestImageReplication());
       processMap.put("createLecture", new createLecture());
       processMap.put("updateLecture", new updateLecture());
       processMap.put("getLectureList", new getLectureList());
@@ -2892,34 +2892,6 @@ public class SatelliteServer {
       }
     }
 
-    public static class getMachineDescription<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMachineDescription_args> {
-      public getMachineDescription() {
-        super("getMachineDescription");
-      }
-
-      public getMachineDescription_args getEmptyArgsInstance() {
-        return new getMachineDescription_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public getMachineDescription_result getResult(I iface, getMachineDescription_args args) throws org.apache.thrift.TException {
-        getMachineDescription_result result = new getMachineDescription_result();
-        try {
-          result.success = iface.getMachineDescription(args.userToken, args.imageVersionId);
-        } catch (TAuthorizationException authError) {
-          result.authError = authError;
-        } catch (TInvocationException ffff) {
-          result.ffff = ffff;
-        } catch (TNotFoundException sdf) {
-          result.sdf = sdf;
-        }
-        return result;
-      }
-    }
-
     public static class isAuthenticated<I extends Iface> extends org.apache.thrift.ProcessFunction<I, isAuthenticated_args> {
       public isAuthenticated() {
         super("isAuthenticated");
@@ -3460,6 +3432,34 @@ public class SatelliteServer {
       }
     }
 
+    public static class requestImageReplication<I extends Iface> extends org.apache.thrift.ProcessFunction<I, requestImageReplication_args> {
+      public requestImageReplication() {
+        super("requestImageReplication");
+      }
+
+      public requestImageReplication_args getEmptyArgsInstance() {
+        return new requestImageReplication_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public requestImageReplication_result getResult(I iface, requestImageReplication_args args) throws org.apache.thrift.TException {
+        requestImageReplication_result result = new requestImageReplication_result();
+        try {
+          result.success = iface.requestImageReplication(args.userToken, args.imageVersionId);
+        } catch (TAuthorizationException authError) {
+          result.authError = authError;
+        } catch (TNotFoundException notFound) {
+          result.notFound = notFound;
+        } catch (TInvocationException serverError) {
+          result.serverError = serverError;
+        }
+        return result;
+      }
+    }
+
     public static class createLecture<I extends Iface> extends org.apache.thrift.ProcessFunction<I, createLecture_args> {
       public createLecture() {
         super("createLecture");
@@ -3705,7 +3705,6 @@ public class SatelliteServer {
       processMap.put("queryUploadStatus", new queryUploadStatus());
       processMap.put("requestDownload", new requestDownload());
       processMap.put("cancelDownload", new cancelDownload());
-      processMap.put("getMachineDescription", new getMachineDescription());
       processMap.put("isAuthenticated", new isAuthenticated());
       processMap.put("whoami", new whoami());
       processMap.put("invalidateSession", new invalidateSession());
@@ -3727,6 +3726,7 @@ public class SatelliteServer {
       processMap.put("getImagePermissions", new getImagePermissions());
       processMap.put("setImageOwner", new setImageOwner());
       processMap.put("setImageVersionExpiry", new setImageVersionExpiry());
+      processMap.put("requestImageReplication", new requestImageReplication());
       processMap.put("createLecture", new createLecture());
       processMap.put("updateLecture", new updateLecture());
       processMap.put("getLectureList", new getLectureList());
@@ -4210,73 +4210,6 @@ public class SatelliteServer {
       }
     }
 
-    public static class getMachineDescription<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getMachineDescription_args, ByteBuffer> {
-      public getMachineDescription() {
-        super("getMachineDescription");
-      }
-
-      public getMachineDescription_args getEmptyArgsInstance() {
-        return new getMachineDescription_args();
-      }
-
-      public AsyncMethodCallback<ByteBuffer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ByteBuffer>() { 
-          public void onComplete(ByteBuffer o) {
-            getMachineDescription_result result = new getMachineDescription_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;
-            getMachineDescription_result result = new getMachineDescription_result();
-            if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.ffff = (TInvocationException) e;
-                        result.setFfffIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.sdf = (TNotFoundException) e;
-                        result.setSdfIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
-              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, getMachineDescription_args args, org.apache.thrift.async.AsyncMethodCallback<ByteBuffer> resultHandler) throws TException {
-        iface.getMachineDescription(args.userToken, args.imageVersionId,resultHandler);
-      }
-    }
-
     public static class isAuthenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isAuthenticated_args, Void> {
       public isAuthenticated() {
         super("isAuthenticated");
@@ -5570,6 +5503,73 @@ public class SatelliteServer {
       }
     }
 
+    public static class requestImageReplication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, requestImageReplication_args, String> {
+      public requestImageReplication() {
+        super("requestImageReplication");
+      }
+
+      public requestImageReplication_args getEmptyArgsInstance() {
+        return new requestImageReplication_args();
+      }
+
+      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<String>() { 
+          public void onComplete(String o) {
+            requestImageReplication_result result = new requestImageReplication_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            requestImageReplication_result result = new requestImageReplication_result();
+            if (e instanceof TAuthorizationException) {
+                        result.authError = (TAuthorizationException) e;
+                        result.setAuthErrorIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof TNotFoundException) {
+                        result.notFound = (TNotFoundException) e;
+                        result.setNotFoundIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof TInvocationException) {
+                        result.serverError = (TInvocationException) e;
+                        result.setServerErrorIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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, requestImageReplication_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+        iface.requestImageReplication(args.userToken, args.imageVersionId,resultHandler);
+      }
+    }
+
     public static class createLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createLecture_args, String> {
       public createLecture() {
         super("createLecture");
@@ -7958,13 +7958,13 @@ public class SatelliteServer {
             case 4: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list138 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list138.size);
-                  for (int _i139 = 0; _i139 < _list138.size; ++_i139)
+                  org.apache.thrift.protocol.TList _list154 = iprot.readListBegin();
+                  struct.blockHashes = new ArrayList<ByteBuffer>(_list154.size);
+                  for (int _i155 = 0; _i155 < _list154.size; ++_i155)
                   {
-                    ByteBuffer _elem140;
-                    _elem140 = iprot.readBinary();
-                    struct.blockHashes.add(_elem140);
+                    ByteBuffer _elem156;
+                    _elem156 = iprot.readBinary();
+                    struct.blockHashes.add(_elem156);
                   }
                   iprot.readListEnd();
                 }
@@ -8013,9 +8013,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 _iter141 : struct.blockHashes)
+            for (ByteBuffer _iter157 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter141);
+              oprot.writeBinary(_iter157);
             }
             oprot.writeListEnd();
           }
@@ -8072,9 +8072,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter142 : struct.blockHashes)
+            for (ByteBuffer _iter158 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter142);
+              oprot.writeBinary(_iter158);
             }
           }
         }
@@ -8101,13 +8101,13 @@ public class SatelliteServer {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list143 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list143.size);
-            for (int _i144 = 0; _i144 < _list143.size; ++_i144)
+            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)
             {
-              ByteBuffer _elem145;
-              _elem145 = iprot.readBinary();
-              struct.blockHashes.add(_elem145);
+              ByteBuffer _elem161;
+              _elem161 = iprot.readBinary();
+              struct.blockHashes.add(_elem161);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -9279,13 +9279,13 @@ public class SatelliteServer {
             case 2: // 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);
+                  for (int _i163 = 0; _i163 < _list162.size; ++_i163)
                   {
-                    ByteBuffer _elem148;
-                    _elem148 = iprot.readBinary();
-                    struct.blockHashes.add(_elem148);
+                    ByteBuffer _elem164;
+                    _elem164 = iprot.readBinary();
+                    struct.blockHashes.add(_elem164);
                   }
                   iprot.readListEnd();
                 }
@@ -9318,9 +9318,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 _iter149 : struct.blockHashes)
+            for (ByteBuffer _iter165 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter149);
+              oprot.writeBinary(_iter165);
             }
             oprot.writeListEnd();
           }
@@ -9357,9 +9357,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter150 : struct.blockHashes)
+            for (ByteBuffer _iter166 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter150);
+              oprot.writeBinary(_iter166);
             }
           }
         }
@@ -9375,13 +9375,13 @@ public class SatelliteServer {
         }
         if (incoming.get(1)) {
           {
-            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);
+            for (int _i168 = 0; _i168 < _list167.size; ++_i168)
             {
-              ByteBuffer _elem153;
-              _elem153 = iprot.readBinary();
-              struct.blockHashes.add(_elem153);
+              ByteBuffer _elem169;
+              _elem169 = iprot.readBinary();
+              struct.blockHashes.add(_elem169);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -13203,1131 +13203,6 @@ public class SatelliteServer {
 
   }
 
-  public static class getMachineDescription_args implements org.apache.thrift.TBase<getMachineDescription_args, getMachineDescription_args._Fields>, java.io.Serializable, Cloneable, Comparable<getMachineDescription_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMachineDescription_args");
-
-    private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getMachineDescription_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getMachineDescription_argsTupleSchemeFactory());
-    }
-
-    public String userToken; // required
-    public String imageVersionId; // required
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      USER_TOKEN((short)1, "userToken"),
-      IMAGE_VERSION_ID((short)2, "imageVersionId");
-
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-      static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      public static _Fields findByThriftId(int fieldId) {
-        switch(fieldId) {
-          case 1: // USER_TOKEN
-            return USER_TOKEN;
-          case 2: // IMAGE_VERSION_ID
-            return IMAGE_VERSION_ID;
-          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.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMachineDescription_args.class, metaDataMap);
-    }
-
-    public getMachineDescription_args() {
-    }
-
-    public getMachineDescription_args(
-      String userToken,
-      String imageVersionId)
-    {
-      this();
-      this.userToken = userToken;
-      this.imageVersionId = imageVersionId;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public getMachineDescription_args(getMachineDescription_args other) {
-      if (other.isSetUserToken()) {
-        this.userToken = other.userToken;
-      }
-      if (other.isSetImageVersionId()) {
-        this.imageVersionId = other.imageVersionId;
-      }
-    }
-
-    public getMachineDescription_args deepCopy() {
-      return new getMachineDescription_args(this);
-    }
-
-    @Override
-    public void clear() {
-      this.userToken = null;
-      this.imageVersionId = null;
-    }
-
-    public String getUserToken() {
-      return this.userToken;
-    }
-
-    public getMachineDescription_args setUserToken(String userToken) {
-      this.userToken = userToken;
-      return this;
-    }
-
-    public void unsetUserToken() {
-      this.userToken = null;
-    }
-
-    /** Returns true if field userToken is set (has been assigned a value) and false otherwise */
-    public boolean isSetUserToken() {
-      return this.userToken != null;
-    }
-
-    public void setUserTokenIsSet(boolean value) {
-      if (!value) {
-        this.userToken = null;
-      }
-    }
-
-    public String getImageVersionId() {
-      return this.imageVersionId;
-    }
-
-    public getMachineDescription_args setImageVersionId(String imageVersionId) {
-      this.imageVersionId = imageVersionId;
-      return this;
-    }
-
-    public void unsetImageVersionId() {
-      this.imageVersionId = null;
-    }
-
-    /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
-    public boolean isSetImageVersionId() {
-      return this.imageVersionId != null;
-    }
-
-    public void setImageVersionIdIsSet(boolean value) {
-      if (!value) {
-        this.imageVersionId = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case USER_TOKEN:
-        if (value == null) {
-          unsetUserToken();
-        } else {
-          setUserToken((String)value);
-        }
-        break;
-
-      case IMAGE_VERSION_ID:
-        if (value == null) {
-          unsetImageVersionId();
-        } else {
-          setImageVersionId((String)value);
-        }
-        break;
-
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case USER_TOKEN:
-        return getUserToken();
-
-      case IMAGE_VERSION_ID:
-        return getImageVersionId();
-
-      }
-      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 USER_TOKEN:
-        return isSetUserToken();
-      case IMAGE_VERSION_ID:
-        return isSetImageVersionId();
-      }
-      throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof getMachineDescription_args)
-        return this.equals((getMachineDescription_args)that);
-      return false;
-    }
-
-    public boolean equals(getMachineDescription_args that) {
-      if (that == null)
-        return false;
-
-      boolean this_present_userToken = true && this.isSetUserToken();
-      boolean that_present_userToken = true && that.isSetUserToken();
-      if (this_present_userToken || that_present_userToken) {
-        if (!(this_present_userToken && that_present_userToken))
-          return false;
-        if (!this.userToken.equals(that.userToken))
-          return false;
-      }
-
-      boolean this_present_imageVersionId = true && this.isSetImageVersionId();
-      boolean that_present_imageVersionId = true && that.isSetImageVersionId();
-      if (this_present_imageVersionId || that_present_imageVersionId) {
-        if (!(this_present_imageVersionId && that_present_imageVersionId))
-          return false;
-        if (!this.imageVersionId.equals(that.imageVersionId))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    @Override
-    public int compareTo(getMachineDescription_args other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetUserToken()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userToken, other.userToken);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetImageVersionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
-        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("getMachineDescription_args(");
-      boolean first = true;
-
-      sb.append("userToken:");
-      if (this.userToken == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.userToken);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("imageVersionId:");
-      if (this.imageVersionId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.imageVersionId);
-      }
-      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 getMachineDescription_argsStandardSchemeFactory implements SchemeFactory {
-      public getMachineDescription_argsStandardScheme getScheme() {
-        return new getMachineDescription_argsStandardScheme();
-      }
-    }
-
-    private static class getMachineDescription_argsStandardScheme extends StandardScheme<getMachineDescription_args> {
-
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getMachineDescription_args struct) throws org.apache.thrift.TException {
-        org.apache.thrift.protocol.TField schemeField;
-        iprot.readStructBegin();
-        while (true)
-        {
-          schemeField = iprot.readFieldBegin();
-          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-            break;
-          }
-          switch (schemeField.id) {
-            case 1: // USER_TOKEN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.userToken = iprot.readString();
-                struct.setUserTokenIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // IMAGE_VERSION_ID
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.imageVersionId = iprot.readString();
-                struct.setImageVersionIdIsSet(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, getMachineDescription_args struct) throws org.apache.thrift.TException {
-        struct.validate();
-
-        oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.userToken != null) {
-          oprot.writeFieldBegin(USER_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.userToken);
-          oprot.writeFieldEnd();
-        }
-        if (struct.imageVersionId != null) {
-          oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
-          oprot.writeString(struct.imageVersionId);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-
-    }
-
-    private static class getMachineDescription_argsTupleSchemeFactory implements SchemeFactory {
-      public getMachineDescription_argsTupleScheme getScheme() {
-        return new getMachineDescription_argsTupleScheme();
-      }
-    }
-
-    private static class getMachineDescription_argsTupleScheme extends TupleScheme<getMachineDescription_args> {
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getMachineDescription_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
-        if (struct.isSetUserToken()) {
-          optionals.set(0);
-        }
-        if (struct.isSetImageVersionId()) {
-          optionals.set(1);
-        }
-        oprot.writeBitSet(optionals, 2);
-        if (struct.isSetUserToken()) {
-          oprot.writeString(struct.userToken);
-        }
-        if (struct.isSetImageVersionId()) {
-          oprot.writeString(struct.imageVersionId);
-        }
-      }
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getMachineDescription_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
-        if (incoming.get(0)) {
-          struct.userToken = iprot.readString();
-          struct.setUserTokenIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.imageVersionId = iprot.readString();
-          struct.setImageVersionIdIsSet(true);
-        }
-      }
-    }
-
-  }
-
-  public static class getMachineDescription_result implements org.apache.thrift.TBase<getMachineDescription_result, getMachineDescription_result._Fields>, java.io.Serializable, Cloneable, Comparable<getMachineDescription_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getMachineDescription_result");
-
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
-    private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField FFFF_FIELD_DESC = new org.apache.thrift.protocol.TField("ffff", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField SDF_FIELD_DESC = new org.apache.thrift.protocol.TField("sdf", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getMachineDescription_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getMachineDescription_resultTupleSchemeFactory());
-    }
-
-    public ByteBuffer success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException ffff; // required
-    public TNotFoundException sdf; // required
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      SUCCESS((short)0, "success"),
-      AUTH_ERROR((short)1, "authError"),
-      FFFF((short)2, "ffff"),
-      SDF((short)3, "sdf");
-
-      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;
-          case 1: // AUTH_ERROR
-            return AUTH_ERROR;
-          case 2: // FFFF
-            return FFFF;
-          case 3: // SDF
-            return SDF;
-          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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      tmpMap.put(_Fields.FFFF, new org.apache.thrift.meta_data.FieldMetaData("ffff", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      tmpMap.put(_Fields.SDF, new org.apache.thrift.meta_data.FieldMetaData("sdf", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getMachineDescription_result.class, metaDataMap);
-    }
-
-    public getMachineDescription_result() {
-    }
-
-    public getMachineDescription_result(
-      ByteBuffer success,
-      TAuthorizationException authError,
-      TInvocationException ffff,
-      TNotFoundException sdf)
-    {
-      this();
-      this.success = success;
-      this.authError = authError;
-      this.ffff = ffff;
-      this.sdf = sdf;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public getMachineDescription_result(getMachineDescription_result other) {
-      if (other.isSetSuccess()) {
-        this.success = org.apache.thrift.TBaseHelper.copyBinary(other.success);
-;
-      }
-      if (other.isSetAuthError()) {
-        this.authError = new TAuthorizationException(other.authError);
-      }
-      if (other.isSetFfff()) {
-        this.ffff = new TInvocationException(other.ffff);
-      }
-      if (other.isSetSdf()) {
-        this.sdf = new TNotFoundException(other.sdf);
-      }
-    }
-
-    public getMachineDescription_result deepCopy() {
-      return new getMachineDescription_result(this);
-    }
-
-    @Override
-    public void clear() {
-      this.success = null;
-      this.authError = null;
-      this.ffff = null;
-      this.sdf = null;
-    }
-
-    public byte[] getSuccess() {
-      setSuccess(org.apache.thrift.TBaseHelper.rightSize(success));
-      return success == null ? null : success.array();
-    }
-
-    public ByteBuffer bufferForSuccess() {
-      return success;
-    }
-
-    public getMachineDescription_result setSuccess(byte[] success) {
-      setSuccess(success == null ? (ByteBuffer)null : ByteBuffer.wrap(success));
-      return this;
-    }
-
-    public getMachineDescription_result setSuccess(ByteBuffer 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 TAuthorizationException getAuthError() {
-      return this.authError;
-    }
-
-    public getMachineDescription_result setAuthError(TAuthorizationException authError) {
-      this.authError = authError;
-      return this;
-    }
-
-    public void unsetAuthError() {
-      this.authError = null;
-    }
-
-    /** Returns true if field authError is set (has been assigned a value) and false otherwise */
-    public boolean isSetAuthError() {
-      return this.authError != null;
-    }
-
-    public void setAuthErrorIsSet(boolean value) {
-      if (!value) {
-        this.authError = null;
-      }
-    }
-
-    public TInvocationException getFfff() {
-      return this.ffff;
-    }
-
-    public getMachineDescription_result setFfff(TInvocationException ffff) {
-      this.ffff = ffff;
-      return this;
-    }
-
-    public void unsetFfff() {
-      this.ffff = null;
-    }
-
-    /** Returns true if field ffff is set (has been assigned a value) and false otherwise */
-    public boolean isSetFfff() {
-      return this.ffff != null;
-    }
-
-    public void setFfffIsSet(boolean value) {
-      if (!value) {
-        this.ffff = null;
-      }
-    }
-
-    public TNotFoundException getSdf() {
-      return this.sdf;
-    }
-
-    public getMachineDescription_result setSdf(TNotFoundException sdf) {
-      this.sdf = sdf;
-      return this;
-    }
-
-    public void unsetSdf() {
-      this.sdf = null;
-    }
-
-    /** Returns true if field sdf is set (has been assigned a value) and false otherwise */
-    public boolean isSetSdf() {
-      return this.sdf != null;
-    }
-
-    public void setSdfIsSet(boolean value) {
-      if (!value) {
-        this.sdf = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((ByteBuffer)value);
-        }
-        break;
-
-      case AUTH_ERROR:
-        if (value == null) {
-          unsetAuthError();
-        } else {
-          setAuthError((TAuthorizationException)value);
-        }
-        break;
-
-      case FFFF:
-        if (value == null) {
-          unsetFfff();
-        } else {
-          setFfff((TInvocationException)value);
-        }
-        break;
-
-      case SDF:
-        if (value == null) {
-          unsetSdf();
-        } else {
-          setSdf((TNotFoundException)value);
-        }
-        break;
-
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case SUCCESS:
-        return getSuccess();
-
-      case AUTH_ERROR:
-        return getAuthError();
-
-      case FFFF:
-        return getFfff();
-
-      case SDF:
-        return getSdf();
-
-      }
-      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();
-      case AUTH_ERROR:
-        return isSetAuthError();
-      case FFFF:
-        return isSetFfff();
-      case SDF:
-        return isSetSdf();
-      }
-      throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof getMachineDescription_result)
-        return this.equals((getMachineDescription_result)that);
-      return false;
-    }
-
-    public boolean equals(getMachineDescription_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;
-      }
-
-      boolean this_present_authError = true && this.isSetAuthError();
-      boolean that_present_authError = true && that.isSetAuthError();
-      if (this_present_authError || that_present_authError) {
-        if (!(this_present_authError && that_present_authError))
-          return false;
-        if (!this.authError.equals(that.authError))
-          return false;
-      }
-
-      boolean this_present_ffff = true && this.isSetFfff();
-      boolean that_present_ffff = true && that.isSetFfff();
-      if (this_present_ffff || that_present_ffff) {
-        if (!(this_present_ffff && that_present_ffff))
-          return false;
-        if (!this.ffff.equals(that.ffff))
-          return false;
-      }
-
-      boolean this_present_sdf = true && this.isSetSdf();
-      boolean that_present_sdf = true && that.isSetSdf();
-      if (this_present_sdf || that_present_sdf) {
-        if (!(this_present_sdf && that_present_sdf))
-          return false;
-        if (!this.sdf.equals(that.sdf))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    @Override
-    public int compareTo(getMachineDescription_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;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetAuthError()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authError, other.authError);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetFfff()).compareTo(other.isSetFfff());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetFfff()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ffff, other.ffff);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetSdf()).compareTo(other.isSetSdf());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSdf()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sdf, other.sdf);
-        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("getMachineDescription_result(");
-      boolean first = true;
-
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        org.apache.thrift.TBaseHelper.toString(this.success, sb);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("authError:");
-      if (this.authError == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.authError);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("ffff:");
-      if (this.ffff == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ffff);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("sdf:");
-      if (this.sdf == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.sdf);
-      }
-      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 getMachineDescription_resultStandardSchemeFactory implements SchemeFactory {
-      public getMachineDescription_resultStandardScheme getScheme() {
-        return new getMachineDescription_resultStandardScheme();
-      }
-    }
-
-    private static class getMachineDescription_resultStandardScheme extends StandardScheme<getMachineDescription_result> {
-
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getMachineDescription_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.STRING) {
-                struct.success = iprot.readBinary();
-                struct.setSuccessIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 1: // AUTH_ERROR
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.authError = new TAuthorizationException();
-                struct.authError.read(iprot);
-                struct.setAuthErrorIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // FFFF
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ffff = new TInvocationException();
-                struct.ffff.read(iprot);
-                struct.setFfffIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 3: // SDF
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.sdf = new TNotFoundException();
-                struct.sdf.read(iprot);
-                struct.setSdfIsSet(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, getMachineDescription_result struct) throws org.apache.thrift.TException {
-        struct.validate();
-
-        oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.success != null) {
-          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-          oprot.writeBinary(struct.success);
-          oprot.writeFieldEnd();
-        }
-        if (struct.authError != null) {
-          oprot.writeFieldBegin(AUTH_ERROR_FIELD_DESC);
-          struct.authError.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.ffff != null) {
-          oprot.writeFieldBegin(FFFF_FIELD_DESC);
-          struct.ffff.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        if (struct.sdf != null) {
-          oprot.writeFieldBegin(SDF_FIELD_DESC);
-          struct.sdf.write(oprot);
-          oprot.writeFieldEnd();
-        }
-        oprot.writeFieldStop();
-        oprot.writeStructEnd();
-      }
-
-    }
-
-    private static class getMachineDescription_resultTupleSchemeFactory implements SchemeFactory {
-      public getMachineDescription_resultTupleScheme getScheme() {
-        return new getMachineDescription_resultTupleScheme();
-      }
-    }
-
-    private static class getMachineDescription_resultTupleScheme extends TupleScheme<getMachineDescription_result> {
-
-      @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getMachineDescription_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
-        if (struct.isSetSuccess()) {
-          optionals.set(0);
-        }
-        if (struct.isSetAuthError()) {
-          optionals.set(1);
-        }
-        if (struct.isSetFfff()) {
-          optionals.set(2);
-        }
-        if (struct.isSetSdf()) {
-          optionals.set(3);
-        }
-        oprot.writeBitSet(optionals, 4);
-        if (struct.isSetSuccess()) {
-          oprot.writeBinary(struct.success);
-        }
-        if (struct.isSetAuthError()) {
-          struct.authError.write(oprot);
-        }
-        if (struct.isSetFfff()) {
-          struct.ffff.write(oprot);
-        }
-        if (struct.isSetSdf()) {
-          struct.sdf.write(oprot);
-        }
-      }
-
-      @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getMachineDescription_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
-        if (incoming.get(0)) {
-          struct.success = iprot.readBinary();
-          struct.setSuccessIsSet(true);
-        }
-        if (incoming.get(1)) {
-          struct.authError = new TAuthorizationException();
-          struct.authError.read(iprot);
-          struct.setAuthErrorIsSet(true);
-        }
-        if (incoming.get(2)) {
-          struct.ffff = new TInvocationException();
-          struct.ffff.read(iprot);
-          struct.setFfffIsSet(true);
-        }
-        if (incoming.get(3)) {
-          struct.sdf = new TNotFoundException();
-          struct.sdf.read(iprot);
-          struct.setSdfIsSet(true);
-        }
-      }
-    }
-
-  }
-
   public static class isAuthenticated_args implements org.apache.thrift.TBase<isAuthenticated_args, isAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isAuthenticated_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isAuthenticated_args");
 
@@ -17682,14 +16557,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list154 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list154.size);
-                  for (int _i155 = 0; _i155 < _list154.size; ++_i155)
+                  org.apache.thrift.protocol.TList _list170 = iprot.readListBegin();
+                  struct.success = new ArrayList<UserInfo>(_list170.size);
+                  for (int _i171 = 0; _i171 < _list170.size; ++_i171)
                   {
-                    UserInfo _elem156;
-                    _elem156 = new UserInfo();
-                    _elem156.read(iprot);
-                    struct.success.add(_elem156);
+                    UserInfo _elem172;
+                    _elem172 = new UserInfo();
+                    _elem172.read(iprot);
+                    struct.success.add(_elem172);
                   }
                   iprot.readListEnd();
                 }
@@ -17735,9 +16610,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 _iter157 : struct.success)
+            for (UserInfo _iter173 : struct.success)
             {
-              _iter157.write(oprot);
+              _iter173.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -17784,9 +16659,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter158 : struct.success)
+            for (UserInfo _iter174 : struct.success)
             {
-              _iter158.write(oprot);
+              _iter174.write(oprot);
             }
           }
         }
@@ -17804,14 +16679,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list159 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_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.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<UserInfo>(_list175.size);
+            for (int _i176 = 0; _i176 < _list175.size; ++_i176)
             {
-              UserInfo _elem161;
-              _elem161 = new UserInfo();
-              _elem161.read(iprot);
-              struct.success.add(_elem161);
+              UserInfo _elem177;
+              _elem177 = new UserInfo();
+              _elem177.read(iprot);
+              struct.success.add(_elem177);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20220,14 +19095,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list162.size);
-                  for (int _i163 = 0; _i163 < _list162.size; ++_i163)
+                  org.apache.thrift.protocol.TList _list178 = iprot.readListBegin();
+                  struct.success = new ArrayList<OperatingSystem>(_list178.size);
+                  for (int _i179 = 0; _i179 < _list178.size; ++_i179)
                   {
-                    OperatingSystem _elem164;
-                    _elem164 = new OperatingSystem();
-                    _elem164.read(iprot);
-                    struct.success.add(_elem164);
+                    OperatingSystem _elem180;
+                    _elem180 = new OperatingSystem();
+                    _elem180.read(iprot);
+                    struct.success.add(_elem180);
                   }
                   iprot.readListEnd();
                 }
@@ -20255,9 +19130,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 _iter165 : struct.success)
+            for (OperatingSystem _iter181 : struct.success)
             {
-              _iter165.write(oprot);
+              _iter181.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -20288,9 +19163,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter166 : struct.success)
+            for (OperatingSystem _iter182 : struct.success)
             {
-              _iter166.write(oprot);
+              _iter182.write(oprot);
             }
           }
         }
@@ -20302,14 +19177,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list167 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_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.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<OperatingSystem>(_list183.size);
+            for (int _i184 = 0; _i184 < _list183.size; ++_i184)
             {
-              OperatingSystem _elem169;
-              _elem169 = new OperatingSystem();
-              _elem169.read(iprot);
-              struct.success.add(_elem169);
+              OperatingSystem _elem185;
+              _elem185 = new OperatingSystem();
+              _elem185.read(iprot);
+              struct.success.add(_elem185);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20874,14 +19749,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<Virtualizer>(_list170.size);
-                  for (int _i171 = 0; _i171 < _list170.size; ++_i171)
+                  org.apache.thrift.protocol.TList _list186 = iprot.readListBegin();
+                  struct.success = new ArrayList<Virtualizer>(_list186.size);
+                  for (int _i187 = 0; _i187 < _list186.size; ++_i187)
                   {
-                    Virtualizer _elem172;
-                    _elem172 = new Virtualizer();
-                    _elem172.read(iprot);
-                    struct.success.add(_elem172);
+                    Virtualizer _elem188;
+                    _elem188 = new Virtualizer();
+                    _elem188.read(iprot);
+                    struct.success.add(_elem188);
                   }
                   iprot.readListEnd();
                 }
@@ -20909,9 +19784,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 _iter173 : struct.success)
+            for (Virtualizer _iter189 : struct.success)
             {
-              _iter173.write(oprot);
+              _iter189.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -20942,9 +19817,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter174 : struct.success)
+            for (Virtualizer _iter190 : struct.success)
             {
-              _iter174.write(oprot);
+              _iter190.write(oprot);
             }
           }
         }
@@ -20956,14 +19831,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(1);
         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<Virtualizer>(_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<Virtualizer>(_list191.size);
+            for (int _i192 = 0; _i192 < _list191.size; ++_i192)
             {
-              Virtualizer _elem177;
-              _elem177 = new Virtualizer();
-              _elem177.read(iprot);
-              struct.success.add(_elem177);
+              Virtualizer _elem193;
+              _elem193 = new Virtualizer();
+              _elem193.read(iprot);
+              struct.success.add(_elem193);
             }
           }
           struct.setSuccessIsSet(true);
@@ -21528,14 +20403,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<Organization>(_list178.size);
-                  for (int _i179 = 0; _i179 < _list178.size; ++_i179)
+                  org.apache.thrift.protocol.TList _list194 = iprot.readListBegin();
+                  struct.success = new ArrayList<Organization>(_list194.size);
+                  for (int _i195 = 0; _i195 < _list194.size; ++_i195)
                   {
-                    Organization _elem180;
-                    _elem180 = new Organization();
-                    _elem180.read(iprot);
-                    struct.success.add(_elem180);
+                    Organization _elem196;
+                    _elem196 = new Organization();
+                    _elem196.read(iprot);
+                    struct.success.add(_elem196);
                   }
                   iprot.readListEnd();
                 }
@@ -21563,9 +20438,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 _iter181 : struct.success)
+            for (Organization _iter197 : struct.success)
             {
-              _iter181.write(oprot);
+              _iter197.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -21596,9 +20471,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter182 : struct.success)
+            for (Organization _iter198 : struct.success)
             {
-              _iter182.write(oprot);
+              _iter198.write(oprot);
             }
           }
         }
@@ -21610,14 +20485,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<Organization>(_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<Organization>(_list199.size);
+            for (int _i200 = 0; _i200 < _list199.size; ++_i200)
             {
-              Organization _elem185;
-              _elem185 = new Organization();
-              _elem185.read(iprot);
-              struct.success.add(_elem185);
+              Organization _elem201;
+              _elem201 = new Organization();
+              _elem201.read(iprot);
+              struct.success.add(_elem201);
             }
           }
           struct.setSuccessIsSet(true);
@@ -22700,13 +21575,13 @@ public class SatelliteServer {
             case 2: // TAG_SEARCH
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list186 = iprot.readListBegin();
-                  struct.tagSearch = new ArrayList<String>(_list186.size);
-                  for (int _i187 = 0; _i187 < _list186.size; ++_i187)
+                  org.apache.thrift.protocol.TList _list202 = iprot.readListBegin();
+                  struct.tagSearch = new ArrayList<String>(_list202.size);
+                  for (int _i203 = 0; _i203 < _list202.size; ++_i203)
                   {
-                    String _elem188;
-                    _elem188 = iprot.readString();
-                    struct.tagSearch.add(_elem188);
+                    String _elem204;
+                    _elem204 = iprot.readString();
+                    struct.tagSearch.add(_elem204);
                   }
                   iprot.readListEnd();
                 }
@@ -22747,9 +21622,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 _iter189 : struct.tagSearch)
+            for (String _iter205 : struct.tagSearch)
             {
-              oprot.writeString(_iter189);
+              oprot.writeString(_iter205);
             }
             oprot.writeListEnd();
           }
@@ -22792,9 +21667,9 @@ public class SatelliteServer {
         if (struct.isSetTagSearch()) {
           {
             oprot.writeI32(struct.tagSearch.size());
-            for (String _iter190 : struct.tagSearch)
+            for (String _iter206 : struct.tagSearch)
             {
-              oprot.writeString(_iter190);
+              oprot.writeString(_iter206);
             }
           }
         }
@@ -22813,13 +21688,13 @@ public class SatelliteServer {
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list191 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.tagSearch = new ArrayList<String>(_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.STRING, iprot.readI32());
+            struct.tagSearch = new ArrayList<String>(_list207.size);
+            for (int _i208 = 0; _i208 < _list207.size; ++_i208)
             {
-              String _elem193;
-              _elem193 = iprot.readString();
-              struct.tagSearch.add(_elem193);
+              String _elem209;
+              _elem209 = iprot.readString();
+              struct.tagSearch.add(_elem209);
             }
           }
           struct.setTagSearchIsSet(true);
@@ -23296,14 +22171,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<ImageSummaryRead>(_list194.size);
-                  for (int _i195 = 0; _i195 < _list194.size; ++_i195)
+                  org.apache.thrift.protocol.TList _list210 = iprot.readListBegin();
+                  struct.success = new ArrayList<ImageSummaryRead>(_list210.size);
+                  for (int _i211 = 0; _i211 < _list210.size; ++_i211)
                   {
-                    ImageSummaryRead _elem196;
-                    _elem196 = new ImageSummaryRead();
-                    _elem196.read(iprot);
-                    struct.success.add(_elem196);
+                    ImageSummaryRead _elem212;
+                    _elem212 = new ImageSummaryRead();
+                    _elem212.read(iprot);
+                    struct.success.add(_elem212);
                   }
                   iprot.readListEnd();
                 }
@@ -23349,9 +22224,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 _iter197 : struct.success)
+            for (ImageSummaryRead _iter213 : struct.success)
             {
-              _iter197.write(oprot);
+              _iter213.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -23398,9 +22273,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImageSummaryRead _iter198 : struct.success)
+            for (ImageSummaryRead _iter214 : struct.success)
             {
-              _iter198.write(oprot);
+              _iter214.write(oprot);
             }
           }
         }
@@ -23418,14 +22293,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         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<ImageSummaryRead>(_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<ImageSummaryRead>(_list215.size);
+            for (int _i216 = 0; _i216 < _list215.size; ++_i216)
             {
-              ImageSummaryRead _elem201;
-              _elem201 = new ImageSummaryRead();
-              _elem201.read(iprot);
-              struct.success.add(_elem201);
+              ImageSummaryRead _elem217;
+              _elem217 = new ImageSummaryRead();
+              _elem217.read(iprot);
+              struct.success.add(_elem217);
             }
           }
           struct.setSuccessIsSet(true);
@@ -30326,16 +29201,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map202 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,ImagePermissions>(2*_map202.size);
-                  for (int _i203 = 0; _i203 < _map202.size; ++_i203)
+                  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)
                   {
-                    String _key204;
-                    ImagePermissions _val205;
-                    _key204 = iprot.readString();
-                    _val205 = new ImagePermissions();
-                    _val205.read(iprot);
-                    struct.permissions.put(_key204, _val205);
+                    String _key220;
+                    ImagePermissions _val221;
+                    _key220 = iprot.readString();
+                    _val221 = new ImagePermissions();
+                    _val221.read(iprot);
+                    struct.permissions.put(_key220, _val221);
                   }
                   iprot.readMapEnd();
                 }
@@ -30373,10 +29248,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> _iter206 : struct.permissions.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter222 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter206.getKey());
-              _iter206.getValue().write(oprot);
+              oprot.writeString(_iter222.getKey());
+              _iter222.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -30419,10 +29294,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, ImagePermissions> _iter207 : struct.permissions.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter223 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter207.getKey());
-              _iter207.getValue().write(oprot);
+              oprot.writeString(_iter223.getKey());
+              _iter223.getValue().write(oprot);
             }
           }
         }
@@ -30442,16 +29317,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map208 = 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*_map208.size);
-            for (int _i209 = 0; _i209 < _map208.size; ++_i209)
+            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)
             {
-              String _key210;
-              ImagePermissions _val211;
-              _key210 = iprot.readString();
-              _val211 = new ImagePermissions();
-              _val211.read(iprot);
-              struct.permissions.put(_key210, _val211);
+              String _key226;
+              ImagePermissions _val227;
+              _key226 = iprot.readString();
+              _val227 = new ImagePermissions();
+              _val227.read(iprot);
+              struct.permissions.put(_key226, _val227);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -32020,16 +30895,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map212 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,ImagePermissions>(2*_map212.size);
-                  for (int _i213 = 0; _i213 < _map212.size; ++_i213)
+                  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)
                   {
-                    String _key214;
-                    ImagePermissions _val215;
-                    _key214 = iprot.readString();
-                    _val215 = new ImagePermissions();
-                    _val215.read(iprot);
-                    struct.success.put(_key214, _val215);
+                    String _key230;
+                    ImagePermissions _val231;
+                    _key230 = iprot.readString();
+                    _val231 = new ImagePermissions();
+                    _val231.read(iprot);
+                    struct.success.put(_key230, _val231);
                   }
                   iprot.readMapEnd();
                 }
@@ -32084,10 +30959,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> _iter216 : struct.success.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter232 : struct.success.entrySet())
             {
-              oprot.writeString(_iter216.getKey());
-              _iter216.getValue().write(oprot);
+              oprot.writeString(_iter232.getKey());
+              _iter232.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -32142,10 +31017,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, ImagePermissions> _iter217 : struct.success.entrySet())
+            for (Map.Entry<String, ImagePermissions> _iter233 : struct.success.entrySet())
             {
-              oprot.writeString(_iter217.getKey());
-              _iter217.getValue().write(oprot);
+              oprot.writeString(_iter233.getKey());
+              _iter233.getValue().write(oprot);
             }
           }
         }
@@ -32166,16 +31041,16 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map218 = 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*_map218.size);
-            for (int _i219 = 0; _i219 < _map218.size; ++_i219)
+            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)
             {
-              String _key220;
-              ImagePermissions _val221;
-              _key220 = iprot.readString();
-              _val221 = new ImagePermissions();
-              _val221.read(iprot);
-              struct.success.put(_key220, _val221);
+              String _key236;
+              ImagePermissions _val237;
+              _key236 = iprot.readString();
+              _val237 = new ImagePermissions();
+              _val237.read(iprot);
+              struct.success.put(_key236, _val237);
             }
           }
           struct.setSuccessIsSet(true);
@@ -34528,6 +33403,1120 @@ public class SatelliteServer {
 
   }
 
+  public static class requestImageReplication_args implements org.apache.thrift.TBase<requestImageReplication_args, requestImageReplication_args._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageReplication_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestImageReplication_args");
+
+    private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new requestImageReplication_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new requestImageReplication_argsTupleSchemeFactory());
+    }
+
+    public String userToken; // required
+    public String imageVersionId; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      USER_TOKEN((short)1, "userToken"),
+      IMAGE_VERSION_ID((short)2, "imageVersionId");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // USER_TOKEN
+            return USER_TOKEN;
+          case 2: // IMAGE_VERSION_ID
+            return IMAGE_VERSION_ID;
+          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.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
+      tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageReplication_args.class, metaDataMap);
+    }
+
+    public requestImageReplication_args() {
+    }
+
+    public requestImageReplication_args(
+      String userToken,
+      String imageVersionId)
+    {
+      this();
+      this.userToken = userToken;
+      this.imageVersionId = imageVersionId;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public requestImageReplication_args(requestImageReplication_args other) {
+      if (other.isSetUserToken()) {
+        this.userToken = other.userToken;
+      }
+      if (other.isSetImageVersionId()) {
+        this.imageVersionId = other.imageVersionId;
+      }
+    }
+
+    public requestImageReplication_args deepCopy() {
+      return new requestImageReplication_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.userToken = null;
+      this.imageVersionId = null;
+    }
+
+    public String getUserToken() {
+      return this.userToken;
+    }
+
+    public requestImageReplication_args setUserToken(String userToken) {
+      this.userToken = userToken;
+      return this;
+    }
+
+    public void unsetUserToken() {
+      this.userToken = null;
+    }
+
+    /** Returns true if field userToken is set (has been assigned a value) and false otherwise */
+    public boolean isSetUserToken() {
+      return this.userToken != null;
+    }
+
+    public void setUserTokenIsSet(boolean value) {
+      if (!value) {
+        this.userToken = null;
+      }
+    }
+
+    public String getImageVersionId() {
+      return this.imageVersionId;
+    }
+
+    public requestImageReplication_args setImageVersionId(String imageVersionId) {
+      this.imageVersionId = imageVersionId;
+      return this;
+    }
+
+    public void unsetImageVersionId() {
+      this.imageVersionId = null;
+    }
+
+    /** Returns true if field imageVersionId is set (has been assigned a value) and false otherwise */
+    public boolean isSetImageVersionId() {
+      return this.imageVersionId != null;
+    }
+
+    public void setImageVersionIdIsSet(boolean value) {
+      if (!value) {
+        this.imageVersionId = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case USER_TOKEN:
+        if (value == null) {
+          unsetUserToken();
+        } else {
+          setUserToken((String)value);
+        }
+        break;
+
+      case IMAGE_VERSION_ID:
+        if (value == null) {
+          unsetImageVersionId();
+        } else {
+          setImageVersionId((String)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case USER_TOKEN:
+        return getUserToken();
+
+      case IMAGE_VERSION_ID:
+        return getImageVersionId();
+
+      }
+      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 USER_TOKEN:
+        return isSetUserToken();
+      case IMAGE_VERSION_ID:
+        return isSetImageVersionId();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof requestImageReplication_args)
+        return this.equals((requestImageReplication_args)that);
+      return false;
+    }
+
+    public boolean equals(requestImageReplication_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_userToken = true && this.isSetUserToken();
+      boolean that_present_userToken = true && that.isSetUserToken();
+      if (this_present_userToken || that_present_userToken) {
+        if (!(this_present_userToken && that_present_userToken))
+          return false;
+        if (!this.userToken.equals(that.userToken))
+          return false;
+      }
+
+      boolean this_present_imageVersionId = true && this.isSetImageVersionId();
+      boolean that_present_imageVersionId = true && that.isSetImageVersionId();
+      if (this_present_imageVersionId || that_present_imageVersionId) {
+        if (!(this_present_imageVersionId && that_present_imageVersionId))
+          return false;
+        if (!this.imageVersionId.equals(that.imageVersionId))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(requestImageReplication_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetUserToken()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userToken, other.userToken);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetImageVersionId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersionId, other.imageVersionId);
+        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("requestImageReplication_args(");
+      boolean first = true;
+
+      sb.append("userToken:");
+      if (this.userToken == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.userToken);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("imageVersionId:");
+      if (this.imageVersionId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.imageVersionId);
+      }
+      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 requestImageReplication_argsStandardSchemeFactory implements SchemeFactory {
+      public requestImageReplication_argsStandardScheme getScheme() {
+        return new requestImageReplication_argsStandardScheme();
+      }
+    }
+
+    private static class requestImageReplication_argsStandardScheme extends StandardScheme<requestImageReplication_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageReplication_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 1: // USER_TOKEN
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.userToken = iprot.readString();
+                struct.setUserTokenIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // IMAGE_VERSION_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.imageVersionId = iprot.readString();
+                struct.setImageVersionIdIsSet(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, requestImageReplication_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.userToken != null) {
+          oprot.writeFieldBegin(USER_TOKEN_FIELD_DESC);
+          oprot.writeString(struct.userToken);
+          oprot.writeFieldEnd();
+        }
+        if (struct.imageVersionId != null) {
+          oprot.writeFieldBegin(IMAGE_VERSION_ID_FIELD_DESC);
+          oprot.writeString(struct.imageVersionId);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class requestImageReplication_argsTupleSchemeFactory implements SchemeFactory {
+      public requestImageReplication_argsTupleScheme getScheme() {
+        return new requestImageReplication_argsTupleScheme();
+      }
+    }
+
+    private static class requestImageReplication_argsTupleScheme extends TupleScheme<requestImageReplication_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetUserToken()) {
+          optionals.set(0);
+        }
+        if (struct.isSetImageVersionId()) {
+          optionals.set(1);
+        }
+        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetUserToken()) {
+          oprot.writeString(struct.userToken);
+        }
+        if (struct.isSetImageVersionId()) {
+          oprot.writeString(struct.imageVersionId);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.userToken = iprot.readString();
+          struct.setUserTokenIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.imageVersionId = iprot.readString();
+          struct.setImageVersionIdIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class requestImageReplication_result implements org.apache.thrift.TBase<requestImageReplication_result, requestImageReplication_result._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageReplication_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("requestImageReplication_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
+    private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new requestImageReplication_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new requestImageReplication_resultTupleSchemeFactory());
+    }
+
+    public String success; // required
+    public TAuthorizationException authError; // required
+    public TNotFoundException notFound; // required
+    public TInvocationException serverError; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      AUTH_ERROR((short)1, "authError"),
+      NOT_FOUND((short)2, "notFound"),
+      SERVER_ERROR((short)3, "serverError");
+
+      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;
+          case 1: // AUTH_ERROR
+            return AUTH_ERROR;
+          case 2: // NOT_FOUND
+            return NOT_FOUND;
+          case 3: // SERVER_ERROR
+            return SERVER_ERROR;
+          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.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
+      tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageReplication_result.class, metaDataMap);
+    }
+
+    public requestImageReplication_result() {
+    }
+
+    public requestImageReplication_result(
+      String success,
+      TAuthorizationException authError,
+      TNotFoundException notFound,
+      TInvocationException serverError)
+    {
+      this();
+      this.success = success;
+      this.authError = authError;
+      this.notFound = notFound;
+      this.serverError = serverError;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public requestImageReplication_result(requestImageReplication_result other) {
+      if (other.isSetSuccess()) {
+        this.success = other.success;
+      }
+      if (other.isSetAuthError()) {
+        this.authError = new TAuthorizationException(other.authError);
+      }
+      if (other.isSetNotFound()) {
+        this.notFound = new TNotFoundException(other.notFound);
+      }
+      if (other.isSetServerError()) {
+        this.serverError = new TInvocationException(other.serverError);
+      }
+    }
+
+    public requestImageReplication_result deepCopy() {
+      return new requestImageReplication_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.authError = null;
+      this.notFound = null;
+      this.serverError = null;
+    }
+
+    public String getSuccess() {
+      return this.success;
+    }
+
+    public requestImageReplication_result setSuccess(String 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 TAuthorizationException getAuthError() {
+      return this.authError;
+    }
+
+    public requestImageReplication_result setAuthError(TAuthorizationException authError) {
+      this.authError = authError;
+      return this;
+    }
+
+    public void unsetAuthError() {
+      this.authError = null;
+    }
+
+    /** Returns true if field authError is set (has been assigned a value) and false otherwise */
+    public boolean isSetAuthError() {
+      return this.authError != null;
+    }
+
+    public void setAuthErrorIsSet(boolean value) {
+      if (!value) {
+        this.authError = null;
+      }
+    }
+
+    public TNotFoundException getNotFound() {
+      return this.notFound;
+    }
+
+    public requestImageReplication_result setNotFound(TNotFoundException notFound) {
+      this.notFound = notFound;
+      return this;
+    }
+
+    public void unsetNotFound() {
+      this.notFound = null;
+    }
+
+    /** Returns true if field notFound is set (has been assigned a value) and false otherwise */
+    public boolean isSetNotFound() {
+      return this.notFound != null;
+    }
+
+    public void setNotFoundIsSet(boolean value) {
+      if (!value) {
+        this.notFound = null;
+      }
+    }
+
+    public TInvocationException getServerError() {
+      return this.serverError;
+    }
+
+    public requestImageReplication_result setServerError(TInvocationException serverError) {
+      this.serverError = serverError;
+      return this;
+    }
+
+    public void unsetServerError() {
+      this.serverError = null;
+    }
+
+    /** Returns true if field serverError is set (has been assigned a value) and false otherwise */
+    public boolean isSetServerError() {
+      return this.serverError != null;
+    }
+
+    public void setServerErrorIsSet(boolean value) {
+      if (!value) {
+        this.serverError = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((String)value);
+        }
+        break;
+
+      case AUTH_ERROR:
+        if (value == null) {
+          unsetAuthError();
+        } else {
+          setAuthError((TAuthorizationException)value);
+        }
+        break;
+
+      case NOT_FOUND:
+        if (value == null) {
+          unsetNotFound();
+        } else {
+          setNotFound((TNotFoundException)value);
+        }
+        break;
+
+      case SERVER_ERROR:
+        if (value == null) {
+          unsetServerError();
+        } else {
+          setServerError((TInvocationException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case AUTH_ERROR:
+        return getAuthError();
+
+      case NOT_FOUND:
+        return getNotFound();
+
+      case SERVER_ERROR:
+        return getServerError();
+
+      }
+      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();
+      case AUTH_ERROR:
+        return isSetAuthError();
+      case NOT_FOUND:
+        return isSetNotFound();
+      case SERVER_ERROR:
+        return isSetServerError();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof requestImageReplication_result)
+        return this.equals((requestImageReplication_result)that);
+      return false;
+    }
+
+    public boolean equals(requestImageReplication_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;
+      }
+
+      boolean this_present_authError = true && this.isSetAuthError();
+      boolean that_present_authError = true && that.isSetAuthError();
+      if (this_present_authError || that_present_authError) {
+        if (!(this_present_authError && that_present_authError))
+          return false;
+        if (!this.authError.equals(that.authError))
+          return false;
+      }
+
+      boolean this_present_notFound = true && this.isSetNotFound();
+      boolean that_present_notFound = true && that.isSetNotFound();
+      if (this_present_notFound || that_present_notFound) {
+        if (!(this_present_notFound && that_present_notFound))
+          return false;
+        if (!this.notFound.equals(that.notFound))
+          return false;
+      }
+
+      boolean this_present_serverError = true && this.isSetServerError();
+      boolean that_present_serverError = true && that.isSetServerError();
+      if (this_present_serverError || that_present_serverError) {
+        if (!(this_present_serverError && that_present_serverError))
+          return false;
+        if (!this.serverError.equals(that.serverError))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(requestImageReplication_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;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetAuthError()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authError, other.authError);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetNotFound()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.notFound, other.notFound);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetServerError()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverError, other.serverError);
+        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("requestImageReplication_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("authError:");
+      if (this.authError == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.authError);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("notFound:");
+      if (this.notFound == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.notFound);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("serverError:");
+      if (this.serverError == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.serverError);
+      }
+      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 requestImageReplication_resultStandardSchemeFactory implements SchemeFactory {
+      public requestImageReplication_resultStandardScheme getScheme() {
+        return new requestImageReplication_resultStandardScheme();
+      }
+    }
+
+    private static class requestImageReplication_resultStandardScheme extends StandardScheme<requestImageReplication_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageReplication_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        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.STRING) {
+                struct.success = iprot.readString();
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 1: // AUTH_ERROR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.authError = new TAuthorizationException();
+                struct.authError.read(iprot);
+                struct.setAuthErrorIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // NOT_FOUND
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.notFound = new TNotFoundException();
+                struct.notFound.read(iprot);
+                struct.setNotFoundIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // SERVER_ERROR
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.serverError = new TInvocationException();
+                struct.serverError.read(iprot);
+                struct.setServerErrorIsSet(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, requestImageReplication_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          oprot.writeString(struct.success);
+          oprot.writeFieldEnd();
+        }
+        if (struct.authError != null) {
+          oprot.writeFieldBegin(AUTH_ERROR_FIELD_DESC);
+          struct.authError.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.notFound != null) {
+          oprot.writeFieldBegin(NOT_FOUND_FIELD_DESC);
+          struct.notFound.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.serverError != null) {
+          oprot.writeFieldBegin(SERVER_ERROR_FIELD_DESC);
+          struct.serverError.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class requestImageReplication_resultTupleSchemeFactory implements SchemeFactory {
+      public requestImageReplication_resultTupleScheme getScheme() {
+        return new requestImageReplication_resultTupleScheme();
+      }
+    }
+
+    private static class requestImageReplication_resultTupleScheme extends TupleScheme<requestImageReplication_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        if (struct.isSetAuthError()) {
+          optionals.set(1);
+        }
+        if (struct.isSetNotFound()) {
+          optionals.set(2);
+        }
+        if (struct.isSetServerError()) {
+          optionals.set(3);
+        }
+        oprot.writeBitSet(optionals, 4);
+        if (struct.isSetSuccess()) {
+          oprot.writeString(struct.success);
+        }
+        if (struct.isSetAuthError()) {
+          struct.authError.write(oprot);
+        }
+        if (struct.isSetNotFound()) {
+          struct.notFound.write(oprot);
+        }
+        if (struct.isSetServerError()) {
+          struct.serverError.write(oprot);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(4);
+        if (incoming.get(0)) {
+          struct.success = iprot.readString();
+          struct.setSuccessIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.authError = new TAuthorizationException();
+          struct.authError.read(iprot);
+          struct.setAuthErrorIsSet(true);
+        }
+        if (incoming.get(2)) {
+          struct.notFound = new TNotFoundException();
+          struct.notFound.read(iprot);
+          struct.setNotFoundIsSet(true);
+        }
+        if (incoming.get(3)) {
+          struct.serverError = new TInvocationException();
+          struct.serverError.read(iprot);
+          struct.setServerErrorIsSet(true);
+        }
+      }
+    }
+
+  }
+
   public static class createLecture_args implements org.apache.thrift.TBase<createLecture_args, createLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<createLecture_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createLecture_args");
 
@@ -37783,14 +37772,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list222 = iprot.readListBegin();
-                  struct.success = new ArrayList<LectureSummary>(_list222.size);
-                  for (int _i223 = 0; _i223 < _list222.size; ++_i223)
+                  org.apache.thrift.protocol.TList _list238 = iprot.readListBegin();
+                  struct.success = new ArrayList<LectureSummary>(_list238.size);
+                  for (int _i239 = 0; _i239 < _list238.size; ++_i239)
                   {
-                    LectureSummary _elem224;
-                    _elem224 = new LectureSummary();
-                    _elem224.read(iprot);
-                    struct.success.add(_elem224);
+                    LectureSummary _elem240;
+                    _elem240 = new LectureSummary();
+                    _elem240.read(iprot);
+                    struct.success.add(_elem240);
                   }
                   iprot.readListEnd();
                 }
@@ -37836,9 +37825,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 _iter225 : struct.success)
+            for (LectureSummary _iter241 : struct.success)
             {
-              _iter225.write(oprot);
+              _iter241.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -37885,9 +37874,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (LectureSummary _iter226 : struct.success)
+            for (LectureSummary _iter242 : struct.success)
             {
-              _iter226.write(oprot);
+              _iter242.write(oprot);
             }
           }
         }
@@ -37905,14 +37894,14 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<LectureSummary>(_list227.size);
-            for (int _i228 = 0; _i228 < _list227.size; ++_i228)
+            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)
             {
-              LectureSummary _elem229;
-              _elem229 = new LectureSummary();
-              _elem229.read(iprot);
-              struct.success.add(_elem229);
+              LectureSummary _elem245;
+              _elem245 = new LectureSummary();
+              _elem245.read(iprot);
+              struct.success.add(_elem245);
             }
           }
           struct.setSuccessIsSet(true);
@@ -40549,16 +40538,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map230 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,LecturePermissions>(2*_map230.size);
-                  for (int _i231 = 0; _i231 < _map230.size; ++_i231)
+                  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)
                   {
-                    String _key232;
-                    LecturePermissions _val233;
-                    _key232 = iprot.readString();
-                    _val233 = new LecturePermissions();
-                    _val233.read(iprot);
-                    struct.permissions.put(_key232, _val233);
+                    String _key248;
+                    LecturePermissions _val249;
+                    _key248 = iprot.readString();
+                    _val249 = new LecturePermissions();
+                    _val249.read(iprot);
+                    struct.permissions.put(_key248, _val249);
                   }
                   iprot.readMapEnd();
                 }
@@ -40596,10 +40585,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> _iter234 : struct.permissions.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter250 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter234.getKey());
-              _iter234.getValue().write(oprot);
+              oprot.writeString(_iter250.getKey());
+              _iter250.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -40642,10 +40631,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, LecturePermissions> _iter235 : struct.permissions.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter251 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter235.getKey());
-              _iter235.getValue().write(oprot);
+              oprot.writeString(_iter251.getKey());
+              _iter251.getValue().write(oprot);
             }
           }
         }
@@ -40665,16 +40654,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map236 = 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*_map236.size);
-            for (int _i237 = 0; _i237 < _map236.size; ++_i237)
+            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)
             {
-              String _key238;
-              LecturePermissions _val239;
-              _key238 = iprot.readString();
-              _val239 = new LecturePermissions();
-              _val239.read(iprot);
-              struct.permissions.put(_key238, _val239);
+              String _key254;
+              LecturePermissions _val255;
+              _key254 = iprot.readString();
+              _val255 = new LecturePermissions();
+              _val255.read(iprot);
+              struct.permissions.put(_key254, _val255);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -42243,16 +42232,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map240 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,LecturePermissions>(2*_map240.size);
-                  for (int _i241 = 0; _i241 < _map240.size; ++_i241)
+                  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)
                   {
-                    String _key242;
-                    LecturePermissions _val243;
-                    _key242 = iprot.readString();
-                    _val243 = new LecturePermissions();
-                    _val243.read(iprot);
-                    struct.success.put(_key242, _val243);
+                    String _key258;
+                    LecturePermissions _val259;
+                    _key258 = iprot.readString();
+                    _val259 = new LecturePermissions();
+                    _val259.read(iprot);
+                    struct.success.put(_key258, _val259);
                   }
                   iprot.readMapEnd();
                 }
@@ -42307,10 +42296,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> _iter244 : struct.success.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter260 : struct.success.entrySet())
             {
-              oprot.writeString(_iter244.getKey());
-              _iter244.getValue().write(oprot);
+              oprot.writeString(_iter260.getKey());
+              _iter260.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -42365,10 +42354,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, LecturePermissions> _iter245 : struct.success.entrySet())
+            for (Map.Entry<String, LecturePermissions> _iter261 : struct.success.entrySet())
             {
-              oprot.writeString(_iter245.getKey());
-              _iter245.getValue().write(oprot);
+              oprot.writeString(_iter261.getKey());
+              _iter261.getValue().write(oprot);
             }
           }
         }
@@ -42389,16 +42378,16 @@ public class SatelliteServer {
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map246 = 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*_map246.size);
-            for (int _i247 = 0; _i247 < _map246.size; ++_i247)
+            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)
             {
-              String _key248;
-              LecturePermissions _val249;
-              _key248 = iprot.readString();
-              _val249 = new LecturePermissions();
-              _val249.read(iprot);
-              struct.success.put(_key248, _val249);
+              String _key264;
+              LecturePermissions _val265;
+              _key264 = iprot.readString();
+              _val265 = new LecturePermissions();
+              _val265.read(iprot);
+              struct.success.put(_key264, _val265);
             }
           }
           struct.setSuccessIsSet(true);
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 eac8531..9381d0c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
@@ -667,13 +667,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 _list130 = iprot.readListBegin();
-                struct.blockHashes = new ArrayList<ByteBuffer>(_list130.size);
-                for (int _i131 = 0; _i131 < _list130.size; ++_i131)
+                org.apache.thrift.protocol.TList _list146 = iprot.readListBegin();
+                struct.blockHashes = new ArrayList<ByteBuffer>(_list146.size);
+                for (int _i147 = 0; _i147 < _list146.size; ++_i147)
                 {
-                  ByteBuffer _elem132;
-                  _elem132 = iprot.readBinary();
-                  struct.blockHashes.add(_elem132);
+                  ByteBuffer _elem148;
+                  _elem148 = iprot.readBinary();
+                  struct.blockHashes.add(_elem148);
                 }
                 iprot.readListEnd();
               }
@@ -721,9 +721,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 _iter133 : struct.blockHashes)
+            for (ByteBuffer _iter149 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter133);
+              oprot.writeBinary(_iter149);
             }
             oprot.writeListEnd();
           }
@@ -783,9 +783,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (struct.isSetBlockHashes()) {
         {
           oprot.writeI32(struct.blockHashes.size());
-          for (ByteBuffer _iter134 : struct.blockHashes)
+          for (ByteBuffer _iter150 : struct.blockHashes)
           {
-            oprot.writeBinary(_iter134);
+            oprot.writeBinary(_iter150);
           }
         }
       }
@@ -812,13 +812,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.blockHashes = new ArrayList<ByteBuffer>(_list135.size);
-          for (int _i136 = 0; _i136 < _list135.size; ++_i136)
+          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)
           {
-            ByteBuffer _elem137;
-            _elem137 = iprot.readBinary();
-            struct.blockHashes.add(_elem137);
+            ByteBuffer _elem153;
+            _elem153 = iprot.readBinary();
+            struct.blockHashes.add(_elem153);
           }
         }
         struct.setBlockHashesIsSet(true);
diff --git a/src/main/thrift/bwlp.thrift b/src/main/thrift/bwlp.thrift
index 113d6bc..c658952 100644
--- a/src/main/thrift/bwlp.thrift
+++ b/src/main/thrift/bwlp.thrift
@@ -131,21 +131,6 @@ struct OperatingSystem {
 	4: string architecture,
 }
 
-// Sat <-> Master
-struct ImagePublishData {
-	1: UUID imageBaseId,
-	2: UUID currentVersionId,
-	3: string imageName,
-	4: i32 osId,
-	5: string virtId,
-	6: UnixTimestamp baseCreateTime,
-	7: UnixTimestamp versionCreateTime,
-	8: UUID ownerId,
-	9: UUID uploaderId,
-	11: i64 fileSize,
-	16: bool isTemplate,
-}
-
 struct ImagePermissions {
 	1: bool link
 	2: bool download
@@ -227,6 +212,21 @@ struct ImageDetailsRead {
 	18: optional ImagePermissions userPermissions,
 }
 
+struct ImagePublishData {
+	1: UUID imageBaseId,
+	2: UUID imageVersionId,
+	3: string imageName,
+	4: string description,
+	5: UnixTimestamp createTime,
+	6: UUID userId,
+	7: i64 fileSize,
+	8: list<string> software,
+	9: list<string> tags,
+	10: i32 osId,
+	11: string virtId,
+	12: bool isTemplate,
+}
+
 struct NetRule {
 	1: i32 ruleId,
 	2: NetDirection direction,
@@ -387,26 +387,30 @@ service SatelliteServer {
 	/*
 	 * File transfer related
 	 */
+
+	// Client wants to upload an image
 	TransferInformation requestImageVersionUpload(1: Token userToken, 2: UUID imageBaseId, 3: i64 fileSize, 4: list<binary> blockHashes, 5: binary machineDescription)
 		throws (1:TTransferRejectedException rejection, 2:TAuthorizationException authError, 3:TInvocationException ffff, 4:TNotFoundException sdf),
 
+	// Client updates block hashes of an upload
 	void updateBlockHashes(1: Token uploadToken, 2: list<binary> blockHashes)
 		throws (1:TInvalidTokenException ex1),
 
+	// Client cancels an upload
 	void cancelUpload(1: Token uploadToken)
 		throws (1:TInvalidTokenException ex1),
 
+	// Client queries server-side status of an upload
 	TransferStatus queryUploadStatus(1: Token uploadToken)
 		throws (1:TInvalidTokenException ex1),
 
+	// Client wants to download an image
 	TransferInformation requestDownload(1: Token userToken, 2: UUID imageVersionId)
 		throws (1:TTransferRejectedException rejection, 2:TAuthorizationException authError, 3:TInvocationException ffff, 4:TNotFoundException sdf),
 
+	// Client cancels a download
 	void cancelDownload(1: string downloadToken)
 		throws (1:TInvalidTokenException ex1),
-
-	binary getMachineDescription(1: Token userToken, 2: UUID imageVersionId)
-		throws (1:TAuthorizationException authError, 2:TInvocationException ffff, 3:TNotFoundException sdf),
 		
 	/*
 	 * Auth/Session
@@ -420,16 +424,19 @@ service SatelliteServer {
 	WhoamiInfo whoami(1: Token userToken)
 		throws (1:TAuthorizationException authError, 2:TInvocationException serverError),
 
+	// Logout - make server forget given token
 	void invalidateSession(1: Token userToken)
 		throws (1:TInvalidTokenException ex),
 	
 	// find a user in a given organization by a search term
 	list<UserInfo> getUserList(1:Token userToken, 2:i32 page)
 		throws (1:TAuthorizationException failure, 2:TInvocationException serverError),
-		
+
+	// Get user configurable options
 	SatelliteUserConfig getUserConfig(1:Token userToken)
 		throws (1:TAuthorizationException failure, 2:TInvocationException serverError),
-	
+
+	// Set user configurable options
 	void setUserConfig(1:Token userToken, 2:SatelliteUserConfig config)
 		throws (1:TAuthorizationException failure, 2:TInvocationException serverError),
 	
@@ -446,65 +453,89 @@ service SatelliteServer {
 	/*
 	 * Image related
 	 */
+
 	// Get image list. tagSearch can be null, which disables this type of filtering and returns all
     list<ImageSummaryRead> getImageList(1: Token userToken, 2: list<string> tagSearch, 3: i32 page)
 		throws (1:TAuthorizationException authError, 2:TInvocationException serverError),
+
 	// Query detailed information about an image
 	ImageDetailsRead getImageDetails(1: Token userToken, 2: UUID imageBaseId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Create a new image; the image will have no versions, so the user needs to upload one and set meta data later on
 	UUID createImage(1: Token userToken, 2: string imageName)
 		throws (1:TAuthorizationException authError, 2:TInvocationException error),
+
 	// Update given image's base meta data
 	void updateImageBase(1: Token userToken, 2: UUID imageBaseId 3: ImageBaseWrite image)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException imgError),
+
 	// Update a certain image version's meta data
 	void updateImageVersion(1: Token userToken, 2: UUID imageVersionId 3: ImageVersionWrite image)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException imgError),
+
 	// Delete given image version. If the version is currently in use by a lecture, it will not be
+
 	// deleted and false is returned
 	void deleteImageVersion(1: Token userToken, 2: UUID imageVersionId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Delete image and all its versions
 	void deleteImageBase(1:Token userToken, 2:UUID imageBaseId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Write list of permissions for given image 
 	void writeImagePermissions(1: Token userToken, 2: UUID imageBaseId, 3: map<UUID, ImagePermissions> permissions)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Get all user-permissions for given image 
 	map<UUID, ImagePermissions> getImagePermissions(1: Token userToken, 2: UUID imageBaseId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Set new owner of image
 	void setImageOwner(1: Token userToken, 2: UUID imageBaseId 3: UUID newOwnerId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
-	// Set image version valid and change expiry date (super user action)
+
+	// Set image version valid and change expire date (super user action)
 	void setImageVersionExpiry(1: Token userToken, 2: UUID imageBaseId 3: UnixTimestamp expireTime)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError, 4:TInvalidDateParam dateError),
-	
+
+	// Client asks server to replicate an image from the master server
+	UUID requestImageReplication(1:Token userToken, 2: UUID imageVersionId)
+		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	/*
 	 * Lecture related
 	 */
+
 	// Create new lecture
     UUID createLecture(1: Token userToken, 2: LectureWrite lecture)
 		throws (1:TAuthorizationException authError, 2:TInvocationException serverError, 3:TInvalidDateParam dateError),
+
 	// Update existing lecture
     void updateLecture(1: Token userToken, 2: UUID lectureId, 3: LectureWrite lecture)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError, 4:TInvalidDateParam dateError),
+
 	// Get list of all lectures
     list<LectureSummary> getLectureList(1: Token userToken, 2: i32 page)
 		throws (1:TAuthorizationException authError, 2:TInvocationException serverError),
+
 	// Get detailed lecture information
 	LectureRead getLectureDetails(1: Token userToken, 2: UUID lectureId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Delete given lecture
 	void deleteLecture(1: Token userToken, 2: UUID lectureId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Write list of permissions for given lecture
 	void writeLecturePermissions(1: Token userToken, 2: UUID lectureId, 3: map<UUID, LecturePermissions> permissions)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Get list of permissions for given lecture
 	map<UUID, LecturePermissions> getLecturePermissions(1: Token userToken, 2: UUID lectureId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
+
 	// Set new owner of lecture
 	void setLectureOwner(1: Token userToken, 2: UUID lectureId 3: UUID newOwnerId)
 		throws (1:TAuthorizationException authError, 2:TNotFoundException notFound, 3:TInvocationException serverError),
@@ -514,48 +545,60 @@ service SatelliteServer {
 
 service MasterServer {
 
-/*
- * Client (User's Desktop App) calls
- */
- 	// Ping service
+	/*
+	 * Client (User's Desktop App) calls
+	 */
+ 
+ 
+	// Ping service
 	bool ping(),
 
 	// Old style test-account login 
 	SessionData authenticate(1:string login, 2:string password)
 		throws (1:TAuthorizationException failure, 2:TInvocationException error),
+
 	// New style test-account login 
 	ClientSessionData localAccountLogin(1:string login, 2:string password)
 		throws (1:TAuthorizationException failure, 2:TInvocationException error),
+
 	// find a user in a given organization by a search term
 	list<UserInfo> findUser(1:Token sessionId, 2:string organizationId, 3:string searchTerm)
 		throws (1:TAuthorizationException failure, 2:TInvocationException error),
+
 	// Get list of publicly available images
 	list<ImagePublishData> getPublicImages(1:Token sessionId, 2:i32 page)
 		throws (1:TAuthorizationException failure, 2:TInvocationException error),
+
 	// Logout
 	void invalidateSession(1: Token sessionId)
 		throws (1:TInvalidTokenException ex),
 
-/*
- * Server (Satellite) calls
- */
+	/*
+	 * Server (Satellite) calls
+	 */
+	 
  	// Verify a user by querying its meta data from the supplied token
 	UserInfo getUserFromToken(1:Token token)
 		throws (1:TInvalidTokenException failure),
+
 	// Check if the server is authenticated
 	bool isServerAuthenticated(1:Token serverSessionId),
+
 	// Start authentication of server for given organization
 	binary startServerAuthentication(1:string organizationId)
 		throws (1: TAuthorizationException failure, 2:TInvocationException error),
+
 	// Reply to master server authentication challenge
 	ServerSessionData serverAuthenticate(1:string organizationId, 2:binary challengeResponse)
 		throws (1:TAuthorizationException failure, 2:TInvocationException errr),
+
+	// Get image information (prior to download)
+	ImagePublishData getImageData(1:Token serverSessionId, 2:UUID imageVersionId)
+		throws (1:TAuthorizationException failure, 2: TInvocationException failure2, 3:TNotFoundException f3),
+
 	// Request upload of an image to the master server
 	TransferInformation submitImage(1:Token serverSessionId, 2:ImagePublishData imageDescription, 3:list<binary> blockHashes)
 		throws (1:TAuthorizationException failure, 2: TInvocationException failure2, 3: TTransferRejectedException failure3),
-	// Request download of an image 
-	TransferInformation getImage(2:Token serverSessionId, 1:UUID imageVersionId)
-		throws (1:TAuthorizationException failure, 2:TInvocationException failure2),
 
 	bool registerSatellite(1:string organizationId, 2:string address, 3:string modulus, 4:string exponent)
 		throws (1:TInvocationException error),
@@ -563,9 +606,14 @@ service MasterServer {
 	bool updateSatelliteAddress(1:Token serverSessionId, 2:string address)
 		throws (1:TAuthorizationException failure, 2:TInvocationException error),
 
-/*
- * Shared calls
- */
+	/*
+	 * Shared calls
+	 */
+
+	// Request download of an image (session id can be a client or a server session)
+	TransferInformation downloadImage(2:Token sessionId, 1:UUID imageVersionId)
+		throws (1:TAuthorizationException failure, 2:TInvocationException failure2, 3:TNotFoundException f3),
+	 
  	// Get list of known organizations with meta data 
 	list<Organization> getOrganizations()
 		throws (1:TInvocationException serverError),