diff --git a/share/doc/xsd/image.xsd b/share/doc/xsd/image.xsd
index 207cee1bd0..d0e8143950 100644
--- a/share/doc/xsd/image.xsd
+++ b/share/doc/xsd/image.xsd
@@ -9,8 +9,22 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OWNER_U" type="xs:integer"/>
+              <xs:element name="OWNER_M" type="xs:integer"/>
+              <xs:element name="OWNER_A" type="xs:integer"/>
+              <xs:element name="GROUP_U" type="xs:integer"/>
+              <xs:element name="GROUP_M" type="xs:integer"/>
+              <xs:element name="GROUP_A" type="xs:integer"/>
+              <xs:element name="OTHER_U" type="xs:integer"/>
+              <xs:element name="OTHER_M" type="xs:integer"/>
+              <xs:element name="OTHER_A" type="xs:integer"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="TYPE" type="xs:integer"/>
-        <xs:element name="PUBLIC" type="xs:integer"/>
         <xs:element name="PERSISTENT" type="xs:integer"/>
         <xs:element name="REGTIME" type="xs:integer"/>
         <xs:element name="SOURCE" type="xs:string"/>
diff --git a/share/doc/xsd/samples/group/1.xml b/share/doc/xsd/samples/group/1.xml
deleted file mode 100644
index 35813b2430..0000000000
--- a/share/doc/xsd/samples/group/1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<GROUP xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../group.xsd">
-  <ID>1</ID>
-  <NAME>users</NAME>
-  <USERS>
-    <ID>2</ID>
-    <ID>3</ID>
-    <ID>4</ID>
-    <ID>5</ID>
-  </USERS>
-</GROUP>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/group/2.xml b/share/doc/xsd/samples/group/2.xml
deleted file mode 100644
index 83ec0ed02b..0000000000
--- a/share/doc/xsd/samples/group/2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<GROUP xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../group.xsd">
-  <ID>100</ID>
-  <NAME>new</NAME>
-  <USERS/>
-</GROUP>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/group_pool/1.xml b/share/doc/xsd/samples/group_pool/1.xml
deleted file mode 100644
index 4c99b3289c..0000000000
--- a/share/doc/xsd/samples/group_pool/1.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<GROUP_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../group.xsd">
-  <GROUP>
-    <ID>0</ID>
-    <NAME>oneadmin</NAME>
-    <USERS>
-      <ID>0</ID>
-      <ID>1</ID>
-    </USERS>
-  </GROUP>
-  <GROUP>
-    <ID>1</ID>
-    <NAME>users</NAME>
-    <USERS>
-      <ID>2</ID>
-      <ID>3</ID>
-      <ID>4</ID>
-      <ID>5</ID>
-    </USERS>
-  </GROUP>
-  <GROUP>
-    <ID>100</ID>
-    <NAME>new</NAME>
-    <USERS/>
-  </GROUP>
-  <GROUP>
-    <ID>101</ID>
-    <NAME>test</NAME>
-    <USERS/>
-  </GROUP>
-  <GROUP>
-    <ID>102</ID>
-    <NAME>abc</NAME>
-    <USERS/>
-  </GROUP>
-</GROUP_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/host/1.xml b/share/doc/xsd/samples/host/1.xml
deleted file mode 100644
index 400cdf25f7..0000000000
--- a/share/doc/xsd/samples/host/1.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<HOST xmlns="http://opennebula.org/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image.xsd">
-  <ID>0</ID>
-  <NAME>localhost</NAME>
-  <STATE>3</STATE>
-  <IM_MAD>im_dummy</IM_MAD>
-  <VM_MAD>vmm_dummy</VM_MAD>
-  <VN_MAD>fw</VN_MAD>
-  <TM_MAD>tm_shared</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/>
-</HOST>
diff --git a/share/doc/xsd/samples/host/2.xml b/share/doc/xsd/samples/host/2.xml
deleted file mode 100644
index bd9e6c6de0..0000000000
--- a/share/doc/xsd/samples/host/2.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<HOST xmlns="http://opennebula.org/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image.xsd">
-  <ID>0</ID>
-  <NAME>localhost</NAME>
-  <STATE>3</STATE>
-  <IM_MAD>im_dummy</IM_MAD>
-  <VM_MAD>vmm_dummy</VM_MAD>
-  <VN_MAD>fw</VN_MAD>
-  <TM_MAD>tm_shared</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/>
-</HOST>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/host/3.xml b/share/doc/xsd/samples/host/3.xml
deleted file mode 100644
index c8585496a2..0000000000
--- a/share/doc/xsd/samples/host/3.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<HOST xmlns="http://opennebula.org/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image.xsd">
-  <ID>0</ID>
-  <NAME>localhost</NAME>
-  <STATE>2</STATE>
-  <IM_MAD>im_dummy</IM_MAD>
-  <VM_MAD>vmm_dummy</VM_MAD>
-  <VN_MAD>fw</VN_MAD>
-  <TM_MAD>tm_shared</TM_MAD>
-  <LAST_MON_TIME>1324039779</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>16777216</MAX_MEM>
-    <MAX_CPU>800</MAX_CPU>
-    <FREE_DISK>0</FREE_DISK>
-    <FREE_MEM>16777216</FREE_MEM>
-    <FREE_CPU>800</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>
-    <CPUSPEED><![CDATA[2.2GHz]]></CPUSPEED>
-    <FREECPU><![CDATA[800]]></FREECPU>
-    <FREEMEMORY><![CDATA[16777216]]></FREEMEMORY>
-    <HOSTNAME><![CDATA[localhost]]></HOSTNAME>
-    <HYPERVISOR><![CDATA[dummy]]></HYPERVISOR>
-    <TEST><![CDATA[TEST]]></TEST>
-    <TOTALCPU><![CDATA[800]]></TOTALCPU>
-    <TOTALMEMORY><![CDATA[16777216]]></TOTALMEMORY>
-    <USEDCPU><![CDATA[0]]></USEDCPU>
-    <USEDMEMORY><![CDATA[0]]></USEDMEMORY>
-  </TEMPLATE>
-</HOST>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/host_pool/1.xml b/share/doc/xsd/samples/host_pool/1.xml
deleted file mode 100644
index 066566a08f..0000000000
--- a/share/doc/xsd/samples/host_pool/1.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<HOST_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../host_pool.xsd">
-  <HOST>
-    <ID>0</ID>
-    <NAME>localhost</NAME>
-    <STATE>2</STATE>
-    <IM_MAD>im_dummy</IM_MAD>
-    <VM_MAD>vmm_dummy</VM_MAD>
-    <VN_MAD>fw</VN_MAD>
-    <TM_MAD>tm_shared</TM_MAD>
-    <LAST_MON_TIME>1324048185</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>16777216</MAX_MEM>
-      <MAX_CPU>800</MAX_CPU>
-      <FREE_DISK>0</FREE_DISK>
-      <FREE_MEM>16777216</FREE_MEM>
-      <FREE_CPU>800</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>
-      <CPUSPEED><![CDATA[2.2GHz]]></CPUSPEED>
-      <FREECPU><![CDATA[800]]></FREECPU>
-      <FREEMEMORY><![CDATA[16777216]]></FREEMEMORY>
-      <HOSTNAME><![CDATA[localhost]]></HOSTNAME>
-      <HYPERVISOR><![CDATA[dummy]]></HYPERVISOR>
-      <TEST><![CDATA[TEST]]></TEST>
-      <TOTALCPU><![CDATA[800]]></TOTALCPU>
-      <TOTALMEMORY><![CDATA[16777216]]></TOTALMEMORY>
-      <USEDCPU><![CDATA[0]]></USEDCPU>
-      <USEDMEMORY><![CDATA[0]]></USEDMEMORY>
-    </TEMPLATE>
-  </HOST>
-</HOST_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/host_pool/2.xml b/share/doc/xsd/samples/host_pool/2.xml
deleted file mode 100644
index b946372d3e..0000000000
--- a/share/doc/xsd/samples/host_pool/2.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<HOST_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../host_pool.xsd">
-  <HOST>
-    <ID>0</ID>
-    <NAME>localhost</NAME>
-    <STATE>2</STATE>
-    <IM_MAD>im_dummy</IM_MAD>
-    <VM_MAD>vmm_dummy</VM_MAD>
-    <VN_MAD>fw</VN_MAD>
-    <TM_MAD>tm_shared</TM_MAD>
-    <LAST_MON_TIME>1324048436</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>16777216</MAX_MEM>
-      <MAX_CPU>800</MAX_CPU>
-      <FREE_DISK>0</FREE_DISK>
-      <FREE_MEM>16777216</FREE_MEM>
-      <FREE_CPU>800</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>
-      <CPUSPEED><![CDATA[2.2GHz]]></CPUSPEED>
-      <FREECPU><![CDATA[800]]></FREECPU>
-      <FREEMEMORY><![CDATA[16777216]]></FREEMEMORY>
-      <HOSTNAME><![CDATA[localhost]]></HOSTNAME>
-      <HYPERVISOR><![CDATA[dummy]]></HYPERVISOR>
-      <TEST><![CDATA[TEST]]></TEST>
-      <TOTALCPU><![CDATA[800]]></TOTALCPU>
-      <TOTALMEMORY><![CDATA[16777216]]></TOTALMEMORY>
-      <USEDCPU><![CDATA[0]]></USEDCPU>
-      <USEDMEMORY><![CDATA[0]]></USEDMEMORY>
-    </TEMPLATE>
-  </HOST>
-  <HOST>
-    <ID>1</ID>
-    <NAME>vm</NAME>
-    <STATE>0</STATE>
-    <IM_MAD>im_dummy</IM_MAD>
-    <VM_MAD>vmm_dummy</VM_MAD>
-    <VN_MAD>fw</VN_MAD>
-    <TM_MAD>tm_shared</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/>
-  </HOST>
-</HOST_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/host_pool/3.xml b/share/doc/xsd/samples/host_pool/3.xml
deleted file mode 100644
index dbfde4e3db..0000000000
--- a/share/doc/xsd/samples/host_pool/3.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<HOST_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../host_pool.xsd"/>
diff --git a/share/doc/xsd/samples/image/1.xml b/share/doc/xsd/samples/image/1.xml
deleted file mode 100644
index 5b05a09c6d..0000000000
--- a/share/doc/xsd/samples/image/1.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<IMAGE xmlns="http://opennebula.org/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>Ubuntu Desktop</NAME>
-  <TYPE>0</TYPE>
-  <PUBLIC>1</PUBLIC>
-  <PERSISTENT>0</PERSISTENT>
-  <REGTIME>1324047583</REGTIME>
-  <SOURCE>/var/lib/one/images/590815350477644ac13f7800f6a6789c</SOURCE>
-  <PATH>/boot/initrd.img-2.6.32-34-generic</PATH>
-  <FSTYPE/>
-  <SIZE>8</SIZE>
-  <STATE>1</STATE>
-  <RUNNING_VMS>0</RUNNING_VMS>
-  <TEMPLATE>
-    <DESCRIPTION><![CDATA[Ubuntu 10.04 desktop for students.]]></DESCRIPTION>
-    <DEV_PREFIX><![CDATA[hd]]></DEV_PREFIX>
-  </TEMPLATE>
-</IMAGE>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/image/2.xml b/share/doc/xsd/samples/image/2.xml
deleted file mode 100644
index 944fd39108..0000000000
--- a/share/doc/xsd/samples/image/2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<IMAGE xmlns="http://opennebula.org/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image.xsd">
-  <ID>1</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>Experiment results</NAME>
-  <TYPE>2</TYPE>
-  <PUBLIC>0</PUBLIC>
-  <PERSISTENT>0</PERSISTENT>
-  <REGTIME>1324048803</REGTIME>
-  <SOURCE>/var/lib/one/images/5a785bd223a970ec3536733514f2c3db</SOURCE>
-  <PATH/>
-  <FSTYPE>ext3</FSTYPE>
-  <SIZE>30</SIZE>
-  <STATE>1</STATE>
-  <RUNNING_VMS>0</RUNNING_VMS>
-  <TEMPLATE>
-    <DEV_PREFIX><![CDATA[hd]]></DEV_PREFIX>
-  </TEMPLATE>
-</IMAGE>
diff --git a/share/doc/xsd/samples/image_pool/1.xml b/share/doc/xsd/samples/image_pool/1.xml
deleted file mode 100644
index d3a901b549..0000000000
--- a/share/doc/xsd/samples/image_pool/1.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<IMAGE_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image_pool.xsd"/>
diff --git a/share/doc/xsd/samples/image_pool/2.xml b/share/doc/xsd/samples/image_pool/2.xml
deleted file mode 100644
index 6975228bea..0000000000
--- a/share/doc/xsd/samples/image_pool/2.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<IMAGE_POOL xmlns="http://opennebula.org/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image_pool.xsd">
-  <IMAGE>
-    <ID>0</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>Ubuntu Desktop</NAME>
-    <TYPE>0</TYPE>
-    <PUBLIC>1</PUBLIC>
-    <PERSISTENT>0</PERSISTENT>
-    <REGTIME>1324047583</REGTIME>
-    <SOURCE>/var/lib/one/images/590815350477644ac13f7800f6a6789c</SOURCE>
-    <PATH>/boot/initrd.img-2.6.32-34-generic</PATH>
-    <FSTYPE/>
-    <SIZE>8</SIZE>
-    <STATE>1</STATE>
-    <RUNNING_VMS>0</RUNNING_VMS>
-    <TEMPLATE>
-      <DESCRIPTION><![CDATA[Ubuntu 10.04 desktop for students.]]></DESCRIPTION>
-      <DEV_PREFIX><![CDATA[hd]]></DEV_PREFIX>
-    </TEMPLATE>
-  </IMAGE>
-  <IMAGE>
-    <ID>1</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>Experiment results</NAME>
-    <TYPE>2</TYPE>
-    <PUBLIC>0</PUBLIC>
-    <PERSISTENT>0</PERSISTENT>
-    <REGTIME>1324048803</REGTIME>
-    <SOURCE>/var/lib/one/images/5a785bd223a970ec3536733514f2c3db</SOURCE>
-    <PATH/>
-    <FSTYPE>ext3</FSTYPE>
-    <SIZE>30</SIZE>
-    <STATE>1</STATE>
-    <RUNNING_VMS>0</RUNNING_VMS>
-    <TEMPLATE>
-      <DEV_PREFIX><![CDATA[hd]]></DEV_PREFIX>
-    </TEMPLATE>
-  </IMAGE>
-</IMAGE_POOL>
diff --git a/share/doc/xsd/samples/image_pool/3.xml b/share/doc/xsd/samples/image_pool/3.xml
deleted file mode 100644
index 01fb4ba810..0000000000
--- a/share/doc/xsd/samples/image_pool/3.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<IMAGE_POOL xmlns="http://opennebula.org/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://opennebula.org/XMLSchema ../../image_pool.xsd">
-  <IMAGE>
-    <ID>1</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>Experiment results</NAME>
-    <TYPE>2</TYPE>
-    <PUBLIC>0</PUBLIC>
-    <PERSISTENT>0</PERSISTENT>
-    <REGTIME>1324048803</REGTIME>
-    <SOURCE>/var/lib/one/images/5a785bd223a970ec3536733514f2c3db</SOURCE>
-    <PATH/>
-    <FSTYPE>ext3</FSTYPE>
-    <SIZE>30</SIZE>
-    <STATE>1</STATE>
-    <RUNNING_VMS>0</RUNNING_VMS>
-    <TEMPLATE>
-      <DEV_PREFIX><![CDATA[hd]]></DEV_PREFIX>
-    </TEMPLATE>
-  </IMAGE>
-</IMAGE_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/template/1.xml b/share/doc/xsd/samples/template/1.xml
deleted file mode 100644
index b580fb7d30..0000000000
--- a/share/doc/xsd/samples/template/1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<VMTEMPLATE xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../template.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>vm-example</NAME>
-  <PUBLIC>0</PUBLIC>
-  <REGTIME>1324050180</REGTIME>
-  <TEMPLATE>
-    <NAME><![CDATA[vm-example]]></NAME>
-    <TEMPLATE_ID><![CDATA[0]]></TEMPLATE_ID>
-  </TEMPLATE>
-</VMTEMPLATE>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/template/2.xml b/share/doc/xsd/samples/template/2.xml
deleted file mode 100644
index 48d50ce786..0000000000
--- a/share/doc/xsd/samples/template/2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<VMTEMPLATE xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../template.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>vm-example</NAME>
-  <PUBLIC>0</PUBLIC>
-  <REGTIME>1324050180</REGTIME>
-  <TEMPLATE>
-    <NEW_ATT><![CDATA[NEW]]></NEW_ATT>
-    <NEW_NUM><![CDATA[123]]></NEW_NUM>
-  </TEMPLATE>
-</VMTEMPLATE>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/template/3.xml b/share/doc/xsd/samples/template/3.xml
deleted file mode 100644
index 7ef2ba5e1b..0000000000
--- a/share/doc/xsd/samples/template/3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<VMTEMPLATE xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../template.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>vm-example</NAME>
-  <PUBLIC>0</PUBLIC>
-  <REGTIME>1324050180</REGTIME>
-  <TEMPLATE/>
-</VMTEMPLATE>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/template_pool/1.xml b/share/doc/xsd/samples/template_pool/1.xml
deleted file mode 100644
index 70a1e1f8e4..0000000000
--- a/share/doc/xsd/samples/template_pool/1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<VMTEMPLATE_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../template_pool.xsd">
-  <VMTEMPLATE>
-    <ID>0</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>vm-example</NAME>
-    <PUBLIC>0</PUBLIC>
-    <REGTIME>1324050180</REGTIME>
-    <TEMPLATE>
-      <NEW_ATT><![CDATA[NEW]]></NEW_ATT>
-      <NEW_NUM><![CDATA[123]]></NEW_NUM>
-    </TEMPLATE>
-  </VMTEMPLATE>
-  <VMTEMPLATE>
-    <ID>1</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>ONE</NAME>
-    <PUBLIC>0</PUBLIC>
-    <REGTIME>1324050461</REGTIME>
-    <TEMPLATE>
-      <DISK>
-        <IMAGE_ID><![CDATA[0]]></IMAGE_ID>
-      </DISK>
-      <NAME><![CDATA[ONE]]></NAME>
-      <TEMPLATE_ID><![CDATA[1]]></TEMPLATE_ID>
-    </TEMPLATE>
-  </VMTEMPLATE>
-</VMTEMPLATE_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/template_pool/2.xml b/share/doc/xsd/samples/template_pool/2.xml
deleted file mode 100644
index 32f50bfe47..0000000000
--- a/share/doc/xsd/samples/template_pool/2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<VMTEMPLATE_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../template_pool.xsd"/>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/user/1.xml b/share/doc/xsd/samples/user/1.xml
deleted file mode 100644
index 84944f9291..0000000000
--- a/share/doc/xsd/samples/user/1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<USER xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../user.xsd">
-  <ID>1</ID>
-  <GID>0</GID>
-  <GNAME>oneadmin</GNAME>
-  <NAME>serveradmin</NAME>
-  <PASSWORD>f72281eda1b97393f46041288b0baea528483b51</PASSWORD>
-  <AUTH_DRIVER>server_cipher</AUTH_DRIVER>
-  <ENABLED>1</ENABLED>
-  <TEMPLATE/>
-</USER>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/user/2.xml b/share/doc/xsd/samples/user/2.xml
deleted file mode 100644
index 526c0f0edb..0000000000
--- a/share/doc/xsd/samples/user/2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<USER xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../user.xsd">
-  <ID>2</ID>
-  <GID>1</GID>
-  <GNAME>users</GNAME>
-  <NAME>abc</NAME>
-  <PASSWORD>a9993e364706816aba3e25717850c26c9cd0d89d</PASSWORD>
-  <AUTH_DRIVER>core</AUTH_DRIVER>
-  <ENABLED>1</ENABLED>
-  <TEMPLATE/>
-</USER>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/user/3.xml b/share/doc/xsd/samples/user/3.xml
deleted file mode 100644
index bdaf7f43e3..0000000000
--- a/share/doc/xsd/samples/user/3.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<USER xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../user.xsd">
-  <ID>3</ID>
-  <GID>1</GID>
-  <GNAME>users</GNAME>
-  <NAME>1234</NAME>
-  <PASSWORD>7110eda4d09e062aa5e4a390b0a572ac0d2c0220</PASSWORD>
-  <AUTH_DRIVER>core</AUTH_DRIVER>
-  <ENABLED>1</ENABLED>
-  <TEMPLATE>
-    <ATT><![CDATA[OTHER VALUE]]></ATT>
-    <COMPLEX>
-      <ATT1><![CDATA[VAL1]]></ATT1>
-      <ATT2><![CDATA[VAL2]]></ATT2>
-      <NUM3><![CDATA[3]]></NUM3>
-    </COMPLEX>
-    <EXTRA><![CDATA[VALUE]]></EXTRA>
-    <NUM><![CDATA[123]]></NUM>
-  </TEMPLATE>
-</USER>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/user_pool/1.xml b/share/doc/xsd/samples/user_pool/1.xml
deleted file mode 100644
index 86c5335373..0000000000
--- a/share/doc/xsd/samples/user_pool/1.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<USER_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../user_pool.xsd">
-  <USER>
-    <ID>0</ID>
-    <GID>0</GID>
-    <GNAME>oneadmin</GNAME>
-    <NAME>oneadmin</NAME>
-    <PASSWORD>f72281eda1b97393f46041288b0baea528483b51</PASSWORD>
-    <AUTH_DRIVER>core</AUTH_DRIVER>
-    <ENABLED>1</ENABLED>
-    <TEMPLATE/>
-  </USER>
-  <USER>
-    <ID>1</ID>
-    <GID>0</GID>
-    <GNAME>oneadmin</GNAME>
-    <NAME>serveradmin</NAME>
-    <PASSWORD>f72281eda1b97393f46041288b0baea528483b51</PASSWORD>
-    <AUTH_DRIVER>server_cipher</AUTH_DRIVER>
-    <ENABLED>1</ENABLED>
-    <TEMPLATE/>
-  </USER>
-  <USER>
-    <ID>2</ID>
-    <GID>1</GID>
-    <GNAME>users</GNAME>
-    <NAME>abc</NAME>
-    <PASSWORD>a9993e364706816aba3e25717850c26c9cd0d89d</PASSWORD>
-    <AUTH_DRIVER>core</AUTH_DRIVER>
-    <ENABLED>1</ENABLED>
-    <TEMPLATE/>
-  </USER>
-  <USER>
-    <ID>3</ID>
-    <GID>1</GID>
-    <GNAME>users</GNAME>
-    <NAME>1234</NAME>
-    <PASSWORD>7110eda4d09e062aa5e4a390b0a572ac0d2c0220</PASSWORD>
-    <AUTH_DRIVER>core</AUTH_DRIVER>
-    <ENABLED>1</ENABLED>
-    <TEMPLATE>
-      <ATT><![CDATA[OTHER VALUE]]></ATT>
-      <COMPLEX>
-        <ATT1><![CDATA[VAL1]]></ATT1>
-        <ATT2><![CDATA[VAL2]]></ATT2>
-        <NUM3><![CDATA[3]]></NUM3>
-      </COMPLEX>
-      <EXTRA><![CDATA[VALUE]]></EXTRA>
-      <NUM><![CDATA[123]]></NUM>
-    </TEMPLATE>
-  </USER>
-</USER_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vm/1.xml b/share/doc/xsd/samples/vm/1.xml
deleted file mode 100644
index 54b668d48f..0000000000
--- a/share/doc/xsd/samples/vm/1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<VM xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vm.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>one-0</NAME>
-  <LAST_POLL>0</LAST_POLL>
-  <STATE>1</STATE>
-  <LCM_STATE>0</LCM_STATE>
-  <STIME>1324050700</STIME>
-  <ETIME>0</ETIME>
-  <DEPLOY_ID/>
-  <MEMORY>0</MEMORY>
-  <CPU>0</CPU>
-  <NET_TX>0</NET_TX>
-  <NET_RX>0</NET_RX>
-  <TEMPLATE>
-    <NAME><![CDATA[one-0]]></NAME>
-    <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-    <VMID><![CDATA[0]]></VMID>
-  </TEMPLATE>
-  <HISTORY_RECORDS/>
-</VM>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vm/2.xml b/share/doc/xsd/samples/vm/2.xml
deleted file mode 100644
index 1111618103..0000000000
--- a/share/doc/xsd/samples/vm/2.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<VM xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vm.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>one-0</NAME>
-  <LAST_POLL>1324050881</LAST_POLL>
-  <STATE>3</STATE>
-  <LCM_STATE>3</LCM_STATE>
-  <STIME>1324050700</STIME>
-  <ETIME>0</ETIME>
-  <DEPLOY_ID>vm:one-0:dummy</DEPLOY_ID>
-  <MEMORY>0</MEMORY>
-  <CPU>0</CPU>
-  <NET_TX>0</NET_TX>
-  <NET_RX>0</NET_RX>
-  <TEMPLATE>
-    <NAME><![CDATA[one-0]]></NAME>
-    <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-    <VMID><![CDATA[0]]></VMID>
-  </TEMPLATE>
-  <HISTORY_RECORDS>
-    <HISTORY>
-      <SEQ>0</SEQ>
-      <HOSTNAME>vm</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>1</HID>
-      <STIME>1324050881</STIME>
-      <ETIME>1324050891</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>1324050881</PSTIME>
-      <PETIME>1324050881</PETIME>
-      <RSTIME>1324050881</RSTIME>
-      <RETIME>1324050891</RETIME>
-      <ESTIME>0</ESTIME>
-      <EETIME>0</EETIME>
-      <REASON>3</REASON>
-    </HISTORY>
-    <HISTORY>
-      <SEQ>1</SEQ>
-      <HOSTNAME>localhost</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>0</HID>
-      <STIME>1324050891</STIME>
-      <ETIME>1324050899</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>1324050891</PSTIME>
-      <PETIME>1324050892</PETIME>
-      <RSTIME>1324050892</RSTIME>
-      <RETIME>1324050899</RETIME>
-      <ESTIME>0</ESTIME>
-      <EETIME>0</EETIME>
-      <REASON>3</REASON>
-    </HISTORY>
-    <HISTORY>
-      <SEQ>2</SEQ>
-      <HOSTNAME>localhost</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>0</HID>
-      <STIME>1324050899</STIME>
-      <ETIME>0</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>0</PSTIME>
-      <PETIME>0</PETIME>
-      <RSTIME>1324050899</RSTIME>
-      <RETIME>0</RETIME>
-      <ESTIME>0</ESTIME>
-      <EETIME>0</EETIME>
-      <REASON>0</REASON>
-    </HISTORY>
-  </HISTORY_RECORDS>
-</VM>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vm/3.xml b/share/doc/xsd/samples/vm/3.xml
deleted file mode 100644
index 99baa18bb8..0000000000
--- a/share/doc/xsd/samples/vm/3.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<VM xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vm.xsd">
-  <ID>3</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>one-3</NAME>
-  <LAST_POLL>1324052447</LAST_POLL>
-  <STATE>6</STATE>
-  <LCM_STATE>0</LCM_STATE>
-  <STIME>1324052427</STIME>
-  <ETIME>1324052465</ETIME>
-  <DEPLOY_ID>localhost:one-3:dummy</DEPLOY_ID>
-  <MEMORY>0</MEMORY>
-  <CPU>0</CPU>
-  <NET_TX>0</NET_TX>
-  <NET_RX>0</NET_RX>
-  <TEMPLATE>
-    <NAME><![CDATA[one-3]]></NAME>
-    <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-    <VMID><![CDATA[3]]></VMID>
-  </TEMPLATE>
-  <HISTORY_RECORDS>
-    <HISTORY>
-      <SEQ>0</SEQ>
-      <HOSTNAME>localhost</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>0</HID>
-      <STIME>1324052447</STIME>
-      <ETIME>1324052452</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>1324052447</PSTIME>
-      <PETIME>1324052447</PETIME>
-      <RSTIME>1324052447</RSTIME>
-      <RETIME>1324052452</RETIME>
-      <ESTIME>0</ESTIME>
-      <EETIME>0</EETIME>
-      <REASON>3</REASON>
-    </HISTORY>
-    <HISTORY>
-      <SEQ>1</SEQ>
-      <HOSTNAME>vm</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>1</HID>
-      <STIME>1324052452</STIME>
-      <ETIME>1324052456</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>1324052452</PSTIME>
-      <PETIME>1324052452</PETIME>
-      <RSTIME>1324052452</RSTIME>
-      <RETIME>1324052456</RETIME>
-      <ESTIME>0</ESTIME>
-      <EETIME>0</EETIME>
-      <REASON>3</REASON>
-    </HISTORY>
-    <HISTORY>
-      <SEQ>2</SEQ>
-      <HOSTNAME>localhost</HOSTNAME>
-      <VM_DIR>/var/lib/one/</VM_DIR>
-      <HID>0</HID>
-      <STIME>1324052456</STIME>
-      <ETIME>1324052465</ETIME>
-      <VMMMAD>vmm_dummy</VMMMAD>
-      <VNMMAD>fw</VNMMAD>
-      <TMMAD>tm_shared</TMMAD>
-      <PSTIME>1324052456</PSTIME>
-      <PETIME>1324052456</PETIME>
-      <RSTIME>1324052456</RSTIME>
-      <RETIME>1324052465</RETIME>
-      <ESTIME>1324052465</ESTIME>
-      <EETIME>1324052465</EETIME>
-      <REASON>4</REASON>
-    </HISTORY>
-  </HISTORY_RECORDS>
-</VM>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vm_pool/1.xml b/share/doc/xsd/samples/vm_pool/1.xml
deleted file mode 100644
index c3772a666d..0000000000
--- a/share/doc/xsd/samples/vm_pool/1.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<VM_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vm_pool.xsd">
-  <VM>
-    <ID>0</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>one-0</NAME>
-    <LAST_POLL>1324052091</LAST_POLL>
-    <STATE>3</STATE>
-    <LCM_STATE>3</LCM_STATE>
-    <STIME>1324050700</STIME>
-    <ETIME>0</ETIME>
-    <DEPLOY_ID>vm:one-0:dummy</DEPLOY_ID>
-    <MEMORY>0</MEMORY>
-    <CPU>0</CPU>
-    <NET_TX>12345</NET_TX>
-    <NET_RX>0</NET_RX>
-    <TEMPLATE>
-      <NAME><![CDATA[one-0]]></NAME>
-      <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-      <VMID><![CDATA[0]]></VMID>
-    </TEMPLATE>
-    <HISTORY_RECORDS>
-      <HISTORY>
-        <SEQ>2</SEQ>
-        <HOSTNAME>localhost</HOSTNAME>
-        <VM_DIR>/var/lib/one/</VM_DIR>
-        <HID>0</HID>
-        <STIME>1324050899</STIME>
-        <ETIME>0</ETIME>
-        <VMMMAD>vmm_dummy</VMMMAD>
-        <VNMMAD>fw</VNMMAD>
-        <TMMAD>tm_shared</TMMAD>
-        <PSTIME>0</PSTIME>
-        <PETIME>0</PETIME>
-        <RSTIME>1324050899</RSTIME>
-        <RETIME>0</RETIME>
-        <ESTIME>0</ESTIME>
-        <EETIME>0</EETIME>
-        <REASON>0</REASON>
-      </HISTORY>
-    </HISTORY_RECORDS>
-  </VM>
-  <VM>
-    <ID>1</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>one-1</NAME>
-    <LAST_POLL>0</LAST_POLL>
-    <STATE>1</STATE>
-    <LCM_STATE>0</LCM_STATE>
-    <STIME>1324052403</STIME>
-    <ETIME>0</ETIME>
-    <DEPLOY_ID/>
-    <MEMORY>0</MEMORY>
-    <CPU>0</CPU>
-    <NET_TX>0</NET_TX>
-    <NET_RX>0</NET_RX>
-    <TEMPLATE>
-      <NAME><![CDATA[one-1]]></NAME>
-      <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-      <VMID><![CDATA[1]]></VMID>
-    </TEMPLATE>
-    <HISTORY_RECORDS/>
-  </VM>
-  <VM>
-    <ID>2</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>one-2</NAME>
-    <LAST_POLL>1324052436</LAST_POLL>
-    <STATE>3</STATE>
-    <LCM_STATE>3</LCM_STATE>
-    <STIME>1324052411</STIME>
-    <ETIME>0</ETIME>
-    <DEPLOY_ID>vm:one-2:dummy</DEPLOY_ID>
-    <MEMORY>0</MEMORY>
-    <CPU>0</CPU>
-    <NET_TX>0</NET_TX>
-    <NET_RX>0</NET_RX>
-    <TEMPLATE>
-      <NAME><![CDATA[one-2]]></NAME>
-      <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-      <VMID><![CDATA[2]]></VMID>
-    </TEMPLATE>
-    <HISTORY_RECORDS>
-      <HISTORY>
-        <SEQ>0</SEQ>
-        <HOSTNAME>vm</HOSTNAME>
-        <VM_DIR>/var/lib/one/</VM_DIR>
-        <HID>1</HID>
-        <STIME>1324052436</STIME>
-        <ETIME>0</ETIME>
-        <VMMMAD>vmm_dummy</VMMMAD>
-        <VNMMAD>fw</VNMMAD>
-        <TMMAD>tm_shared</TMMAD>
-        <PSTIME>1324052436</PSTIME>
-        <PETIME>1324052436</PETIME>
-        <RSTIME>1324052436</RSTIME>
-        <RETIME>0</RETIME>
-        <ESTIME>0</ESTIME>
-        <EETIME>0</EETIME>
-        <REASON>0</REASON>
-      </HISTORY>
-    </HISTORY_RECORDS>
-  </VM>
-  <VM>
-    <ID>4</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>one-4</NAME>
-    <LAST_POLL>1324052488</LAST_POLL>
-    <STATE>7</STATE>
-    <LCM_STATE>0</LCM_STATE>
-    <STIME>1324052484</STIME>
-    <ETIME>1324052510</ETIME>
-    <DEPLOY_ID>localhost:one-4:dummy</DEPLOY_ID>
-    <MEMORY>0</MEMORY>
-    <CPU>0</CPU>
-    <NET_TX>0</NET_TX>
-    <NET_RX>0</NET_RX>
-    <TEMPLATE>
-      <ERROR>
-        <MESSAGE><![CDATA[Error excuting image transfer script: Could not move /var/lib/one//4/images to /var/lib/one/4]]></MESSAGE>
-        <TIMESTAMP><![CDATA[Fri Dec 16 08:21:50 2011]]></TIMESTAMP>
-      </ERROR>
-      <NAME><![CDATA[one-4]]></NAME>
-      <TEMPLATE_ID><![CDATA[2]]></TEMPLATE_ID>
-      <VMID><![CDATA[4]]></VMID>
-    </TEMPLATE>
-    <HISTORY_RECORDS>
-      <HISTORY>
-        <SEQ>2</SEQ>
-        <HOSTNAME>vm</HOSTNAME>
-        <VM_DIR>/var/lib/one/</VM_DIR>
-        <HID>1</HID>
-        <STIME>1324052502</STIME>
-        <ETIME>1324052510</ETIME>
-        <VMMMAD>vmm_dummy</VMMMAD>
-        <VNMMAD>fw</VNMMAD>
-        <TMMAD>tm_shared</TMMAD>
-        <PSTIME>1324052502</PSTIME>
-        <PETIME>1324052502</PETIME>
-        <RSTIME>1324052502</RSTIME>
-        <RETIME>1324052510</RETIME>
-        <ESTIME>1324052510</ESTIME>
-        <EETIME>1324052510</EETIME>
-        <REASON>1</REASON>
-      </HISTORY>
-    </HISTORY_RECORDS>
-  </VM>
-</VM_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vm_pool/2.xml b/share/doc/xsd/samples/vm_pool/2.xml
deleted file mode 100644
index 2c7d359203..0000000000
--- a/share/doc/xsd/samples/vm_pool/2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<VM_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vm_pool.xsd"/>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vnet/1.xml b/share/doc/xsd/samples/vnet/1.xml
deleted file mode 100644
index 58c2f01c61..0000000000
--- a/share/doc/xsd/samples/vnet/1.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<VNET xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vnet.xsd">
-  <ID>0</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>Blue LAN</NAME>
-  <TYPE>1</TYPE>
-  <BRIDGE>vbr1</BRIDGE>
-  <VLAN>0</VLAN>
-  <PHYDEV/>
-  <VLAN_ID/>
-  <PUBLIC>0</PUBLIC>
-  <TOTAL_LEASES>0</TOTAL_LEASES>
-  <TEMPLATE>
-    <DNS><![CDATA[130.10.0.1]]></DNS>
-    <GATEWAY><![CDATA[130.10.0.1]]></GATEWAY>
-    <LOAD_BALANCER><![CDATA[130.10.0.4]]></LOAD_BALANCER>
-  </TEMPLATE>
-  <LEASES>
-    <LEASE>
-      <IP>130.10.0.1</IP>
-      <MAC>02:00:82:0a:00:01</MAC>
-      <USED>0</USED>
-      <VID>-1</VID>
-    </LEASE>
-    <LEASE>
-      <IP>130.10.0.2</IP>
-      <MAC>50:20:20:20:20:21</MAC>
-      <USED>0</USED>
-      <VID>-1</VID>
-    </LEASE>
-    <LEASE>
-      <IP>130.10.0.3</IP>
-      <MAC>02:00:82:0a:00:03</MAC>
-      <USED>0</USED>
-      <VID>-1</VID>
-    </LEASE>
-    <LEASE>
-      <IP>130.10.0.4</IP>
-      <MAC>02:00:82:0a:00:04</MAC>
-      <USED>0</USED>
-      <VID>-1</VID>
-    </LEASE>
-  </LEASES>
-</VNET>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vnet/2.xml b/share/doc/xsd/samples/vnet/2.xml
deleted file mode 100644
index 7dd12dd226..0000000000
--- a/share/doc/xsd/samples/vnet/2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<VNET xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vnet.xsd">
-  <ID>1</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>R</NAME>
-  <TYPE>0</TYPE>
-  <BRIDGE>vbr0</BRIDGE>
-  <VLAN>0</VLAN>
-  <PHYDEV/>
-  <VLAN_ID/>
-  <RANGE>
-    <IP_START>10.10.10.1</IP_START>
-    <IP_END>10.10.10.254</IP_END>
-  </RANGE>
-  <PUBLIC>0</PUBLIC>
-  <TOTAL_LEASES>0</TOTAL_LEASES>
-  <TEMPLATE>
-    <CUSTOM><![CDATA[CARLOS]]></CUSTOM>
-    <NETWORK_MASK><![CDATA[255.255.255.0]]></NETWORK_MASK>
-  </TEMPLATE>
-  <LEASES/>
-</VNET>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vnet/3.xml b/share/doc/xsd/samples/vnet/3.xml
deleted file mode 100644
index 65979e9c7e..0000000000
--- a/share/doc/xsd/samples/vnet/3.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<VNET xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vnet.xsd">
-  <ID>3</ID>
-  <UID>0</UID>
-  <GID>0</GID>
-  <UNAME>oneadmin</UNAME>
-  <GNAME>oneadmin</GNAME>
-  <NAME>Empty</NAME>
-  <TYPE>1</TYPE>
-  <BRIDGE>vbr1</BRIDGE>
-  <VLAN>1</VLAN>
-  <PHYDEV>eth0</PHYDEV>
-  <VLAN_ID>34</VLAN_ID>
-  <PUBLIC>0</PUBLIC>
-  <TOTAL_LEASES>0</TOTAL_LEASES>
-  <TEMPLATE>
-    <DNS><![CDATA[130.10.0.1]]></DNS>
-    <GATEWAY><![CDATA[130.10.0.1]]></GATEWAY>
-    <LOAD_BALANCER><![CDATA[130.10.0.4]]></LOAD_BALANCER>
-  </TEMPLATE>
-  <LEASES/>
-</VNET>
\ No newline at end of file
diff --git a/share/doc/xsd/samples/vnet_pool/1.xml b/share/doc/xsd/samples/vnet_pool/1.xml
deleted file mode 100644
index 4a98dc0af0..0000000000
--- a/share/doc/xsd/samples/vnet_pool/1.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<VNET_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vnet_pool.xsd"/>
diff --git a/share/doc/xsd/samples/vnet_pool/2.xml b/share/doc/xsd/samples/vnet_pool/2.xml
deleted file mode 100644
index d489eea01b..0000000000
--- a/share/doc/xsd/samples/vnet_pool/2.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<VNET_POOL xmlns="http://opennebula.org/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://opennebula.org/XMLSchema ../../vnet_pool.xsd">
-  <VNET>
-    <ID>0</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>Blue LAN</NAME>
-    <TYPE>1</TYPE>
-    <BRIDGE>vbr1</BRIDGE>
-    <VLAN>0</VLAN>
-    <PHYDEV/>
-    <VLAN_ID/>
-    <PUBLIC>0</PUBLIC>
-    <TOTAL_LEASES>0</TOTAL_LEASES>
-    <TEMPLATE/>
-  </VNET>
-  <VNET>
-    <ID>1</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>R</NAME>
-    <TYPE>0</TYPE>
-    <BRIDGE>vbr0</BRIDGE>
-    <VLAN>0</VLAN>
-    <PHYDEV/>
-    <VLAN_ID/>
-    <RANGE>
-      <IP_START>10.10.10.1</IP_START>
-      <IP_END>10.10.10.254</IP_END>
-    </RANGE>
-    <PUBLIC>0</PUBLIC>
-    <TOTAL_LEASES>0</TOTAL_LEASES>
-    <TEMPLATE>
-      <CUSTOM><![CDATA[CARLOS]]></CUSTOM>
-      <NETWORK_MASK><![CDATA[255.255.255.0]]></NETWORK_MASK>
-    </TEMPLATE>
-  </VNET>
-  <VNET>
-    <ID>3</ID>
-    <UID>0</UID>
-    <GID>0</GID>
-    <UNAME>oneadmin</UNAME>
-    <GNAME>oneadmin</GNAME>
-    <NAME>Empty</NAME>
-    <TYPE>1</TYPE>
-    <BRIDGE>vbr1</BRIDGE>
-    <VLAN>1</VLAN>
-    <PHYDEV>eth0</PHYDEV>
-    <VLAN_ID>34</VLAN_ID>
-    <PUBLIC>0</PUBLIC>
-    <TOTAL_LEASES>0</TOTAL_LEASES>
-    <TEMPLATE>
-      <DNS><![CDATA[130.10.0.1]]></DNS>
-      <GATEWAY><![CDATA[130.10.0.1]]></GATEWAY>
-      <LOAD_BALANCER><![CDATA[130.10.0.4]]></LOAD_BALANCER>
-    </TEMPLATE>
-  </VNET>
-</VNET_POOL>
\ No newline at end of file
diff --git a/share/doc/xsd/template.xsd b/share/doc/xsd/template.xsd
index 6fb9523e72..2d8af0a14b 100644
--- a/share/doc/xsd/template.xsd
+++ b/share/doc/xsd/template.xsd
@@ -9,7 +9,21 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
-        <xs:element name="PUBLIC" type="xs:integer"/>
+        <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OWNER_U" type="xs:integer"/>
+              <xs:element name="OWNER_M" type="xs:integer"/>
+              <xs:element name="OWNER_A" type="xs:integer"/>
+              <xs:element name="GROUP_U" type="xs:integer"/>
+              <xs:element name="GROUP_M" type="xs:integer"/>
+              <xs:element name="GROUP_A" type="xs:integer"/>
+              <xs:element name="OTHER_U" type="xs:integer"/>
+              <xs:element name="OTHER_M" type="xs:integer"/>
+              <xs:element name="OTHER_A" type="xs:integer"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="REGTIME" type="xs:integer"/>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
       </xs:sequence>
diff --git a/share/doc/xsd/vm.xsd b/share/doc/xsd/vm.xsd
index 57ea8dbf79..039f4a3d75 100644
--- a/share/doc/xsd/vm.xsd
+++ b/share/doc/xsd/vm.xsd
@@ -10,6 +10,21 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OWNER_U" type="xs:integer"/>
+              <xs:element name="OWNER_M" type="xs:integer"/>
+              <xs:element name="OWNER_A" type="xs:integer"/>
+              <xs:element name="GROUP_U" type="xs:integer"/>
+              <xs:element name="GROUP_M" type="xs:integer"/>
+              <xs:element name="GROUP_A" type="xs:integer"/>
+              <xs:element name="OTHER_U" type="xs:integer"/>
+              <xs:element name="OTHER_M" type="xs:integer"/>
+              <xs:element name="OTHER_A" type="xs:integer"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="LAST_POLL" type="xs:integer"/>
         <xs:element name="STATE" type="xs:integer"/>
         <xs:element name="LCM_STATE" type="xs:integer"/>
diff --git a/share/doc/xsd/vnet.xsd b/share/doc/xsd/vnet.xsd
index 391a01d3fd..b0bceb5d84 100644
--- a/share/doc/xsd/vnet.xsd
+++ b/share/doc/xsd/vnet.xsd
@@ -10,6 +10,21 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="OWNER_U" type="xs:integer"/>
+              <xs:element name="OWNER_M" type="xs:integer"/>
+              <xs:element name="OWNER_A" type="xs:integer"/>
+              <xs:element name="GROUP_U" type="xs:integer"/>
+              <xs:element name="GROUP_M" type="xs:integer"/>
+              <xs:element name="GROUP_A" type="xs:integer"/>
+              <xs:element name="OTHER_U" type="xs:integer"/>
+              <xs:element name="OTHER_M" type="xs:integer"/>
+              <xs:element name="OTHER_A" type="xs:integer"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="TYPE" type="xs:integer"/>
         <xs:element name="BRIDGE" type="xs:string"/>
         <xs:element name="VLAN" type="xs:integer"/>
@@ -23,7 +38,6 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PUBLIC" type="xs:integer"/>
         <xs:element name="TOTAL_LEASES" type="xs:integer"/>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
         <xs:element name="LEASES" minOccurs="0" maxOccurs="1">
diff --git a/share/install_gems/install_gems b/share/install_gems/install_gems
index d0dd30ac98..2d37390604 100755
--- a/share/install_gems/install_gems
+++ b/share/install_gems/install_gems
@@ -22,7 +22,7 @@ GROUPS={
     :optional => OPTIONAL,
     :quota => [SQLITE, 'sequel'],
     :sunstone => ['json', 'rack', 'sinatra', 'thin', 'sequel', SQLITE],
-    :cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb},
+    :cloud => %w{amazon-ec2 rack sinatra thin uuidtools curb json},
     :ozones_client => %w{json},
     :ozones_server => %w{json data_mapper dm-sqlite-adapter dm-mysql-adapter}+[
         SQLITE, 'mysql'
diff --git a/src/cloud/occi/lib/ui/public/js/layout.js b/src/cloud/occi/lib/ui/public/js/layout.js
index 79e8df8320..7b315b443c 100644
--- a/src/cloud/occi/lib/ui/public/js/layout.js
+++ b/src/cloud/occi/lib/ui/public/js/layout.js
@@ -57,14 +57,14 @@ function showTab(tabname){
 $(document).ready(function () {
     $(".tab").hide();
 
-    $(".outer-west ul li.subTab a").live("click",function(){
-        var tab = $(this).attr('href');
+    $(".outer-west ul li.subTab").live("click",function(){
+        var tab = $('a',this).attr('href');
         showTab(tab);
         return false;
     });
 
-    $(".outer-west ul li.topTab a").live("click",function(){
-        var tab = $(this).attr('href');
+    $(".outer-west ul li.topTab").live("click",function(){
+        var tab = $('a',this).attr('href');
         //toggle subtabs trick
         $('li.'+tab.substr(1)).toggle();
         showTab(tab);
diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js
index fc3057e32a..b783835236 100644
--- a/src/sunstone/public/js/layout.js
+++ b/src/sunstone/public/js/layout.js
@@ -57,14 +57,14 @@ function showTab(tabname){
 $(document).ready(function () {
     $(".tab").hide();
 
-    $(".outer-west ul li.subTab a").live("click",function(){
-        var tab = $(this).attr('href');
+    $(".outer-west ul li.subTab").live("click",function(){
+        var tab = $('a',this).attr('href');
         showTab(tab);
         return false;
     });
 
-    $(".outer-west ul li.topTab a").live("click",function(){
-        var tab = $(this).attr('href');
+    $(".outer-west ul li.topTab").live("click",function(){
+        var tab = $('a',this).attr('href');
         //toggle subtabs trick
         $('li.'+tab.substr(1)).toggle();
         showTab(tab);
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index f838bd1495..5375aaf892 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -587,7 +587,7 @@ var update_template_tmpl =
    '<form action="javascript:alert(\'js error!\');">\
          <h3 style="margin-bottom:10px;">'+tr("Please, choose and modify the template you want to update")+':</h3>\
             <fieldset style="border-top:none;">\
-                 <label for="template_template_update_select">'+tr("Select a network")+':</label>\
+                 <label for="template_template_update_select">'+tr("Select a template")+':</label>\
                  <select id="template_template_update_select" name="template_template_update_select"></select>\
                  <div class="clear"></div>\
                  <div>\
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index fbd1e2a8fa..bb5e20eda2 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -241,7 +241,7 @@ var user_buttons = {
     },
     "User.update_dialog" : {
         type: "action",
-        text: tr("Update a template"),
+        text: tr("Update properties"),
         alwaysActive: true
     },
     "User.update_password" : {
diff --git a/src/sunstone/public/locale/en_US/en_US.js b/src/sunstone/public/locale/en_US/en_US.js
index 11bce91eb5..abd23e3ef1 100644
--- a/src/sunstone/public/locale/en_US/en_US.js
+++ b/src/sunstone/public/locale/en_US/en_US.js
@@ -139,7 +139,6 @@ locale={
     "Group":"",
     "Group ":"",
     "Group name":"",
-    "Group permissions":"",
     "Groups":"",
     "Hardware that will emulate this network interface. With Xen this is the type attribute of the vif.":"",
     "hd":"",
@@ -249,10 +248,8 @@ locale={
     "OS":"",
     "OS and Boot options":"",
     "Other":"",
-    "Other permissions":"",
     "Owned by group":"",
     "Owner":"",
-    "Owner permissions":"",
     "PAE":"",
     "Password":"",
     "Password for the VNC server":"",