diff --git a/share/doc/xsd/api_info.xsd b/share/doc/xsd/api_info.xsd
index b25687364e..b96e5c181c 100644
--- a/share/doc/xsd/api_info.xsd
+++ b/share/doc/xsd/api_info.xsd
@@ -13,7 +13,7 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="POSITION" type="xs:integer"/>
-                    <xs:element name="TYPE" type="xs:string">
+                    <xs:element name="TYPE">
                       <xs:simpleType>
                         <xs:restriction base="xs:string">
                         <xs:enumeration value="IN"/>
@@ -21,7 +21,7 @@
                         </xs:restriction>
                       </xs:simpleType>
                     </xs:element>
-                    <xs:element name="VALUE" type="xs:string"/>
+                    <xs:element name="VALUE" type="xs:anyType"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
diff --git a/share/doc/xsd/hook_message_api.xsd b/share/doc/xsd/hook_message_api.xsd
index 0d5cc22309..644862c49f 100644
--- a/share/doc/xsd/hook_message_api.xsd
+++ b/share/doc/xsd/hook_message_api.xsd
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="api_info.xsd"/>
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>
       <xs:sequence>
diff --git a/share/doc/xsd/hook_message_retry.xsd b/share/doc/xsd/hook_message_retry.xsd
index 82a4f66b42..1d3479ed5d 100644
--- a/share/doc/xsd/hook_message_retry.xsd
+++ b/share/doc/xsd/hook_message_retry.xsd
@@ -1,5 +1,5 @@
-<!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This schema is followed by the EVENT API message sent by the Hook Manager   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>
diff --git a/share/doc/xsd/hook_message_state.xsd b/share/doc/xsd/hook_message_state.xsd
index 54ab82d241..cfc1630475 100644
--- a/share/doc/xsd/hook_message_state.xsd
+++ b/share/doc/xsd/hook_message_state.xsd
@@ -1,11 +1,15 @@
-<!-- This schema is followd by the EVENT API message sent by the Hook Manager   -->
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This schema is followed by the EVENT API message sent by the Hook Manager   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="host.xsd"/>
+  <xs:include schemaLocation="vm.xsd"/>
+  <xs:include schemaLocation="image.xsd"/>
+  <xs:include schemaLocation="vnet.xsd"/>
   <xs:element name="HOOK_MESSAGE">
     <xs:complexType>
       <xs:sequence>
         <xs:element name="HOOK_TYPE" type="xs:string" fixed="STATE"/>
-        <xs:element name="HOOK_OBJECT" type="xs:string">
+        <xs:element name="HOOK_OBJECT">
           <xs:simpleType>
             <xs:restriction base="xs:string">
             <xs:enumeration value="VM"/>
@@ -17,6 +21,7 @@
         </xs:element>
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="RESOURCE_ID" type="xs:integer"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
          <!-- The template of the resource (VM, Host, Image or VNet) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>
diff --git a/share/doc/xsd/zone_pool.xsd b/share/doc/xsd/zone_pool.xsd
index 2781210b81..900c04dbe0 100644
--- a/share/doc/xsd/zone_pool.xsd
+++ b/share/doc/xsd/zone_pool.xsd
@@ -2,36 +2,40 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
   targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
   <xs:element name="ZONE_POOL">
-    <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
-      <xs:complexType>
-        <xs:sequence>
-          <xs:element name="ID" type="xs:integer"/>
-          <xs:element name="NAME" type="xs:string"/>
-          <xs:element name="STATE" type="xs:integer"/>
-          <xs:element name="TEMPLATE">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="ENDPOINT" type="xs:string"/>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="SERVER_POOL">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
-                  <xs:complexType>
-                    <xs:sequence>
-                      <xs:element name="ENDPOINT" type="xs:string"/>
-                      <xs:element name="ID" type="xs:integer"/>
-                      <xs:element name="NAME" type="xs:string"/>
-                    </xs:sequence>
-                  </xs:complexType>
-                </xs:element>
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:sequence>
-      </xs:complexType>
-    </xs:element>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="NAME" type="xs:string"/>
+              <xs:element name="STATE" type="xs:integer"/>
+              <xs:element name="TEMPLATE">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ENDPOINT" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="SERVER_POOL">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="SERVER" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ENDPOINT" type="xs:string"/>
+                          <xs:element name="ID" type="xs:integer"/>
+                          <xs:element name="NAME" type="xs:string"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
   </xs:element>
 </xs:schema>