diff --git a/src/host/test/HostHookTest.cc b/src/host/test/HostHookTest.cc
index 406241597e..62361519ef 100644
--- a/src/host/test/HostHookTest.cc
+++ b/src/host/test/HostHookTest.cc
@@ -96,7 +96,7 @@ public:
     {
         string err;
 
-        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "tm_mad", err);
+        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "vnm_mad", "tm_mad", err);
         CPPUNIT_ASSERT( oid >= 0 );
 
         sleep(1);
@@ -114,7 +114,7 @@ public:
     {
         string err;
 
-        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "tm_mad", err);
+        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "vnm_mad", "tm_mad", err);
         CPPUNIT_ASSERT( oid >= 0 );
 
         host = hpool->get(oid, true);
@@ -140,7 +140,7 @@ public:
     {
         string err;
 
-        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "tm_mad", err);
+        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "vnm_mad", "tm_mad", err);
         CPPUNIT_ASSERT( oid >= 0 );
 
         host = hpool->get(oid, true);
@@ -166,7 +166,7 @@ public:
     {
         string err;
 
-        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "tm_mad", err);
+        hpool->allocate(&oid, "host_test", "im_mad", "vmm_mad", "vnm_mad", "tm_mad", err);
         CPPUNIT_ASSERT( oid >= 0 );
 
         host = hpool->get(oid, true);
diff --git a/src/host/test/HostPoolTest.cc b/src/host/test/HostPoolTest.cc
index 2b63af6a50..1dab8f08d5 100644
--- a/src/host/test/HostPoolTest.cc
+++ b/src/host/test/HostPoolTest.cc
@@ -25,6 +25,7 @@ using namespace std;
 
 const string im_mad  = "im_mad";
 const string vmm_mad = "vmm_mad";
+const string vnm_mad = "vnm_mad";
 const string tm_mad  = "tm_mad";
 
 const string names[] = {"Host one", "Second host"};
