diff --git a/api/src/com/cloud/agent/api/Command.java b/api/src/com/cloud/agent/api/Command.java
index dee62e7a610..36944f4f01b 100755
--- a/api/src/com/cloud/agent/api/Command.java
+++ b/api/src/com/cloud/agent/api/Command.java
@@ -17,6 +17,9 @@
  */
 package com.cloud.agent.api;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Command is a command that is sent between the management agent and management
@@ -29,6 +32,9 @@ package com.cloud.agent.api;
  */
 public abstract class Command {
 
+	 // allow command to carry over hypervisor or other environment related context info 
+    protected Map<String, String> contextMap = new HashMap<String, String>();
+	
     protected Command() {
     }
     
@@ -42,4 +48,12 @@ public abstract class Command {
     public boolean logTrace() {
         return false;
     }
+    
+    public void setContextParam(String name, String value) {
+        contextMap.put(name, value);
+    }
+
+    public String getContextParam(String name) {
+        return contextMap.get(name);
+    }
 }