diff --git a/ryzom/common/data_common/database.xml b/ryzom/common/data_common/database.xml
index 5ebd5e36e..0eece2f63 100644
--- a/ryzom/common/data_common/database.xml
+++ b/ryzom/common/data_common/database.xml
@@ -55,7 +55,7 @@
     <branch name="SKILL_POINTS_" count="4">
       <leaf name="VALUE" type="I32" />
     </branch>
-    <branch name="FACTION_POINTS_" count="6">
+    <branch name="FACTION_POINTS_" count="7">
       <!-- game_share/pvp_clan.h (0 is BeginClans and size is EndClans-BeginClans+1 -->
       <leaf name="VALUE" type="I32" />
     </branch>
@@ -65,7 +65,7 @@
       <leaf name="VALUE" type="I32" />
     </branch>
     <branch name="NPC_CONTROL" bank="PLR">
-      <leaf name="SHEET"  type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="SHEET"  type="I32" cppType="NLMISC::CSheetId" />
       <leaf name="RUN"    type="I32" />
       <leaf name="WALK"   type="I32" />
     </branch>
@@ -91,7 +91,7 @@
     <branch name="BRICK_TICK_RANGE">
       <!-- tick range for each power -->
       <branch name="" count="64">
-        <leaf name="TICK_RANGE" type="I64" nullable="1" />
+        <leaf name="TICK_RANGE" type="I64" />
         <!-- 32b for start tick and 32b for end tick -->
       </branch>
     </branch>
@@ -117,11 +117,11 @@
     </branch>
     <!-- ContextMenu (Bot options etc...) -->
     <branch name="CONTEXT_MENU" atom="1">
-      <leaf name="PROGRAMMES" type="I32" nullable="1" />
+      <leaf name="PROGRAMMES" type="I32" />
       <!-- options for missions in the context menu -->
       <branch name="MISSIONS_OPTIONS">
         <branch name="" count="8">
-          <leaf name="TITLE"                type="I32" nullable="1" />
+          <leaf name="TITLE"                type="I32" />
           <!-- a text ID of 0 means there's no action. Text ID are reseted when a new character is targeted -->
           <leaf name="PLAYER_GIFT_NEEDED"   type="I1" />
           <!-- want a player gift ? -->
@@ -130,18 +130,18 @@
         </branch>
       </branch>
       <!-- A NPC may offer to view a webpage -->
-      <leaf name="WEB_PAGE_TITLE"   type="I32" nullable="1" />
+      <leaf name="WEB_PAGE_TITLE"   type="I32" />
       <!-- a text ID of 0 means there's no WebPage -->
-      <leaf name="WEB_PAGE_URL"     type="I32" nullable="1" />
+      <leaf name="WEB_PAGE_URL"     type="I32" />
       <!-- the URL text ID of the web page -->
-      <leaf name="OUTPOST"          type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="OUTPOST"          type="I32" cppType="NLMISC::CSheetId" />
       <!-- outpost this bot give access to (sheet id inside) -->
       <!-- Mission rings -->
       <branch name="MISSION_RING">
         <branch name="" count="4">
-          <leaf name="TITLE"    type="I32" nullable="1" />
+          <leaf name="TITLE"    type="I32" />
           <!-- a text ID of 0 means there's no action. Text ID are reseted when a new character is targeted -->
-          <leaf name="ID"       type="I32" nullable="1" />
+          <leaf name="ID"       type="I32" />
           <!-- the id of the action if selected -->
         </branch>
       </branch>
@@ -171,27 +171,27 @@
       <branch name="" count="15">
         <!-- see game_share/mission_desc.h TMissionType -->
         <leaf name="TYPE"           type="I2" />
-        <leaf name="ICON"           type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="ICON"           type="I32" cppType="NLMISC::CSheetId" />
         <!-- sheet id of a .mission_icon sheet -->
-        <leaf name="TITLE"          type="I32" nullable="1" />
-        <leaf name="DETAIL_TEXT"    type="I32" nullable="1" />
+        <leaf name="TITLE"          type="I32" />
+        <leaf name="DETAIL_TEXT"    type="I32" />
         <!-- begin date in tick -->
-        <leaf name="BEGIN_DATE"     type="I32" nullable="1" />
+        <leaf name="BEGIN_DATE"     type="I32" />
         <!-- end date in tick -->
-        <leaf name="END_DATE"       type="I32" nullable="1" />
+        <leaf name="END_DATE"       type="I32" />
         <!-- true if the step are "OR" -->
         <leaf name="OR_STEPS"       type="I1" />
         <branch name="GOALS">
           <branch name="" count="20">
-            <leaf name="TEXT"         type="I32" nullable="1" />
-            <leaf name="NPC_ALIAS"    type="I32" nullable="1" />
+            <leaf name="TEXT"         type="I32" />
+            <leaf name="NPC_ALIAS"    type="I32" />
           </branch>
         </branch>
         <!-- Targets -->
         <branch name="TARGET" count="8" atom="1">
-          <leaf name="TITLE"    type="I32" nullable="1" />
-          <leaf name="X"        type="I32" nullable="1" />
-          <leaf name="Y"        type="I32" nullable="1" />
+          <leaf name="TITLE"    type="I32" />
+          <leaf name="X"        type="I32" />
+          <leaf name="Y"        type="I32" />
         </branch>
         <!-- Indicate if the mission is finished (0-not 1-success 2-failed) -->
         <leaf name="FINISHED"       type="I2" />
@@ -202,7 +202,7 @@
         <!-- Historic -->
         <branch name="HISTO">
           <branch name="" count="30">
-            <leaf name="TEXT" type="I32" nullable="1" />
+            <leaf name="TEXT" type="I32" />
           </branch>
         </branch>
       </branch>
@@ -212,12 +212,13 @@
     <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
     <leaf name="QUALITY"              type="I10" />
     <leaf name="QUANTITY"             type="I10" />
+    <leaf name="CREATE_TIME"          type="I32" />
+    <leaf name="SERIAL"               type="I32" />
     <leaf name="USER_COLOR"           type="I3" />
-    <leaf name="CHARAC_BUFFS"         type="I8" />
     <leaf name="LOCKED"               type="I10" />
-    <leaf name="ACCESS"               type="I2" />
     <leaf name="WEIGHT"               type="I16" />
-    <leaf name="NAMEID"               type="I32" nullable="1" />
+    <leaf name="NAMEID"               type="I32" />
+    <leaf name="INFO_VERSION"         type="I8" />
     <leaf name="ENCHANT"              type="I10" />
     <leaf name="RM_CLASS_TYPE"        type="I3" />
     <leaf name="RM_FABER_STAT_TYPE"   type="I5" />
@@ -225,7 +226,6 @@
     <leaf name="PRICE"                type="I32" />
     <leaf name="RESALE_FLAG"          type="I2" />
     <leaf name="WORNED"               type="I1" />
-    <leaf name="INFO_VERSION"         type="I8" />
   -->
   <!-- gift from animator (dm) to player -->
   <branch name="DM_GIFT" bank="PLR">
@@ -242,45 +242,47 @@
     <branch name="GIVE">
       <branch name="" count="8">
         <!-- Common Item Data -->
-        <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <!-- <leaf name="LOCKED"               type="I10" /> -->
         <!-- <leaf name="ACCESS"               type="I2" /> --> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
-        <leaf name="NAMEID"               type="I32" nullable="1" /> <!-- 0 or special name of item -->
-        <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
+        <leaf name="NAMEID"               type="I32"/> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
+	<leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
     </branch>
     <branch name="RECEIVE">
       <branch name="" count="8">
         <!-- Common Item Data -->
-        <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <!-- <leaf name="LOCKED"               type="I10" /> -->
         <!-- <leaf name="ACCESS"               type="I2" /> --> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
-        <leaf name="NAMEID"               type="I32" nullable="1" /> <!-- 0 or special name of item -->
+        <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
     </branch>
     <leaf name="FORCE_REFUSE" type="I4" />
@@ -301,12 +303,13 @@
         <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <leaf name="LOCKED"               type="I10" />
-        <leaf name="ACCESS"               type="I2" /> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
         <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
@@ -314,30 +317,30 @@
         <leaf name="PRICE"                type="I32" />
         <leaf name="RESALE_FLAG"          type="I2" /> <!-- TBotChatResaleFlag -->
         <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
       </branch>
     </branch>
     <!-- MAX_INVENTORY_ANIMAL -->
-    <branch name="PACK_ANIMAL" count="4" clientonly="1">
+    <branch name="PACK_ANIMAL" count="7" clientonly="1">
       <branch name="" count="500">
         <!-- Common Item Data -->
         <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <leaf name="LOCKED"               type="I10" />
-        <leaf name="ACCESS"               type="I2" /> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
         <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <leaf name="PRICE"                type="I32" />
         <leaf name="RESALE_FLAG"          type="I2" /> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
     </branch>
     <branch name="EQUIP">
@@ -354,23 +357,24 @@
       <branch name="" count="16">
         <!-- client/inventory_manager.h MAX_TEMPINV_ENTRIES and egs/player_inv_temp.h TempInvSize -->
         <!-- Common Item Data -->
-        <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
-        <leaf name="QUALITY"              type="I10" />
-        <leaf name="QUANTITY"             type="I10" />
+        <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
+        <leaf name="QUALITY"              type="I12" />
+        <leaf name="QUANTITY"             type="I12" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <!-- <leaf name="LOCKED"               type="I10" /> -->
         <!-- <leaf name="ACCESS"               type="I2" /> --> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
-        <leaf name="NAMEID"               type="I32" nullable="1" /> <!-- 0 or special name of item -->
+        <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
       <leaf name="ENABLE_TAKE" type="I1" />
       <!-- Used only in forage -->
@@ -382,15 +386,17 @@
       <!-- session id -->
       <branch name="" count="16">
         <!-- Common Item Data -->
-        <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <!-- <leaf name="LOCKED"               type="I10" /> -->
         <!-- <leaf name="ACCESS"               type="I2" /> --> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
-        <leaf name="NAMEID"               type="I32" nullable="1" /> <!-- 0 or special name of item -->
+        <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
@@ -398,7 +404,6 @@
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
         <!-- <leaf name="WORNED"               type="I1" /> --> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
         <!-- Additionnal info -->
         <leaf name="NB_MEMBER" type="I4" />
         <!-- Number of team member who wants this item or phrase -->
@@ -423,20 +428,20 @@
         <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+        <leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <leaf name="LOCKED"               type="I10" />
-        <leaf name="ACCESS"               type="I2" /> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
         <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
     </branch>
     <leaf name="MONEY"      type="I64" />
@@ -448,37 +453,37 @@
     <!-- This is the malus ratio*50 (ie percentage/2) -->
     <branch name="BONUS">
       <branch name="" count="12">
-        <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="DISABLED" type="I1" />
-        <leaf name="DISABLED_TIME" type="I32" nullable="1" />
+        <leaf name="DISABLED_TIME" type="I32" />
       </branch>
     </branch>
     <branch name="MALUS">
       <branch name="" count="12">
-        <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+        <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="DISABLED" type="I1" />
-        <leaf name="DISABLED_TIME" type="I32" nullable="1" />
+        <leaf name="DISABLED_TIME" type="I32" />
       </branch>
     </branch>
   </branch>
   <branch name="DISABLE_CONSUMABLE" bank="PLR">
     <branch name="" count="12">
-      <leaf name="FAMILY" type="I16" nullable="1" />
+      <leaf name="FAMILY" type="I16" />
       <!-- Disable consumablel family -->
-      <leaf name="DISABLE_TIME" type="I32" nullable="1" />
+      <leaf name="DISABLE_TIME" type="I32" />
       <!-- End date of diable time in tick -->
     </branch>
   </branch>
   <!-- botchat texts -->
   <branch name="BOTCHAT" bank="PLR">
     <!-- intro for player gift -->
-    <leaf name="PLAYER_GIFT" type="I32" nullable="1" />
+    <leaf name="PLAYER_GIFT" type="I32" />
     <!-- intro for guild creation -->
-    <leaf name="CREATE_GUILD" type="I32" nullable="1" />
+    <leaf name="CREATE_GUILD" type="I32" />
     <!-- intro for trade window (pacts, action, item, or skills ..)-->
-    <leaf name="TRADE" type="I32" nullable="1" />
+    <leaf name="TRADE" type="I32" />
     <!-- intro for choose mission -->
-    <leaf name="CHOOSE_MISSION" type="I32" nullable="1" />
+    <leaf name="CHOOSE_MISSION" type="I32" />
     <!-- intro before the reward of the mission -->
     <!-- <leaf name="MISSION_END_REWARD" type="I32"/> -->
     <!-- text of the mission end -->
@@ -487,15 +492,15 @@
     <!-- <leaf name="NEWS" type="I32"/> -->
     <!-- choice dynamic missions -->
     <branch name="DM_CHOICE" count="3">
-      <leaf name="TITLE" type="I32" nullable="1" />
+      <leaf name="TITLE" type="I32" />
       <branch name="" count="8">
-        <leaf name="TEXT" type="I32" nullable="1" />
+        <leaf name="TEXT" type="I32" />
       </branch>
     </branch>
     <!-- title of dynamic mission -->
-    <leaf name="DM_TITLE" type="I32" nullable="1" />
+    <leaf name="DM_TITLE" type="I32" />
     <!-- description of dynamic mission -->
-    <leaf name="DM_DESCRIPTION" type="I32" nullable="1" />
+    <leaf name="DM_DESCRIPTION" type="I32" />
     <!-- the rolemaster type on 2 bits -->
     <leaf name="ROLEMASTER_TYPE" type="I2" />
   </branch>
@@ -511,8 +516,8 @@
                         if high order bit == 0 : guild icon : 58 low order bits - back:3 bits, symbol:6 bits, Invert:1 bit, color1&2:24 bits each 
                         if high order bit == 1 : low order bits = entry in the LIFT_ICONS::TLiftIcon enum
                         -->
-      <leaf name="ICON" type="I64" nullable="1" />
-      <leaf name="NAME" type="I32" nullable="1" />
+      <leaf name="ICON" type="I64" />
+      <leaf name="NAME" type="I32" />
     </branch>
   </branch>
   <branch name="CHOOSE_MISSIONS" bank="PLR" atom="1">
@@ -522,10 +527,10 @@
     <leaf name="HAS_NEXT" type="I1" />
     <!-- are there pages left ? -->
     <branch name="" count="8">
-      <leaf name="ICON" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="ICON" type="I32" cppType="NLMISC::CSheetId" />
       <!-- sheet id of a .mission_icon sheet -->
-      <leaf name="TEXT" type="I32" nullable="1" />
-      <leaf name="DETAIL_TEXT" type="I32" nullable="1" />
+      <leaf name="TEXT" type="I32" />
+      <leaf name="DETAIL_TEXT" type="I32" />
       <leaf name="PREREQ_STATE" type="I8" />
       <!-- game_share/mission_desc.h/TPreReqState -->
     </branch>
@@ -553,15 +558,17 @@
     <!-- 10000*factor to apply on item price, so if this value = 10000, factor is 1.0 -->
     <branch name="" count="8">
       <!-- Common Item Data -->
-      <leaf name="SHEET"                type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
       <leaf name="QUALITY"              type="I10" />
       <leaf name="QUANTITY"             type="I10" />
+      <leaf name="CREATE_TIME"          type="I32" />
+      <leaf name="SERIAL"               type="I32" />
       <leaf name="USER_COLOR"           type="I3" />
-      <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
       <!-- <leaf name="LOCKED"               type="I10" /> -->
       <!-- <leaf name="ACCESS"               type="I2" /> --> <!-- TGuildGrade access grade -->
       <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
-      <leaf name="NAMEID"               type="I32" nullable="1" /> <!-- 0 or special name of item -->
+      <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+      <leaf name="INFO_VERSION"         type="I8" />
       <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
       <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
       <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
@@ -569,13 +576,12 @@
       <!-- <leaf name="PRICE"                type="I32" /> -->
       <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
       <!-- <leaf name="WORNED"               type="I1" /> --> <!-- true if item is worned (show a red cross) -->
-      <leaf name="INFO_VERSION"         type="I8" />
       <!-- Muti currency info -->
       <leaf name="CURRENCY"             type="I4" />
       <!-- The currency type RYMSG::TTradeCurrency -->
       <leaf name="RRP_LEVEL"            type="I4" />
       <!-- For rrp curency, specify the rrp level -->
-      <leaf name="MONEY_SHEET"          type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="MONEY_SHEET"          type="I32" cppType="NLMISC::CSheetId" />
       <!-- For item curency, specify the item sheet -->
       <leaf name="BASE_SKILL"           type="I4" />
       <!-- For skill curency, specify the base skill as in EGSPD::CSPType::TSPType -->
@@ -586,7 +592,7 @@
       <!-- Special Trade -->
       <leaf name="PRICE_RETIRE"         type="I32" />
       <leaf name="RESALE_TIME_LEFT"     type="I16" />
-      <leaf name="VENDOR_NAMEID"        type="TEXT" nullable="1" />
+      <leaf name="VENDOR_NAMEID"        type="TEXT" />
       <!-- name id of player vendor -->
       <leaf name="FACTION_POINT_PRICE"  type="I32" />
       <!-- 0 for standard behaviour -->
@@ -600,41 +606,39 @@
   </branch>
   <branch name="BRICK_FAMILY" bank="PLR">
     <branch name="" count="1024">
-      <leaf name="BRICKS" type="PACKED" nullable="1" />
+      <leaf name="BRICKS" type="I64" />
     </branch>
   </branch>
-  <!--
   <branch name="FABER_PLANS" bank="PLR">
     <branch name="" count="64">
       <leaf name="KNOWN" type="I64" />
     </branch>
   </branch>
-  -->
   <branch name="MISSIONS" bank="PLR">
     <branch name="" count="15">
       <!-- see game_share/mission_desc.h TMissionType -->
       <leaf name="TYPE"           type="I2" />
-      <leaf name="ICON"           type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+      <leaf name="ICON"           type="I32" cppType="NLMISC::CSheetId" />
       <!-- sheet id of a .mission_icon sheet -->
-      <leaf name="TITLE"          type="I32" nullable="1" />
-      <leaf name="DETAIL_TEXT"    type="I32" nullable="1" />
+      <leaf name="TITLE"          type="I32" />
+      <leaf name="DETAIL_TEXT"    type="I32" />
       <!-- begin date in tick -->
-      <leaf name="BEGIN_DATE"     type="I32" nullable="1" />
+      <leaf name="BEGIN_DATE"     type="I32" />
       <!-- end date in tick -->
-      <leaf name="END_DATE"       type="I32" nullable="1" />
+      <leaf name="END_DATE"       type="I32" />
       <!-- true if the step are "OR" -->
       <leaf name="OR_STEPS"       type="I1" />
       <branch name="GOALS">
         <branch name="" count="20">
-          <leaf name="TEXT"         type="I32" nullable="1" />
-          <leaf name="NPC_ALIAS"    type="I32" nullable="1" />
+          <leaf name="TEXT"         type="I32" />
+          <leaf name="NPC_ALIAS"    type="I32" />
         </branch>
       </branch>
       <!-- Targets -->
       <branch name="TARGET" count="8" atom="1">
-        <leaf name="TITLE"    type="I32" nullable="1" />
-        <leaf name="X"        type="I32" nullable="1" />
-        <leaf name="Y"        type="I32" nullable="1" />
+        <leaf name="TITLE"    type="I32" />
+        <leaf name="X"        type="I32" />
+        <leaf name="Y"        type="I32" />
       </branch>
       <!-- Indicate if the mission is finished (0-not 1-success 2-failed) -->
       <leaf name="FINISHED" type="I2" />
@@ -645,7 +649,7 @@
       <!-- Historic -->
       <branch name="HISTO">
         <branch name="" count="30">
-          <leaf name="TEXT" type="I32" nullable="1" />
+          <leaf name="TEXT" type="I32" />
         </branch>
       </branch>
     </branch>
@@ -654,7 +658,7 @@
     <!-- The index of the phrase in the spell book that is being executed right now -->
     <leaf name="PHRASE"           type="I16" />
     <!-- If not a phrase in the speel book, give the associated brick sheet id -->
-    <leaf name="SHEET"            type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+    <leaf name="SHEET"            type="I32" cppType="NLMISC::CSheetId" />
     <!-- When the NEXT_COUNTER reach the one on client, reset -->
     <leaf name="NEXT_COUNTER"     type="I8" />
     <!-- When the CYCLE_COUNTER reach the one on client, reset -->
@@ -664,17 +668,17 @@
       <branch name="" count="10" atom="1">
         <!-- The Phrase Id -->
         <leaf name="PHRASE"         type="I16" />
+        <leaf name="COUNTER"        type="I4" />
         <!-- The cost each second -->
         <leaf name="HP_COST"        type="I16" />
         <leaf name="SAP_COST"       type="I16" />
         <leaf name="STA_COST"       type="I16" />
         <!-- Entity name -->
-        <leaf name="TARGET_NAME"    type="TEXT" nullable="1" />
+        <leaf name="TARGET_NAME"    type="TEXT" />
         <!-- Entity State -->
         <leaf name="TARGET_HP"      type="I7" />
         <leaf name="TARGET_SAP"     type="I7" />
         <leaf name="TARGET_STA"     type="I7" />
-        <leaf name="COUNTER"        type="I4" />
       </branch>
     </branch>
   </branch>
@@ -703,7 +707,7 @@
       <!-- Guild cult allegiance (CF TPVPClan enum (pvp_clan.h) -->
       <leaf name="CIV_ALLEGIANCE" type="I3" />
       <!-- Guild civilization allegiance (CF TPVPClan enum (pvp_clan.h) -->
-      <branch name="" count="6">
+      <branch name="" count="7">
         <!-- from fame.h & cpp -->
         <leaf name="VALUE" type="S8" />
         <!-- current value -->
@@ -716,13 +720,13 @@
     <branch name="MEMBERS">
       <!-- Guild Members -->
       <branch name="" count="256">
-        <leaf name="NAME" type="TEXT" nullable="1" />
+        <leaf name="NAME" type="TEXT" />
         <!-- player name -->
         <leaf name="GRADE" type="I3" />
         <!-- player grade-->
         <leaf name="ONLINE" type="I2" cppType="TCharConnectionState" />
         <!-- enum TCharConnectionState -->
-        <leaf name="ENTER_DATE" type="I32" nullable="1" />
+        <leaf name="ENTER_DATE" type="I32" />
         <!-- tick when player entered the guild-->
       </branch>
     </branch>
@@ -735,20 +739,20 @@
         <leaf name="SHEET"                type="I32" cppType="NLMISC::CSheetId" />
         <leaf name="QUALITY"              type="I10" />
         <leaf name="QUANTITY"             type="I10" />
+	<leaf name="CREATE_TIME"          type="I32" />
+        <leaf name="SERIAL"               type="I32" />
         <leaf name="USER_COLOR"           type="I3" />
-        <leaf name="CHARAC_BUFFS"         type="I8" /> <!-- flags based on TCharacteristics -->
         <leaf name="LOCKED"               type="I10" />
-        <leaf name="ACCESS"               type="I2" /> <!-- TGuildGrade access grade -->
         <leaf name="WEIGHT"               type="I16" /> <!-- weight. see DB_WEIGHT_SCALE -->
         <leaf name="NAMEID"               type="I32" /> <!-- 0 or special name of item -->
+        <leaf name="INFO_VERSION"         type="I8" />
         <leaf name="ENCHANT"              type="I10" /> <!-- 0=not enchanted, 1=enchanted nbcharge 0, 10=e. nbcharge 9 -->
         <leaf name="RM_CLASS_TYPE"        type="I3" /> <!-- RM_CLASS_TYPE enum -->
         <leaf name="RM_FABER_STAT_TYPE"   type="I6" /> <!-- RM_FABER_STAT_TYPE enum -->
         <leaf name="PREREQUISIT_VALID"    type="I1" />
         <!-- <leaf name="PRICE"                type="I32" /> -->
         <!-- <leaf name="RESALE_FLAG"          type="I2" /> --> <!-- TBotChatResaleFlag -->
-        <leaf name="WORNED"               type="I1" /> <!-- true if item is worned (show a red cross) -->
-        <leaf name="INFO_VERSION"         type="I8" />
+        <!-- <leaf name="WORNED"               type="I1" /> (FIXME: Add this) --> <!-- true if item is worned (show a red cross) -->
       </branch>
     </branch>
     <branch name="OUTPOST">
@@ -814,7 +818,7 @@
         <branch name="SQUAD_SHOP">
           <!-- list of squad that we can buy -->
           <branch name="" count="16">
-            <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+            <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
           </branch>
         </branch>
         <branch name="SQUADS">
@@ -824,11 +828,11 @@
                                         -->
           <branch name="SP" count="24">
             <!-- Spawned -->
-            <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+            <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
           </branch>
           <branch name="T" count="24">
             <!-- Training -->
-            <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+            <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
             <leaf name="SPAWN" type="I4" />
             <!-- Index in SQUAD_SPAWN_ZONE list -->
           </branch>
@@ -839,7 +843,7 @@
         <branch name="BUILDINGS">
           <!-- list of buildings on the outpost -->
           <branch name="" count="4">
-            <leaf name="SHEET" type="I32" nullable="1" cppType="NLMISC::CSheetId" />
+            <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
           </branch>
         </branch>
       </branch>
@@ -974,13 +978,13 @@
   <branch name="PACK_ANIMAL" bank="PLR">
     <!-- beasts -->
     <!-- MAX_INVENTORY_ANIMAL -->
-    <branch name="BEAST" count="4" atomic="1">
+    <branch name="BEAST" count="7" atomic="1">
       <!-- Atomic, for correct Bar Management on client -->
       <leaf name="UID" type="I20" />
       <!-- Entity Unique Identifier -->
       <leaf name="TYPE" type="I4" />
       <!-- see ANIMAL_TYPE -->
-      <leaf name="STATUS" type="I4" />
+      <leaf name="STATUS" type="I5" />
       <!-- see ANIMAL_STATUS -->
       <leaf name="HP" type="I7" />
       <leaf name="BULK_MAX" type="I32" />
@@ -988,7 +992,7 @@
       <!-- X uint32 << 32 | Y uint32 -->
       <leaf name="HUNGER" type="I5" />
       <leaf name="DESPAWN" type="I7" />
-      <leaf name="NAME" type="I32" nullable="1" is_true="1" />
+      <leaf name="NAME" type="I32" is_true="1" />
     </branch>
   </branch>
   <branch name="DEBUG_INFO" bank="PLR">
@@ -1035,7 +1039,7 @@
     <!-- value where trade doesn't work anymore -->
     <leaf name="THRESHOLD_KOS" type="S8" />
     <!-- value where the guards kill you on sight -->
-    <branch name="PLAYER" count="6">
+    <branch name="PLAYER" count="7">
       <!-- from fame.h & cpp -->
       <leaf name="VALUE" type="S8" />
       <!-- current value -->
@@ -1060,9 +1064,9 @@
   <!-- DynChat channels -->
   <branch name="DYN_CHAT" bank="PLR">
     <branch name="CHANNEL" count="8" atom="1">
-      <leaf name="NAME" type="I32" nullable="1" />
+      <leaf name="NAME" type="I32" />
       <!-- channel not available if anme is 0 -->
-      <leaf name="ID" type="I64" nullable="1" />
+      <leaf name="ID" type="I64" />
       <!-- unique ID of channel (eid) -->
       <leaf name="WRITE_RIGHT" type="I1" />
     </branch>
diff --git a/ryzom/common/data_common/msg.xml b/ryzom/common/data_common/msg.xml
index f4f001629..fe259203e 100644
--- a/ryzom/common/data_common/msg.xml
+++ b/ryzom/common/data_common/msg.xml
@@ -43,7 +43,7 @@
     <leaf name="INIT_BANK" />
     <leaf name="RESET_BANK" />
   </branch>
-  <leaf name="POSITION" sendto="GPMS" format="u32 s32 s32 s32 f" description="the client moves at $u32 to ($i32,$i32,$i32) with heading $f" />
+  <leaf name="POSITION" sendto="GPMS" format="s32 s32 s32 f" usecycle="yes" description="the client moves to ($i32,$i32,$i32) with heading $f" />
   <branch name="HARVEST">
     <leaf name="DEPOSIT" sendto="EGS" format="u16" description="the client shearch a deposit for harvest/digging (param = skill used)" />
     <leaf name="CORPSE" />
@@ -166,9 +166,6 @@
     <leaf name="CLOSE_ROOM_INVENTORY" sendto="" description="EGS wants to close the user inventory" />
     <leaf name="USE_ITEM" sendto="EGS" format="u16" description="client wants to use teleport in the specified bag slot or consume an item to trigger its effect" />
     <leaf name="STOP_USE_XP_CAT" sendto="EGS" format="b" description="client wants to stop using xp catalyser" />
-    <leaf name="LOCK" sendto="EGS" format="u8 u16 b" description="lock or unlock an item. inventory, slot, lock" />
-    <leaf name="RENAME" sendto="EGS" format="u8 u16 b s" description="change an item name to a phrase or literal. inventory, slot, literal, name" />
-    <leaf name="WRITE" sendto="EGS" format="u8 u16 s" description="wrrite a crafter's message. inventory, slot, text" />
   </branch>
   <branch name="TP">
     <leaf name="RESPAWN" sendto="EGS" format="" description="teleport the player to his respawn point" />
@@ -250,6 +247,7 @@
     <leaf name="AFK" sendto="EGS" format="b" description="AFK command is sent to EGS" />
     <leaf name="RANDOM" sendto="EGS" format="s16 s16" description="client asks EGS to roll a dice and tell result around" />
     <leaf name="GUILDMOTD" sendto="EGS" format="s" description="client asks EGS to set the guild message of the day" />
+    <leaf name="AUTOPACT" sendto="EGS" format="u8" description="client want set AUTOPACT to TRUE or FALSE" />
   </branch>
   <!-- MP Exotic Price Evaluation (discontinued) -->
   <branch name="MP_EVAL">
@@ -349,7 +347,6 @@
     <leaf name="TAKE_MONEY" sendto="EGS" format="u64 u16" description="take money from guild warehouse" />
     <leaf name="OPEN_INVENTORY" sendto="" format="" description="open the guild inventory" />
     <leaf name="CLOSE_INVENTORY" sendto="" format="" description="close the guild inventory" />
-    <leaf name="ITEM_ACCESS" sendto="EGS" format="u16 u8" description="grant a guild access grade to an item in the guild inventory. slot, grade" />
   </branch>
   <branch name="OUTPOST">
     <leaf name="GIVEUP_OUTPOST" sendto="EGS" format="u32" description="Give up an outpost (outpostSHEET)" />
@@ -463,12 +460,10 @@
     <leaf name="BARS" format="u8 s16 s16 s16 s16" description="server update the players Bars (fast message) $msgNumber $hp $sap $sta $focus" />
     <leaf name="POPUP" format="u32 u32" description="server display an important info message on the client (u32 titleDynString u32 textDynString)" />
   </branch>
-  <!--
   <branch name="EVENT">
     <leaf name="SET_ITEM_CUSTOM_TEXT" sendto="EGS" format="u32 u32 uc" description="set the cursom of the item in inventory $inventory in slot $slot to $text" />
     <leaf name="DUMMY" description="stupid server....." />
   </branch>
-  -->
   <branch name="TOTEM">
     <leaf name="BUILD" sendto="EGS" format="" description="client has built a totem" />
     <leaf name="DUMMY" description="stupid server....." />