@@ -32,7 +33,7 @@ const string names[] = {"Host one", "Second host"};
 const string xmls[] =
 {
     "<HOST><ID>0</ID><NAME>Host one</NAME><STATE>0</STATE>"
-    "<IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD>"
+    "<IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD>"
     "<LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHARE>"
     "<DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE>"
     "<MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU>"
@@ -41,7 +42,7 @@ const string xmls[] =
     "<RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST>",
 
     "<HOST><ID>1</ID><NAME>Second host</NAME><STATE>0</STATE>"
-    "<IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD>"
+    "<IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD>"
     "<LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHARE>"
     "<DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE>"
     "<MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU>"
@@ -53,34 +54,34 @@ const string xmls[] =
 // This xml dump result has the LAST_MON_TIMEs modified to 0000000000
 const string xml_dump =
     "<HOST_POOL><HOST><ID>0</ID><NAME>a</NAME><STATE>0</STATE><IM_MAD>im_mad</I"
-    "M_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0"
+    "M_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0"
     "</LAST_MON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM"
     "_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM"
     ">0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_"
     "MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><U"
     "SED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST>"
     "<ID>1</ID><NAME>a name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MA"
-    "D>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_M"
+    "D>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_M"
     "ON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</ME"
     "M_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM>"
     "<MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CP"
     "U>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</U"
     "SED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST><ID>2</ID><N"
     "AME>a_name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</V"
-    "M_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOS"
+    "M_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOS"
     "T_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU"
     "_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</"
     "MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CP"
     "U><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUN"
     "NING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST><ID>3</ID><NAME>another "
     "name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD>"
-    "<TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHAR"
+    "<VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHAR"
     "E><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE"
     ">0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CP"
     "U><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USE"
     "D_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUNNING_V"
     "MS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST><ID>4</ID><NAME>host</NAME><ST"
-    "ATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad"
+    "ATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad"
     "</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHARE>"
     "<DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE>"
     "<MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0"
@@ -90,28 +91,28 @@ const string xml_dump =
 
 const string xml_dump_like_a =
     "<HOST_POOL><HOST><ID>0</ID><NAME>a</NAME><STATE>0</STATE><IM_MAD>im_mad</I"
-    "M_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0"
+    "M_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0"
     "</LAST_MON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM"
     "_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM"
     ">0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_"
     "MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><U"
     "SED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST>"
     "<ID>1</ID><NAME>a name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MA"
-    "D>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_M"
+    "D>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_M"
     "ON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</ME"
     "M_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM>"
     "<MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CP"
     "U>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</U"
     "SED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST><ID>2</ID><N"
     "AME>a_name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</V"
-    "M_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOS"
+    "M_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOS"
     "T_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU"
     "_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</"
     "MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CP"
     "U><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUN"
     "NING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST><HOST><ID>3</ID><NAME>another "
     "name</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD>"
-    "<TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHAR"
+    "<VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHAR"
     "E><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE"
     ">0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CP"
     "U><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USE"
@@ -119,10 +120,10 @@ const string xml_dump_like_a =
     "MS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST></HOST_POOL>";
 
 const string host0_updated =
-    "<HOST><ID>0</ID><NAME>Host one</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE><ATT_A><![CDATA[VALUE_A]]></ATT_A><ATT_B><![CDATA[VALUE_B]]></ATT_B></TEMPLATE></HOST>";
+    "<HOST><ID>0</ID><NAME>Host one</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE><ATT_A><![CDATA[VALUE_A]]></ATT_A><ATT_B><![CDATA[VALUE_B]]></ATT_B></TEMPLATE></HOST>";
 
 const string host_0_cluster =
-    "<HOST><ID>0</ID><NAME>Host one</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><CLUSTER>cluster_a</CLUSTER><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST>";
+    "<HOST><ID>0</ID><NAME>Host one</NAME><STATE>0</STATE><IM_MAD>im_mad</IM_MAD><VM_MAD>vmm_mad</VM_MAD><VN_MAD>vnm_mad</VN_MAD><TM_MAD>tm_mad</TM_MAD><LAST_MON_TIME>0</LAST_MON_TIME><CLUSTER>cluster_a</CLUSTER><HOST_SHARE><DISK_USAGE>0</DISK_USAGE><MEM_USAGE>0</MEM_USAGE><CPU_USAGE>0</CPU_USAGE><MAX_DISK>0</MAX_DISK><MAX_MEM>0</MAX_MEM><MAX_CPU>0</MAX_CPU><FREE_DISK>0</FREE_DISK><FREE_MEM>0</FREE_MEM><FREE_CPU>0</FREE_CPU><USED_DISK>0</USED_DISK><USED_MEM>0</USED_MEM><USED_CPU>0</USED_CPU><RUNNING_VMS>0</RUNNING_VMS></HOST_SHARE><TEMPLATE></TEMPLATE></HOST>";
 /* ************************************************************************* */
 /* ************************************************************************* */
 
@@ -162,7 +163,7 @@ protected:
         int    oid;
         string err;
         return ((HostPool*)pool)->allocate(&oid, names[index], im_mad,
-                                           vmm_mad, tm_mad, err);
+                                           vmm_mad, vnm_mad, tm_mad, err);
     };
 
     void check(int index, PoolObjectSQL* obj)
@@ -184,7 +185,7 @@ protected:
         if( xml_str != xmls[index] )
         {
             cout << endl << xml_str << endl << "========"
-                 << endl << xmls[index];
+                 << endl << xmls[index] << endl;
         }
 //*/
         CPPUNIT_ASSERT( xml_str == xmls[index]);
@@ -242,16 +243,16 @@ public:
 
         // If we try to allocate two hosts with the same name and drivers,
         // should fail
