diff --git a/share/doc/xsd/acct.xsd b/share/doc/xsd/acct.xsd
index 16cf56fa98..d4fd284589 100644
--- a/share/doc/xsd/acct.xsd
+++ b/share/doc/xsd/acct.xsd
@@ -78,7 +78,9 @@
           MONITOR_ACTION          = 44
         -->
         <xs:element name="ACTION" type="xs:integer"/>
-
+        <xs:element name="UID" type="xs:integer"/>
+        <xs:element name="GID" type="xs:integer"/>
+        <xs:element name="REQUEST_ID" type="xs:string"/>
         <xs:element name="VM">
           <xs:complexType>
             <xs:sequence>
diff --git a/share/doc/xsd/host.xsd b/share/doc/xsd/host.xsd
index 7bf1d449ae..79ff68a584 100644
--- a/share/doc/xsd/host.xsd
+++ b/share/doc/xsd/host.xsd
@@ -31,6 +31,8 @@
               <!-- ^^ KB, Usage of MEMORY calculated by ONE as the summatory MEMORY requested by all VMs running in the host   -->
               <xs:element name="CPU_USAGE" type="xs:integer"/>
               <!-- ^^ Percentage, Usage of CPU calculated by ONE as the summatory CPU requested by all VMs running in the host   -->
+              <xs:element name="TOTAL_MEM" type="xs:integer"/>
+              <xs:element name="TOTAL_CPU" type="xs:integer"/>
               <xs:element name="MAX_DISK" type="xs:integer"/>
               <xs:element name="MAX_MEM" type="xs:integer"/>
               <!-- ^^ KB, Total memory in the host   -->
@@ -46,6 +48,8 @@
               <!-- ^^ KB, Memory used by all host processes (including VMs) over a total of MAX_MEM   -->
               <xs:element name="USED_CPU" type="xs:integer"/>
               <!-- ^^ Percentage of CPU used by all host processes (including VMs) over a total of # cores * 100   -->
+
+
               <xs:element name="RUNNING_VMS" type="xs:integer"/>
               <xs:element name="DATASTORES">
                 <xs:complexType>
diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd
index abcff11517..2f574edab6 100644
--- a/share/doc/xsd/image.xsd
+++ b/share/doc/xsd/image.xsd
@@ -78,6 +78,7 @@
         <xs:element name="SNAPSHOTS">
           <xs:complexType>
             <xs:sequence>
+              <xs:element name="ALLOW_ORPHANS" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
diff --git a/share/doc/xsd/test.sh b/share/doc/xsd/test.sh
index ac23f4a5f2..eb43c78655 100755
--- a/share/doc/xsd/test.sh
+++ b/share/doc/xsd/test.sh
@@ -41,6 +41,9 @@ onehost create host01 --im dummy --vm dummy
 onehost create host02 --im dummy --vm dummy
 onehost create host03 --im dummy --vm dummy
 
+#Wait to monitor hosts
+sleep 30
+
 onecluster addhost newcluster host03
 
 for i in `onehost list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 93b6c0df03..69ae7abfc7 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -72,9 +72,6 @@
                   <xs:sequence>
                     <xs:element name="OID" type="xs:integer"/>
                     <xs:element name="SEQ" type="xs:integer"/>
-                    <xs:element name="UID" type="xs:integer"/>
-                    <xs:element name="GID" type="xs:integer"/>
-                    <xs:element name="REQUEST_ID" type="xs:string"/>
                     <xs:element name="HOSTNAME" type="xs:string"/>
                     <xs:element name="HID" type="xs:integer"/>
                     <xs:element name="CID" type="xs:integer"/>
@@ -138,6 +135,9 @@
                       MONITOR_ACTION          = 44
                     -->
                     <xs:element name="ACTION" type="xs:integer"/>
+                    <xs:element name="UID" type="xs:integer"/>
+                    <xs:element name="GID" type="xs:integer"/>
+                    <xs:element name="REQUEST_ID" type="xs:string"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>