diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java
index 60989a863c2..7984eed99ed 100644
--- a/server/src/com/cloud/api/commands/AddHostCmd.java
+++ b/server/src/com/cloud/api/commands/AddHostCmd.java
@@ -30,7 +30,13 @@ public class AddHostCmd extends AddHostOrStorageCmd {
     public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
     private static final String s_name = "addhostresponse";
     
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
     
+    public String getName() {
+    	return s_name;
+    }
     /*
     @Override
     public List<Pair<String, Object>> execute(Map<String, Object> params)
diff --git a/server/src/com/cloud/api/commands/AddHostOrStorageCmd.java b/server/src/com/cloud/api/commands/AddHostOrStorageCmd.java
index 78d6150a17c..5b5ba5a38b3 100644
--- a/server/src/com/cloud/api/commands/AddHostOrStorageCmd.java
+++ b/server/src/com/cloud/api/commands/AddHostOrStorageCmd.java
@@ -28,7 +28,6 @@ import com.cloud.api.Parameter;
 @Implementation(method="discoverHosts", manager=Manager.AgentManager)
 public abstract class AddHostOrStorageCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddHostOrStorageCmd.class.getName());
-    private static final String s_name = "addhostorstorageresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -87,16 +86,5 @@ public abstract class AddHostOrStorageCmd extends BaseCmd {
     public Long getZoneId() {
         return zoneId;
     }
-
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getName() {
-    	return s_name;
-    }
-
  
 }
diff --git a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
index 7c80398eb0f..44b5aca840e 100644
--- a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
+++ b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
@@ -54,6 +54,15 @@ public class AddSecondaryStorageCmd extends AddHostOrStorageCmd {
     public String getUsername() {
         return null;
     }
+    
+    
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+    
+    public String getName() {
+    	return s_name;
+    }
 
     /*
     @Override
diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java
index d8fa209c042..48e9eb648eb 100644
--- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java
+++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java
@@ -40,6 +40,16 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd {
     
     public String getFormat() {
         return null;
+    }
+    
+    
+    /////////////////////////////////////////////////////
+    /////////////// API Implementation///////////////////
+    /////////////////////////////////////////////////////
+
+    @Override
+    public String getName() {
+        return s_name;
     }
 
 //    @Override
diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java
index a046c5d04c6..d5321d06e72 100644
--- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java
+++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java
@@ -28,7 +28,6 @@ import com.cloud.api.Parameter;
 @Implementation(method="updateTemplate", manager=Manager.ManagementServer)
 public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
-    private static final String s_name = "updatetemplateorisoresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -48,6 +47,12 @@ public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
 
     @Parameter(name="ostypeid", type=CommandType.LONG)
     private Long osTypeId;
+    
+    @Parameter(name="format", type=CommandType.STRING)
+    private String format;
+    
+    @Parameter(name="passwordenabled", type=CommandType.BOOLEAN)
+    private Boolean passwordEnabled;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -72,14 +77,13 @@ public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
     public Long getOsTypeId() {
         return osTypeId;
     }
-
-    /////////////////////////////////////////////////////
-    /////////////// API Implementation///////////////////
-    /////////////////////////////////////////////////////
-
-    @Override
-    public String getName() {
-        return s_name;
+    
+    public Boolean isPasswordEnabled() {
+        return passwordEnabled;
+    }
+    
+    public String getFormat() {
+        return format;
     }
 
 }