-        rc = hp->allocate(&oid_0, names[0], im_mad, vmm_mad, tm_mad, err);
+        rc = hp->allocate(&oid_0, names[0], im_mad, vmm_mad, vnm_mad, tm_mad, err);
         CPPUNIT_ASSERT( oid_0 == 0 );
         CPPUNIT_ASSERT( rc    == oid_0 );
 
-        rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad, err);
+        rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, vnm_mad, tm_mad, err);
         CPPUNIT_ASSERT( oid_1 == -1 );
         CPPUNIT_ASSERT( rc    == oid_1 );
 
         // the hostname can not be repeated if the drivers change
-        rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, tm_mad_2, err);
+        rc = hp->allocate(&oid_1, names[0], im_mad, vmm_mad, vnm_mad, tm_mad_2, err);
         CPPUNIT_ASSERT( oid_1 == -1 );
         CPPUNIT_ASSERT( rc    == oid_1 );
 
@@ -272,7 +273,7 @@ public:
         for(int i=0; i<5; i++)
         {
             ((HostPool*)pool)->allocate(&oid, names[i],
-                                        im_mad, vmm_mad, tm_mad, err);
+                                        im_mad, vmm_mad, vnm_mad, tm_mad, err);
         }
 
         ostringstream oss;
@@ -287,7 +288,7 @@ public:
         if( result != xml_dump )
         {
             cout << endl << result << endl << "========"
-                 << endl << xml_dump;
+                 << endl << xml_dump << endl;
         }
 //*/
 
@@ -305,7 +306,7 @@ public:
         for(int i=0; i<5; i++)
         {
             ((HostPool*)pool)->allocate(&oid, names[i],
-                                        im_mad, vmm_mad, tm_mad, err);
+                                        im_mad, vmm_mad, vnm_mad, tm_mad, err);
         }
 
 
@@ -321,7 +322,7 @@ public:
         if( result != xml_dump_like_a )
         {
             cout << endl << result << endl << "========"
-                 << endl << xml_dump_like_a;
+                 << endl << xml_dump_like_a << endl;
         }
 //*/
 
