diff --git a/share/doc/xsd/group.xsd b/share/doc/xsd/group.xsd
index 479b12d320..326984e35c 100644
--- a/share/doc/xsd/group.xsd
+++ b/share/doc/xsd/group.xsd
@@ -63,10 +63,10 @@
                     <xs:element name="CPU_USED" type="xs:string"/>
                     <xs:element name="MEMORY" type="xs:string"/>
                     <xs:element name="MEMORY_USED" type="xs:string"/>
-                    <xs:element name="VMS" type="xs:string"/>
-                    <xs:element name="VMS_USED" type="xs:string"/>
                     <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
                     <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
+                    <xs:element name="VMS" type="xs:string"/>
+                    <xs:element name="VMS_USED" type="xs:string"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
@@ -133,6 +133,8 @@
                             <xs:element name="CPU_USED" type="xs:string"/>
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
                             <xs:element name="VMS" type="xs:string"/>
                             <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
diff --git a/share/doc/xsd/group_pool.xsd b/share/doc/xsd/group_pool.xsd
index ab5ccef548..3453429570 100644
--- a/share/doc/xsd/group_pool.xsd
+++ b/share/doc/xsd/group_pool.xsd
@@ -74,10 +74,10 @@
                             <xs:element name="CPU_USED" type="xs:string"/>
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
-                            <xs:element name="VMS" type="xs:string"/>
-                            <xs:element name="VMS_USED" type="xs:string"/>
                             <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
                             <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
+                            <xs:element name="VMS" type="xs:string"/>
+                            <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
                         </xs:complexType>
                       </xs:element>
@@ -148,6 +148,8 @@
                             <xs:element name="CPU_USED" type="xs:string"/>               
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
                             <xs:element name="VMS" type="xs:string"/>
                             <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
diff --git a/share/doc/xsd/test.sh b/share/doc/xsd/test.sh
index 68d07dbb6c..ddfbf0b5ba 100755
--- a/share/doc/xsd/test.sh
+++ b/share/doc/xsd/test.sh
@@ -109,9 +109,15 @@ onedatastore list -x > samples/datastore_pool/0.xml
 
 
 # User
+oneuser defaultquota test/quota.txt
+
 oneuser create newuser abc
 oneuser chgrp newuser newgroup
 
+oneuser token-create --user newuser --password abc --time 123
+oneuser token-create --user newuser --password abc --time 456
+oneuser token-create --user newuser --password abc --time 789
+
 for i in `oneuser list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
     oneuser show $i -x > samples/user/$i.xml
 done
@@ -120,6 +126,8 @@ oneuser list -x > samples/user_pool/0.xml
 
 
 # Group
+onegroup defaultquota test/quota.txt
+
 onegroup create emptygroup
 
 for i in `onegroup list | tail -n +2 | tr -s ' ' | cut -f2 -d ' '`; do
diff --git a/share/doc/xsd/test/quota.txt b/share/doc/xsd/test/quota.txt
new file mode 100644
index 0000000000..03b270526a
--- /dev/null
+++ b/share/doc/xsd/test/quota.txt
@@ -0,0 +1,6 @@
+VM=[
+  CPU="60.50",
+  MEMORY="102400",
+  SYSTEM_DISK_SIZE="204800",
+  VMS="1000"
+]
diff --git a/share/doc/xsd/user.xsd b/share/doc/xsd/user.xsd
index 7127441bfc..d5064faa69 100644
--- a/share/doc/xsd/user.xsd
+++ b/share/doc/xsd/user.xsd
@@ -18,7 +18,15 @@
         <xs:element name="PASSWORD" type="xs:string"/>
         <xs:element name="AUTH_DRIVER" type="xs:string"/>
         <xs:element name="ENABLED" type="xs:integer"/>
-        <xs:element name="LOGIN_TOKEN" type="xs:string"/>
+        <xs:element name="LOGIN_TOKEN" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="TOKEN" type="xs:string"/>
+              <xs:element name="EXPIRATION_TIME" type="xs:integer"/>
+              <xs:element name="EGID" type="xs:integer"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="TEMPLATE" type="xs:anyType"/>
         <xs:element name="DATASTORE_QUOTA" minOccurs="0" maxOccurs="1">
           <xs:complexType>
@@ -62,10 +70,10 @@
                     <xs:element name="CPU_USED" type="xs:string"/>
                     <xs:element name="MEMORY" type="xs:string"/>
                     <xs:element name="MEMORY_USED" type="xs:string"/>
-                    <xs:element name="VMS" type="xs:string"/>
-                    <xs:element name="VMS_USED" type="xs:string"/>
                     <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
                     <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
+                    <xs:element name="VMS" type="xs:string"/>
+                    <xs:element name="VMS_USED" type="xs:string"/>
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
@@ -132,6 +140,8 @@
                             <xs:element name="CPU_USED" type="xs:string"/>
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
                             <xs:element name="VMS" type="xs:string"/>
                             <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
diff --git a/share/doc/xsd/user_pool.xsd b/share/doc/xsd/user_pool.xsd
index e83c4ffe4f..32c920fd22 100644
--- a/share/doc/xsd/user_pool.xsd
+++ b/share/doc/xsd/user_pool.xsd
@@ -22,7 +22,15 @@
                 <xs:element name="PASSWORD" type="xs:string"/>
                 <xs:element name="AUTH_DRIVER" type="xs:string"/>
                 <xs:element name="ENABLED" type="xs:integer"/>
-                <xs:element name="LOGIN_TOKEN" type="xs:string"/>
+                <xs:element name="LOGIN_TOKEN" minOccurs="0" maxOccurs="unbounded">
+                  <xs:complexType>
+                    <xs:sequence>
+                      <xs:element name="TOKEN" type="xs:string"/>
+                      <xs:element name="EXPIRATION_TIME" type="xs:integer"/>
+                      <xs:element name="EGID" type="xs:integer"/>
+                    </xs:sequence>
+                  </xs:complexType>
+                </xs:element>
                 <xs:element name="TEMPLATE" type="xs:anyType"/>
               </xs:sequence>
             </xs:complexType>
@@ -73,10 +81,10 @@
                             <xs:element name="CPU_USED" type="xs:string"/>
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
-                            <xs:element name="VMS" type="xs:string"/>
-                            <xs:element name="VMS_USED" type="xs:string"/>
                             <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
                             <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
+                            <xs:element name="VMS" type="xs:string"/>
+                            <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
                         </xs:complexType>
                       </xs:element>
@@ -147,6 +155,8 @@
                             <xs:element name="CPU_USED" type="xs:string"/>
                             <xs:element name="MEMORY" type="xs:string"/>
                             <xs:element name="MEMORY_USED" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
+                            <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
                             <xs:element name="VMS" type="xs:string"/>
                             <xs:element name="VMS_USED" type="xs:string"/>
                           </xs:sequence>
diff --git a/share/doc/xsd/vnet.xsd b/share/doc/xsd/vnet.xsd
index 01775011f2..326410ca3f 100644
--- a/share/doc/xsd/vnet.xsd
+++ b/share/doc/xsd/vnet.xsd
@@ -82,6 +82,7 @@
                                 <xs:element name="MAC" type="xs:string"/>
                                 <xs:element name="VM" type="xs:integer" minOccurs="0"/>
                                 <xs:element name="VNET" type="xs:integer" minOccurs="0"/>
+                                <xs:element name="VROUTER" type="xs:integer" minOccurs="0"/>
                               </xs:all>
                             </xs:complexType>
                           </xs:element>