diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 69bd415267..9e3892da1c 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -385,7 +385,7 @@ Pandora_Windows_Service::getXmlHeader () {
 	agent_name_cmd = conf->getValue ("agent_name_cmd");
 	if (agent_name_cmd != "") {
 		agent_name_cmd = "cmd.exe /c \"" + agent_name_cmd + "\"";
-		static string temp_agent_name = getCoordinatesFromCmdExec(agent_name_cmd);
+		static string temp_agent_name = getAgentNameFromCmdExec(agent_name_cmd);
 		// Delete carriage return if is provided
 		pos = temp_agent_name.find("\n");
 		if(pos != string::npos) {
@@ -536,7 +536,7 @@ Pandora_Windows_Service::getXmlHeader () {
 }
 
 string
-Pandora_Windows_Service::getCoordinatesFromCmdExec (string cmd_exec)
+Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
 {
 	PROCESS_INFORMATION pi;
 	STARTUPINFO         si;	
@@ -546,7 +546,6 @@ Pandora_Windows_Service::getCoordinatesFromCmdExec (string cmd_exec)
 	HANDLE              out, new_stdout, out_read, job;
 	string              working_dir;
 	string output = "";
-	int timeout = 500;
 		
 	/* Set the bInheritHandle flag so pipe handles are inherited. */
 	attributes.nLength = sizeof (SECURITY_ATTRIBUTES); 
@@ -660,6 +659,18 @@ Pandora_Windows_Service::getCoordinatesFromCmdExec (string cmd_exec)
 	return output;
 }
 
+string
+Pandora_Windows_Service::getAgentNameFromCmdExec (string cmd_exec)
+{
+	return getValueFromCmdExec(cmd_exec, 10000);
+}
+
+string
+Pandora_Windows_Service::getCoordinatesFromCmdExec (string cmd_exec)
+{
+	return getValueFromCmdExec(cmd_exec, 500);
+}
+
 int
 Pandora_Windows_Service::copyTentacleDataFile (string host,
 					       string filename,
diff --git a/pandora_agents/win32/pandora_windows_service.h b/pandora_agents/win32/pandora_windows_service.h
index 16d02ab433..c64152dd0f 100644
--- a/pandora_agents/win32/pandora_windows_service.h
+++ b/pandora_agents/win32/pandora_windows_service.h
@@ -53,6 +53,8 @@ namespace Pandora {
 		
 		string        getXmlHeader    ();
 		int           copyDataFile    (string filename);
+		string        getValueFromCmdExec (string cmd_exec, int timeout);
+		string        getAgentNameFromCmdExec (string cmd_exec);
 		string        getCoordinatesFromCmdExec (string cmd_exec);
 		int           copyTentacleDataFile (string host,
 						     string filename,