@@ -346,7 +347,7 @@ public:
         {
             oss << "host" << i;
 
-            hp->allocate(&oid, oss.str().c_str(), im_mad, vmm_mad, tm_mad, err);
+            hp->allocate(&oid, oss.str().c_str(), im_mad, vmm_mad, vnm_mad, tm_mad, err);
             CPPUNIT_ASSERT(oid == i);
 
             if (i >=8 )
@@ -404,7 +405,7 @@ public:
             {
                 oss << "host" << j;
 
-                hp->allocate(&oid, oss.str().c_str(),im_mad,vmm_mad,tm_mad,err);
+                hp->allocate(&oid, oss.str().c_str(),im_mad,vmm_mad,vnm_mad,tm_mad,err);
             }
 
             the_time2 = time(0) - the_time;
@@ -433,7 +434,7 @@ public:
         for (i=10000,oss.str(""); i<30000 ; i++,oss.str(""))
         {
             oss << "host" << i;
-            hp->allocate(&oid,oss.str().c_str(),im_mad,vmm_mad,tm_mad,err);
+            hp->allocate(&oid,oss.str().c_str(),im_mad,vmm_mad,vnm_mad,tm_mad,err);
 
             host = hp->get(oid, false);
 
diff --git a/src/lcm/test/LifeCycleManagerTest.cc b/src/lcm/test/LifeCycleManagerTest.cc
index c2d4386d2e..2f333133d5 100644
--- a/src/lcm/test/LifeCycleManagerTest.cc
+++ b/src/lcm/test/LifeCycleManagerTest.cc
@@ -47,6 +47,7 @@ const string templates[] =
 static int     hid = 123;
 static string  hostname    = "test_hostname";
 static string  vmm_mad     = "vmm_mad";
+static string  vnm_mad     = "vnm_mad";
 static string  tm_mad      = "tm_mad";
 static string  vmdir       = "vmdir";
 
@@ -225,7 +226,7 @@ private:
 
         vm->lock();
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
 
@@ -489,7 +490,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -573,7 +574,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -594,7 +595,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -615,7 +616,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -637,7 +638,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -661,7 +662,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -685,7 +686,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
 
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -749,7 +750,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
 
@@ -772,7 +773,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
 
@@ -795,7 +796,7 @@ public:
     {
         vm = allocate_running(0);
 
-        vm->add_history(hid,hostname,vmdir,vmm_mad,tm_mad);
+        vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad,tm_mad);
         rc = vmpool->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
 
diff --git a/src/vm/test/VirtualMachinePoolTest.cc b/src/vm/test/VirtualMachinePoolTest.cc
index 5bcd6c1e7d..10f87c22ff 100644
--- a/src/vm/test/VirtualMachinePoolTest.cc
+++ b/src/vm/test/VirtualMachinePoolTest.cc
@@ -302,6 +302,7 @@ public:
         string hostnames[] = {"A_hostname", "B_hostname", "C_hostname"};
         string vm_dirs[]   = {"A_vm_dir", "B_vm_dir", "C_vm_dir"};
         string vmm_mads[]  = {"A_vmm_mad", "B_vmm_mad", "C_vmm_mad"};
+        string vnm_mads[]  = {"A_vnm_mad", "B_vnm_mad", "C_vnm_mad"};
         string tm_mads[]   = {"A_tm_mad", "B_tm_mad", "C_tm_mad"};
 
         int oid, rc;
@@ -324,7 +325,7 @@ public:
         CPPUNIT_ASSERT( vm != 0 );
 
         // Add a history item
-        vm->add_history(0, hostnames[0], vm_dirs[0], vmm_mads[0], tm_mads[0]);
+        vm->add_history(0, hostnames[0], vm_dirs[0], vmm_mads[0], vnm_mads[0], tm_mads[0]);
 
         rc = vmp->update(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -342,7 +343,7 @@ public:
         CPPUNIT_ASSERT( vm != 0 );
 
         // Add a history item
-        vm->add_history(1, hostnames[1], vm_dirs[1], vmm_mads[1], tm_mads[1]);
+        vm->add_history(1, hostnames[1], vm_dirs[1], vmm_mads[1], vnm_mads[1], tm_mads[1]);
 
         rc = vmp->update(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -351,7 +352,7 @@ public:
         CPPUNIT_ASSERT( rc == 0 );
 
         // Add another history item
-        vm->add_history(2, hostnames[2], vm_dirs[2], vmm_mads[2], tm_mads[2]);
+        vm->add_history(2, hostnames[2], vm_dirs[2], vmm_mads[2], vnm_mads[2], tm_mads[2]);
 
         rc = vmp->update(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -408,6 +409,7 @@ public:
         string new_hostname = "new_hostname";
         string vm_dir       = "vm_dir";
         string vmm_mad      = "vm_mad";
+        string vnm_mad      = "vn_mad";
         string tm_mad       = "tm_mad";
 
         // Allocate a VM
@@ -418,7 +420,7 @@ public:
         CPPUNIT_ASSERT( vm != 0 );
 
         // Add a history item
-        vm->add_history(0, hostname, vm_dir, vmm_mad, tm_mad);
+        vm->add_history(0, hostname, vm_dir, vmm_mad, vnm_mad, tm_mad);
 
         rc = vmp->update(vm);
         CPPUNIT_ASSERT( rc == 0 );
@@ -426,7 +428,7 @@ public:
         rc = vmp->update_history(vm);
         CPPUNIT_ASSERT( rc == 0 );
 
-        vm->add_history(0, new_hostname, vm_dir, vmm_mad, tm_mad);
+        vm->add_history(0, new_hostname, vm_dir, vmm_mad, vnm_mad, tm_mad);
 
         rc = vmp->update(vm);
         CPPUNIT_ASSERT( rc == 0 );