diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5fec53417..72efd6940 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-23  Dan Winship  <danw@novell.com>
+
+	* en/Gda/*xml: rototilled by parser changes
+
 2005-02-18  Mike Kestner  <mkestner@novell.com>
 
 	* en/Gtk/ClipboardGetFunc.xml : fix param list.
diff --git a/doc/en/Gda/Field.xml b/doc/en/Gda/Field.xml
index 08fc398b0..675d9046b 100644
--- a/doc/en/Gda/Field.xml
+++ b/doc/en/Gda/Field.xml
@@ -2,19 +2,14 @@
   <TypeSignature Language="C#" Value="public sealed struct Field" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
   <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
   <Docs>
-    <summary>
-      <para>
-Management of database fields.
-</para>
-    </summary>
+    <summary>To be added</summary>
     <remarks>To be added</remarks>
   </Docs>
   <Base>
@@ -36,6 +31,19 @@ Management of database fields.
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ActualSize">
+      <MemberSignature Language="C#" Value="public int ActualSize;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="New">
       <MemberSignature Language="C#" Value="public static Gda.Field New (IntPtr raw);" />
       <MemberType>Method</MemberType>
@@ -53,7 +61,7 @@ Management of database fields.
       </Docs>
     </Member>
     <Member MemberName="value">
-      <MemberSignature Language="C#" Value="public Gda.Value value { get; };" />
+      <MemberSignature Language="C#" Value="public Gda.Value value { set; get; };" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>Gda.Value</ReturnType>
@@ -65,19 +73,6 @@ Management of database fields.
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="ActualSize">
-      <MemberSignature Language="C#" Value="public int ActualSize;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="attributes">
       <MemberSignature Language="C#" Value="public Gda.FieldAttributes attributes { set; get; };" />
       <MemberType>Property</MemberType>
diff --git a/doc/en/Gda/Value.xml b/doc/en/Gda/Value.xml
index e120ff540..9ea4a606c 100644
--- a/doc/en/Gda/Value.xml
+++ b/doc/en/Gda/Value.xml
@@ -1,10 +1,9 @@
 <Type Name="Value" FullName="Gda.Value">
-  <TypeSignature Language="C#" Value="public sealed struct Value" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class Value : GLib.Opaque, IWrapper" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,377 +13,15 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>GLib.Opaque</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.Value Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.Value New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewBigint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewBigint (long val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Int64" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Int64" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewBiguint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewBiguint (ulong val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.UInt64" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.UInt64" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewBinary">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewBinary (IntPtr val, long size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.IntPtr" />
-        <Parameter Name="size" Type="System.Int64" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.IntPtr" /></param>
-        <param name="size">a <see cref="T:System.Int64" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewBlob">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewBlob (Gda.Blob val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Blob" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Blob" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewBoolean">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewBoolean (bool val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Boolean" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Boolean" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewDate">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewDate (Gda.Date val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Date" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Date" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewDouble">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewDouble (double val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Double" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Double" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewFromString">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewFromString (string as_string, Gda.ValueType type);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="as_string" Type="System.String" />
-        <Parameter Name="type" Type="Gda.ValueType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="as_string">a <see cref="T:System.String" /></param>
-        <param name="type">a <see cref="T:Gda.ValueType" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewGeometricPoint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewGeometricPoint (Gda.GeometricPoint val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.GeometricPoint" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.GeometricPoint" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewGobject">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewGobject (GLib.Object val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="GLib.Object" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:GLib.Object" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewInteger">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewInteger (int val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Int32" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Int32" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewList">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewList (GLib.List val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="GLib.List" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:GLib.List" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewMoney">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewMoney (Gda.Money val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Money" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Money" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewNull">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewNull ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewNumeric">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewNumeric (Gda.Numeric val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Numeric" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Numeric" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewSingle">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewSingle (float val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Single" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Single" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewSmallint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewSmallint (short val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Int16" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Int16" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewSmalluint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewSmalluint (ushort val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.UInt16" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.UInt16" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewString">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewString (string val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewTime">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewTime (Gda.Time val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Time" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Time" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewTimestamp">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewTimestamp (Gda.Timestamp val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.Timestamp" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.Timestamp" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewTinyint">
       <MemberSignature Language="C#" Value="public static Gda.Value NewTinyint (string val);" />
       <MemberType>Method</MemberType>
@@ -401,54 +38,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewTinyuint">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewTinyuint (byte val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.Byte" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.Byte" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewType">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewType (Gda.ValueType val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="Gda.ValueType" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:Gda.ValueType" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewUinteger">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewUinteger (uint val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.UInt32" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.UInt32" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="SetBinary">
       <MemberSignature Language="C#" Value="public void SetBinary (IntPtr val, long size);" />
       <MemberType>Method</MemberType>
@@ -482,6 +71,22 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetBinary">
+      <MemberSignature Language="C#" Value="public IntPtr GetBinary (out long size);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.IntPtr</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="size" Type="System.Int64&amp;" RefType="out" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="size">a <see cref="T:System.Int64" /></param>
+        <returns>a <see cref="T:System.IntPtr" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetFromValue">
       <MemberSignature Language="C#" Value="public bool SetFromValue (Gda.Value from);" />
       <MemberType>Method</MemberType>
@@ -537,7 +142,7 @@
       <Docs>
         <summary>To be added</summary>
         <param name="as_string">a <see cref="T:System.String" /></param>
-        <param name="type">a <see cref="T:Gda.ValueType" /></param>
+        <param name="type">a <see cref="T:System.Int32" /></param>
         <returns>a <see cref="T:System.Boolean" /></returns>
         <remarks>To be added</remarks>
       </Docs>
@@ -566,6 +171,371 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (long val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Int64" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Int64" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (ulong val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.UInt64" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.UInt64" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (IntPtr val, long size);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.IntPtr" />
+        <Parameter Name="size" Type="System.Int64" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.IntPtr" /></param>
+        <param name="size">a <see cref="T:System.Int64" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Blob val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Blob" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Blob" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (bool val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Boolean" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Date val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Date" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Date" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (double val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Double" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Double" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (string as_string, Gda.ValueType type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="as_string" Type="System.String" />
+        <Parameter Name="type" Type="Gda.ValueType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="as_string">a <see cref="T:System.String" /></param>
+        <param name="type">a <see cref="T:System.Int32" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.GeometricPoint val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.GeometricPoint" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.GeometricPoint" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (GLib.Object val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="GLib.Object" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:GLib.Object" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (int val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Int32" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (GLib.List val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="GLib.List" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:GLib.List" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Money val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Money" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Money" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Numeric val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Numeric" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Numeric" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (float val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Single" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (short val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Int16" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Int16" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (ushort val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.UInt16" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.UInt16" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (string val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Time val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Time" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Time" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.Timestamp val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.Timestamp" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:Gda.Timestamp" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (DateTime val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.DateTime" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.DateTime" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (byte val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Byte" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Byte" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (Gda.ValueType val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="Gda.ValueType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.Int32" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (uint val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.UInt32" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="val">a <see cref="T:System.UInt32" /></param>
+        <returns>a <see cref="T:Gda.Value" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Vtype">
       <MemberSignature Language="C#" Value="public Gda.ValueType Vtype { set; get; };" />
       <MemberType>Property</MemberType>
@@ -644,6 +614,19 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GdaType">
+      <MemberSignature Language="C#" Value="public Gda.ValueType GdaType { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>Gda.ValueType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.ValueType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Single">
       <MemberSignature Language="C#" Value="public float Single { set; get; };" />
       <MemberType>Property</MemberType>
@@ -670,6 +653,19 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="IsNull">
+      <MemberSignature Language="C#" Value="public bool IsNull { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Tinyint">
       <MemberSignature Language="C#" Value="public string Tinyint { set; get; };" />
       <MemberType>Property</MemberType>
@@ -813,6 +809,19 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="IsNumber">
+      <MemberSignature Language="C#" Value="public bool IsNumber { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:System.Boolean" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Uinteger">
       <MemberSignature Language="C#" Value="public uint Uinteger { set; get; };" />
       <MemberType>Property</MemberType>
@@ -852,362 +861,5 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="GetBinary">
-      <MemberSignature Language="C#" Value="public IntPtr GetBinary (out long size);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.IntPtr</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="size" Type="System.Int64&amp;" RefType="out" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="size">a <see cref="T:System.Int64&amp;" /></param>
-        <returns>a <see cref="T:System.IntPtr" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsNull">
-      <MemberSignature Language="C#" Value="public bool IsNull { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsNumber">
-      <MemberSignature Language="C#" Value="public bool IsNumber { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.Boolean" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Type">
-      <MemberSignature Language="C#" Value="public Gda.ValueType Type;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.ValueType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VBigint">
-      <MemberSignature Language="C#" Value="public long VBigint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VBiguint">
-      <MemberSignature Language="C#" Value="public ulong VBiguint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt64</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VBlob">
-      <MemberSignature Language="C#" Value="public Gda.Blob VBlob;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Blob</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VBoolean">
-      <MemberSignature Language="C#" Value="public bool VBoolean;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VDate">
-      <MemberSignature Language="C#" Value="public Gda.Date VDate;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Date</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VDouble">
-      <MemberSignature Language="C#" Value="public double VDouble;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Double</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VPoint">
-      <MemberSignature Language="C#" Value="public Gda.GeometricPoint VPoint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.GeometricPoint</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VInteger">
-      <MemberSignature Language="C#" Value="public int VInteger;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VMoney">
-      <MemberSignature Language="C#" Value="public Gda.Money VMoney;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Money</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VNumeric">
-      <MemberSignature Language="C#" Value="public Gda.Numeric VNumeric;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Numeric</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VSingle">
-      <MemberSignature Language="C#" Value="public float VSingle;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Single</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VSmallint">
-      <MemberSignature Language="C#" Value="public short VSmallint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int16</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VSmalluint">
-      <MemberSignature Language="C#" Value="public ushort VSmalluint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt16</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VString">
-      <MemberSignature Language="C#" Value="public string VString;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VTime">
-      <MemberSignature Language="C#" Value="public Gda.Time VTime;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Time</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VTimestamp">
-      <MemberSignature Language="C#" Value="public Gda.Timestamp VTimestamp;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Timestamp</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VTinyint">
-      <MemberSignature Language="C#" Value="public string VTinyint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.String</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VTinyuint">
-      <MemberSignature Language="C#" Value="public byte VTinyuint;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Byte</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VType">
-      <MemberSignature Language="C#" Value="public Gda.ValueType VType;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.ValueType</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="VUinteger">
-      <MemberSignature Language="C#" Value="public uint VUinteger;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>System.UInt32</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewTimestampFromTimet">
-      <MemberSignature Language="C#" Value="public static Gda.Value NewTimestampFromTimet (DateTime val);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.Value</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="val" Type="System.DateTime" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="val">a <see cref="T:System.DateTime" /></param>
-        <returns>a <see cref="T:Gda.Value" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="GdaType">
-      <MemberSignature Language="C#" Value="public Gda.ValueType GdaType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.ValueType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.ValueType" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="BinaryLength">
-      <MemberSignature Language="C#" Value="public long BinaryLength { set; get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Int64</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:System.Int64" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
   </Members>
-</Type>
+</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlAtom.xml b/doc/en/Gda/XqlAtom.xml
index b1c852e39..96c817b27 100644
--- a/doc/en/Gda/XqlAtom.xml
+++ b/doc/en/Gda/XqlAtom.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlAtom" FullName="Gda.XqlAtom">
-  <TypeSignature Language="C#" Value="public sealed struct XqlAtom" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlAtom : Gda.XqlItem, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlItem</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlAtom Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlAtom New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlAtom (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlAtom" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlAtom (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlAtom New (string tag);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlAtom (string tag);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="tag" Type="System.String" />
       </Parameters>
@@ -71,22 +86,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlAtom" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlitem">
-      <MemberSignature Language="C#" Value="public Gda.XqlItem Xqlitem;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlAtomClass.xml b/doc/en/Gda/XqlAtomClass.xml
deleted file mode 100644
index f18bf23b7..000000000
--- a/doc/en/Gda/XqlAtomClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlAtomClass" FullName="Gda.XqlAtomClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlAtomClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlAtomClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlAtomClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlAtomClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlItemClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlBin.xml b/doc/en/Gda/XqlBin.xml
index c3831daa1..effef0c68 100644
--- a/doc/en/Gda/XqlBin.xml
+++ b/doc/en/Gda/XqlBin.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlBin" FullName="Gda.XqlBin">
-  <TypeSignature Language="C#" Value="public sealed struct XqlBin" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlBin : Gda.XqlItem, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,73 +13,18 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlItem</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlBin" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin New (string tag, string sqlfmt, string sqlop);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="tag" Type="System.String" />
-        <Parameter Name="sqlfmt" Type="System.String" />
-        <Parameter Name="sqlop" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="tag">a <see cref="T:System.String" /></param>
-        <param name="sqlfmt">a <see cref="T:System.String" /></param>
-        <param name="sqlop">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gda.XqlBin" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewExists">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin NewExists ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlBin" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewHaving">
       <MemberSignature Language="C#" Value="public static Gda.XqlBin NewHaving ();" />
       <MemberType>Method</MemberType>
@@ -94,22 +38,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewHavingWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin NewHavingWithData (Gda.XqlItem data);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="data" Type="Gda.XqlItem" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="data">a <see cref="T:Gda.XqlItem" /></param>
-        <returns>a <see cref="T:Gda.XqlBin" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewIntersect">
       <MemberSignature Language="C#" Value="public static Gda.XqlBin NewIntersect ();" />
       <MemberType>Method</MemberType>
@@ -262,12 +190,93 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBin NewWithData (string tag, string sqlfmt, string sqlop, Gda.XqlItem child);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlBin (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlBin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlBin (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlBin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlBin (string tag, string sqlfmt, string sqlop);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="tag" Type="System.String" />
+        <Parameter Name="sqlfmt" Type="System.String" />
+        <Parameter Name="sqlop" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="tag">a <see cref="T:System.String" /></param>
+        <param name="sqlfmt">a <see cref="T:System.String" /></param>
+        <param name="sqlop">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:Gda.XqlBin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlBin ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlBin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlBin (Gda.XqlItem data);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="data" Type="Gda.XqlItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="data">a <see cref="T:Gda.XqlItem" /></param>
+        <returns>a <see cref="T:Gda.XqlBin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlBin (string tag, string sqlfmt, string sqlop, Gda.XqlItem child);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="tag" Type="System.String" />
         <Parameter Name="sqlfmt" Type="System.String" />
@@ -284,6 +293,19 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GType">
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Child">
       <MemberSignature Language="C#" Value="public Gda.XqlItem Child { set; get; };" />
       <MemberType>Property</MemberType>
@@ -297,31 +319,5 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlBin" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlitem">
-      <MemberSignature Language="C#" Value="public Gda.XqlItem Xqlitem;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlBinClass.xml b/doc/en/Gda/XqlBinClass.xml
deleted file mode 100644
index 72e936415..000000000
--- a/doc/en/Gda/XqlBinClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlBinClass" FullName="Gda.XqlBinClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlBinClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBinClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlBinClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlBinClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlItemClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlColumn.xml b/doc/en/Gda/XqlColumn.xml
index 068a96963..38b66e584 100644
--- a/doc/en/Gda/XqlColumn.xml
+++ b/doc/en/Gda/XqlColumn.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlColumn" FullName="Gda.XqlColumn">
-  <TypeSignature Language="C#" Value="public sealed struct XqlColumn" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlColumn : Gda.XqlAtom, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlAtom</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumn Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlColumn</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumn New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlColumn</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlColumn (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlColumn" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlColumn (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumn New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlColumn</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlColumn ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumn NewWithData (int num, bool asc);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlColumn</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlColumn (int num, bool asc);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="num" Type="System.Int32" />
         <Parameter Name="asc" Type="System.Boolean" />
@@ -86,22 +99,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlColumn" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlatom">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtom Xqlatom;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlColumnClass.xml b/doc/en/Gda/XqlColumnClass.xml
deleted file mode 100644
index 86bf38b52..000000000
--- a/doc/en/Gda/XqlColumnClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlColumnClass" FullName="Gda.XqlColumnClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlColumnClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumnClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlColumnClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlColumnClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlColumnClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlColumnClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtomClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlConst.xml b/doc/en/Gda/XqlConst.xml
index f81bd355a..8f941ef06 100644
--- a/doc/en/Gda/XqlConst.xml
+++ b/doc/en/Gda/XqlConst.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlConst" FullName="Gda.XqlConst">
-  <TypeSignature Language="C#" Value="public sealed struct XqlConst" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlConst : Gda.XqlAtom, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlAtom</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConst Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlConst</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConst New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlConst</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlConst (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlConst" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlConst (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConst New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlConst</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlConst ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConst NewWithData (string value, string alias, string type, string is_null);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlConst</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlConst (string value, string alias, string type, string is_null);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="value" Type="System.String" />
         <Parameter Name="alias" Type="System.String" />
@@ -90,22 +103,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlConst" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlatom">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtom Xqlatom;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlConstClass.xml b/doc/en/Gda/XqlConstClass.xml
deleted file mode 100644
index ffc65346b..000000000
--- a/doc/en/Gda/XqlConstClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlConstClass" FullName="Gda.XqlConstClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlConstClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConstClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlConstClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlConstClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlConstClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlConstClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtomClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlDelete.xml b/doc/en/Gda/XqlDelete.xml
index 9dc9b91b7..1c150d72c 100644
--- a/doc/en/Gda/XqlDelete.xml
+++ b/doc/en/Gda/XqlDelete.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlDelete" FullName="Gda.XqlDelete">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDelete" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlDelete : Gda.XqlDml, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlDml</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDelete Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlDelete</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDelete New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDelete</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlDelete (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlDelete" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDelete (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDelete New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDelete</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDelete ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -68,22 +83,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlDelete" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldml">
-      <MemberSignature Language="C#" Value="public Gda.XqlDml Xqldml;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlDeleteClass.xml b/doc/en/Gda/XqlDeleteClass.xml
deleted file mode 100644
index 36220981a..000000000
--- a/doc/en/Gda/XqlDeleteClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlDeleteClass" FullName="Gda.XqlDeleteClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDeleteClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDeleteClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDeleteClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDeleteClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDeleteClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlDeleteClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlDmlClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlDml.xml b/doc/en/Gda/XqlDml.xml
index 638d1b899..c6bfcd572 100644
--- a/doc/en/Gda/XqlDml.xml
+++ b/doc/en/Gda/XqlDml.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlDml" FullName="Gda.XqlDml">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDml" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlDml : Gda.XqlItem, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,37 +13,27 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlItem</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDml Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDml New (IntPtr raw);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlDml" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -225,6 +214,45 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlDml (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlDml" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDml (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlDml" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlDml ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlDml" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
@@ -232,22 +260,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlDml" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldml">
-      <MemberSignature Language="C#" Value="public Gda.XqlItem Xqldml;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlDmlClass.xml b/doc/en/Gda/XqlDmlClass.xml
deleted file mode 100644
index b90359399..000000000
--- a/doc/en/Gda/XqlDmlClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlDmlClass" FullName="Gda.XqlDmlClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDmlClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDmlClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDmlClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlDmlClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlItemClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlDual.xml b/doc/en/Gda/XqlDual.xml
index b894c7edd..47d308241 100644
--- a/doc/en/Gda/XqlDual.xml
+++ b/doc/en/Gda/XqlDual.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlDual" FullName="Gda.XqlDual">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDual" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlDual : Gda.XqlItem, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,91 +13,18 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlItem</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlDual" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual New (string tag, string sqlfmt, string sqlop);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="tag" Type="System.String" />
-        <Parameter Name="sqlfmt" Type="System.String" />
-        <Parameter Name="sqlop" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="tag">a <see cref="T:System.String" /></param>
-        <param name="sqlfmt">a <see cref="T:System.String" /></param>
-        <param name="sqlop">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gda.XqlDual" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewEq">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual NewEq ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlDual" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewEqWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual NewEqWithData (Gda.XqlItem left, Gda.XqlItem right);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="left" Type="Gda.XqlItem" />
-        <Parameter Name="right" Type="Gda.XqlItem" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="left">a <see cref="T:Gda.XqlItem" /></param>
-        <param name="right">a <see cref="T:Gda.XqlItem" /></param>
-        <returns>a <see cref="T:Gda.XqlDual" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewGe">
       <MemberSignature Language="C#" Value="public static Gda.XqlDual NewGe ();" />
       <MemberType>Method</MemberType>
@@ -347,12 +273,95 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDual NewWithData (string tag, string sqlfmt, string sqlop, Gda.XqlItem left, Gda.XqlItem right);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlDual (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlDual" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDual (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlDual" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDual (string tag, string sqlfmt, string sqlop);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="tag" Type="System.String" />
+        <Parameter Name="sqlfmt" Type="System.String" />
+        <Parameter Name="sqlop" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="tag">a <see cref="T:System.String" /></param>
+        <param name="sqlfmt">a <see cref="T:System.String" /></param>
+        <param name="sqlop">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:Gda.XqlDual" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDual ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlDual" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDual (Gda.XqlItem left, Gda.XqlItem right);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="left" Type="Gda.XqlItem" />
+        <Parameter Name="right" Type="Gda.XqlItem" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="left">a <see cref="T:Gda.XqlItem" /></param>
+        <param name="right">a <see cref="T:Gda.XqlItem" /></param>
+        <returns>a <see cref="T:Gda.XqlDual" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlDual (string tag, string sqlfmt, string sqlop, Gda.XqlItem left, Gda.XqlItem right);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="tag" Type="System.String" />
         <Parameter Name="sqlfmt" Type="System.String" />
@@ -371,6 +380,19 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GType">
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Left">
       <MemberSignature Language="C#" Value="public Gda.XqlItem Left { get; };" />
       <MemberType>Property</MemberType>
@@ -397,31 +419,5 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlDual" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldual">
-      <MemberSignature Language="C#" Value="public Gda.XqlItem Xqldual;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlDualClass.xml b/doc/en/Gda/XqlDualClass.xml
deleted file mode 100644
index 1eab997e8..000000000
--- a/doc/en/Gda/XqlDualClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlDualClass" FullName="Gda.XqlDualClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlDualClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDualClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDualClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlDualClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDualClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlDualClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlItemClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlField.xml b/doc/en/Gda/XqlField.xml
index 7927149bc..c7e9a82e3 100644
--- a/doc/en/Gda/XqlField.xml
+++ b/doc/en/Gda/XqlField.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlField" FullName="Gda.XqlField">
-  <TypeSignature Language="C#" Value="public sealed struct XqlField" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlField : Gda.XqlAtom, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlAtom</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlField Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlField</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlField New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlField</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlField (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlField" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlField (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlField New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlField</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlField ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlField NewWithData (string source, string name, string alias);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlField</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlField (string source, string name, string alias);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="source" Type="System.String" />
         <Parameter Name="name" Type="System.String" />
@@ -88,22 +101,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlField" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlatom">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtom Xqlatom;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlFieldClass.xml b/doc/en/Gda/XqlFieldClass.xml
deleted file mode 100644
index 0eca7a247..000000000
--- a/doc/en/Gda/XqlFieldClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlFieldClass" FullName="Gda.XqlFieldClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlFieldClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFieldClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFieldClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFieldClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFieldClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlFieldClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtomClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlFunc.xml b/doc/en/Gda/XqlFunc.xml
index 151e0edf1..df7d3bbfb 100644
--- a/doc/en/Gda/XqlFunc.xml
+++ b/doc/en/Gda/XqlFunc.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlFunc" FullName="Gda.XqlFunc">
-  <TypeSignature Language="C#" Value="public sealed struct XqlFunc" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlFunc : Gda.XqlBin, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,70 +13,27 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlBin</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFunc Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFunc</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFunc New (IntPtr raw);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlFunc</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFunc New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFunc</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFunc NewWithData (string name, string alias, string aggregate);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFunc</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="name" Type="System.String" />
-        <Parameter Name="alias" Type="System.String" />
-        <Parameter Name="aggregate" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="name">a <see cref="T:System.String" /></param>
-        <param name="alias">a <see cref="T:System.String" /></param>
-        <param name="aggregate">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -119,6 +75,63 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlFunc (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlFunc (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlFunc ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlFunc (string name, string alias, string aggregate);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="name" Type="System.String" />
+        <Parameter Name="alias" Type="System.String" />
+        <Parameter Name="aggregate" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="name">a <see cref="T:System.String" /></param>
+        <param name="alias">a <see cref="T:System.String" /></param>
+        <param name="aggregate">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:Gda.XqlFunc" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
@@ -126,22 +139,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlFunc" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlbin">
-      <MemberSignature Language="C#" Value="public Gda.XqlBin Xqlbin;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlFuncClass.xml b/doc/en/Gda/XqlFuncClass.xml
deleted file mode 100644
index 91614a11b..000000000
--- a/doc/en/Gda/XqlFuncClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlFuncClass" FullName="Gda.XqlFuncClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlFuncClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFuncClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFuncClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlFuncClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlFuncClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlFuncClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlBinClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlInsert.xml b/doc/en/Gda/XqlInsert.xml
index ee2203f99..9313962ff 100644
--- a/doc/en/Gda/XqlInsert.xml
+++ b/doc/en/Gda/XqlInsert.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlInsert" FullName="Gda.XqlInsert">
-  <TypeSignature Language="C#" Value="public sealed struct XqlInsert" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlInsert : Gda.XqlDml, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlDml</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlInsert Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlInsert</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlInsert New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlInsert</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlInsert (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlInsert" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlInsert (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlInsert New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlInsert</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlInsert ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -68,22 +83,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlInsert" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldml">
-      <MemberSignature Language="C#" Value="public Gda.XqlDml Xqldml;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlInsertClass.xml b/doc/en/Gda/XqlInsertClass.xml
deleted file mode 100644
index 716818083..000000000
--- a/doc/en/Gda/XqlInsertClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlInsertClass" FullName="Gda.XqlInsertClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlInsertClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlInsertClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlInsertClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlInsertClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlInsertClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlInsertClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlDmlClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlItem.xml b/doc/en/Gda/XqlItem.xml
index c6c48ac81..40f64b153 100644
--- a/doc/en/Gda/XqlItem.xml
+++ b/doc/en/Gda/XqlItem.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlItem" FullName="Gda.XqlItem">
-  <TypeSignature Language="C#" Value="public sealed struct XqlItem" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlItem : GLib.Object, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,37 +13,27 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlItem Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlItem New (IntPtr raw);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlItem" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -187,6 +176,58 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlItem (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlItem" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlItem (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlItem" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlItem ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlItem" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="GType">
+      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="Tag">
       <MemberSignature Language="C#" Value="public string Tag { set; get; };" />
       <MemberType>Property</MemberType>
@@ -213,31 +254,5 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="GType">
-      <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.GType</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlItem" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Object">
-      <MemberSignature Language="C#" Value="public GLib.Object Object;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.Object</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
   </Members>
 </Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlItemClass.xml b/doc/en/Gda/XqlItemClass.xml
deleted file mode 100644
index fcc9c572f..000000000
--- a/doc/en/Gda/XqlItemClass.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Type Name="XqlItemClass" FullName="Gda.XqlItemClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlItemClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlItemClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlItemClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlItemClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlJoin.xml b/doc/en/Gda/XqlJoin.xml
index c703e8822..936924b2b 100644
--- a/doc/en/Gda/XqlJoin.xml
+++ b/doc/en/Gda/XqlJoin.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlJoin" FullName="Gda.XqlJoin">
-  <TypeSignature Language="C#" Value="public sealed struct XqlJoin" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlJoin : Gda.XqlDual, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlDual</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoin Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlJoin</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoin New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlJoin</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlJoin (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlJoin" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlJoin (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoin New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlJoin</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlJoin ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoin NewWithData (Gda.XqlItem target, Gda.XqlItem cond, string type);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlJoin</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlJoin (Gda.XqlItem target, Gda.XqlItem cond, string type);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="target" Type="Gda.XqlItem" />
         <Parameter Name="cond" Type="Gda.XqlItem" />
@@ -88,22 +101,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlJoin" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldual">
-      <MemberSignature Language="C#" Value="public Gda.XqlDual Xqldual;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDual</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlJoinClass.xml b/doc/en/Gda/XqlJoinClass.xml
deleted file mode 100644
index 449d80b02..000000000
--- a/doc/en/Gda/XqlJoinClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlJoinClass" FullName="Gda.XqlJoinClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlJoinClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoinClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlJoinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlJoinClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlJoinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlJoinClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlDualClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDualClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlList.xml b/doc/en/Gda/XqlList.xml
index 905e2758b..9106cefe2 100644
--- a/doc/en/Gda/XqlList.xml
+++ b/doc/en/Gda/XqlList.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlList" FullName="Gda.XqlList">
-  <TypeSignature Language="C#" Value="public sealed struct XqlList" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlList : Gda.XqlItem, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,69 +13,18 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlItem</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlList Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlList</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlList New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlList</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlList" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlList New (string tag);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlList</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="tag" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="tag">a <see cref="T:System.String" /></param>
-        <returns>a <see cref="T:Gda.XqlList" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="NewAnd">
-      <MemberSignature Language="C#" Value="public static Gda.XqlList NewAnd ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlList</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlList" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="NewArglist">
       <MemberSignature Language="C#" Value="public static Gda.XqlList NewArglist ();" />
       <MemberType>Method</MemberType>
@@ -222,6 +170,71 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlList (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlList" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlList (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlList" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlList (string tag);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="tag" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="tag">a <see cref="T:System.String" /></param>
+        <returns>a <see cref="T:Gda.XqlList" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlList ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlList" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
@@ -229,22 +242,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlList" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlitem">
-      <MemberSignature Language="C#" Value="public Gda.XqlItem Xqlitem;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItem</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlListClass.xml b/doc/en/Gda/XqlListClass.xml
deleted file mode 100644
index 6ce4c8b2e..000000000
--- a/doc/en/Gda/XqlListClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlListClass" FullName="Gda.XqlListClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlListClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlListClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlListClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlListClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlListClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlListClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlItemClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlItemClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlQuery.xml b/doc/en/Gda/XqlQuery.xml
index 5ac2162b5..b99c8655c 100644
--- a/doc/en/Gda/XqlQuery.xml
+++ b/doc/en/Gda/XqlQuery.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlQuery" FullName="Gda.XqlQuery">
-  <TypeSignature Language="C#" Value="public sealed struct XqlQuery" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlQuery : Gda.XqlBin, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlBin</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQuery Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlQuery</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQuery New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlQuery</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlQuery (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlQuery" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlQuery (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQuery New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlQuery</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlQuery ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQuery NewWithData (Gda.XqlItem xqlitem);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlQuery</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlQuery (Gda.XqlItem xqlitem);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="xqlitem" Type="Gda.XqlItem" />
       </Parameters>
@@ -84,22 +97,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlQuery" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlquery">
-      <MemberSignature Language="C#" Value="public Gda.XqlBin Xqlquery;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlQueryClass.xml b/doc/en/Gda/XqlQueryClass.xml
deleted file mode 100644
index 37768529a..000000000
--- a/doc/en/Gda/XqlQueryClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlQueryClass" FullName="Gda.XqlQueryClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlQueryClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQueryClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlQueryClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlQueryClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlQueryClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlQueryClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlBinClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlSelect.xml b/doc/en/Gda/XqlSelect.xml
index 75ac89b09..7d4a3cf7e 100644
--- a/doc/en/Gda/XqlSelect.xml
+++ b/doc/en/Gda/XqlSelect.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlSelect" FullName="Gda.XqlSelect">
-  <TypeSignature Language="C#" Value="public sealed struct XqlSelect" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlSelect : Gda.XqlDml, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlDml</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlSelect Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlSelect</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlSelect New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlSelect</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlSelect (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlSelect" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlSelect (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlSelect New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlSelect</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlSelect ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -68,22 +83,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlSelect" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqldml">
-      <MemberSignature Language="C#" Value="public Gda.XqlDml Xqldml;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlSelectClass.xml b/doc/en/Gda/XqlSelectClass.xml
deleted file mode 100644
index 1a302ea8d..000000000
--- a/doc/en/Gda/XqlSelectClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlSelectClass" FullName="Gda.XqlSelectClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlSelectClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlSelectClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlSelectClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlSelectClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlSelectClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlSelectClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlDmlClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlStack.xml b/doc/en/Gda/XqlStack.xml
index f7e822ea9..af993d121 100644
--- a/doc/en/Gda/XqlStack.xml
+++ b/doc/en/Gda/XqlStack.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlStack" FullName="Gda.XqlStack">
-  <TypeSignature Language="C#" Value="public sealed struct XqlStack" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlStack : GLib.Object, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,50 +13,27 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>GLib.Object</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlStack Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlStack</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlStack New (IntPtr raw);" />
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
       <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlStack</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlStack" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlStack New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlStack</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters />
       <Docs>
         <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlStack" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
@@ -102,6 +78,45 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlStack (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlStack" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlStack (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="raw" Type="System.IntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="raw">a <see cref="T:System.IntPtr" /></param>
+        <returns>a <see cref="T:Gda.XqlStack" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlStack ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters />
+      <Docs>
+        <summary>To be added</summary>
+        <returns>a <see cref="T:Gda.XqlStack" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
@@ -109,22 +124,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlStack" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Gobject">
-      <MemberSignature Language="C#" Value="public GLib.Object Gobject;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>GLib.Object</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlStackClass.xml b/doc/en/Gda/XqlStackClass.xml
deleted file mode 100644
index 3a1ce4d42..000000000
--- a/doc/en/Gda/XqlStackClass.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Type Name="XqlStackClass" FullName="Gda.XqlStackClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlStackClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlStackClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlStackClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlStackClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlStackClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlStackClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlTarget.xml b/doc/en/Gda/XqlTarget.xml
index 88a121007..6f190e435 100644
--- a/doc/en/Gda/XqlTarget.xml
+++ b/doc/en/Gda/XqlTarget.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlTarget" FullName="Gda.XqlTarget">
-  <TypeSignature Language="C#" Value="public sealed struct XqlTarget" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlTarget : Gda.XqlBin, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlBin</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTarget Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlTarget</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTarget New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlTarget</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlTarget (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlTarget" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlTarget (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTarget New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlTarget</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlTarget ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTarget NewWithData (string id, string name, Gda.XqlItem join);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlTarget</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlTarget (string id, string name, Gda.XqlItem join);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="id" Type="System.String" />
         <Parameter Name="name" Type="System.String" />
@@ -88,22 +101,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlTarget" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlbin">
-      <MemberSignature Language="C#" Value="public Gda.XqlBin Xqlbin;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlTargetClass.xml b/doc/en/Gda/XqlTargetClass.xml
deleted file mode 100644
index 734c6f067..000000000
--- a/doc/en/Gda/XqlTargetClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlTargetClass" FullName="Gda.XqlTargetClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlTargetClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTargetClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlTargetClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlTargetClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlTargetClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlTargetClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlBinClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlUpdate.xml b/doc/en/Gda/XqlUpdate.xml
index 930983faa..8278fad7d 100644
--- a/doc/en/Gda/XqlUpdate.xml
+++ b/doc/en/Gda/XqlUpdate.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlUpdate" FullName="Gda.XqlUpdate">
-  <TypeSignature Language="C#" Value="public sealed struct XqlUpdate" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlUpdate : Gda.XqlDml, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlDml</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlUpdate Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlUpdate</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlUpdate New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlUpdate</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlUpdate (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlUpdate" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlUpdate (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlUpdate New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlUpdate</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlUpdate ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,19 +76,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="xqldml">
-      <MemberSignature Language="C#" Value="public Gda.XqlDml xqldml { get; };" />
-      <MemberType>Property</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDml</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added</summary>
-        <returns>a <see cref="T:Gda.XqlDml" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="GType">
       <MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
       <MemberType>Property</MemberType>
@@ -82,9 +84,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>GType Property.</summary>
+        <summary>To be added</summary>
         <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlUpdate" />.</remarks>
+        <remarks>To be added</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/doc/en/Gda/XqlUpdateClass.xml b/doc/en/Gda/XqlUpdateClass.xml
deleted file mode 100644
index 1c09e046c..000000000
--- a/doc/en/Gda/XqlUpdateClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlUpdateClass" FullName="Gda.XqlUpdateClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlUpdateClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlUpdateClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlUpdateClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlUpdateClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlUpdateClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlUpdateClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlDmlClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlDmlClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlValue.xml b/doc/en/Gda/XqlValue.xml
index 82c401046..ed57ea2ad 100644
--- a/doc/en/Gda/XqlValue.xml
+++ b/doc/en/Gda/XqlValue.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlValue" FullName="Gda.XqlValue">
-  <TypeSignature Language="C#" Value="public sealed struct XqlValue" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlValue : Gda.XqlBin, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlBin</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValue Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlValue</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValue New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValue</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlValue (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlValue" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlValue (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValue New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValue</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlValue ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -61,12 +76,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="NewWithData">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValue NewWithData (string id);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValue</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlValue (string id);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="id" Type="System.String" />
       </Parameters>
@@ -84,22 +97,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlValue" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlbin">
-      <MemberSignature Language="C#" Value="public Gda.XqlBin Xqlbin;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBin</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlValueClass.xml b/doc/en/Gda/XqlValueClass.xml
deleted file mode 100644
index 3774aad8f..000000000
--- a/doc/en/Gda/XqlValueClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlValueClass" FullName="Gda.XqlValueClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlValueClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlValueClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlBinClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlBinClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/doc/en/Gda/XqlValueRef.xml b/doc/en/Gda/XqlValueRef.xml
index 9df334fc3..6dd1f34aa 100644
--- a/doc/en/Gda/XqlValueRef.xml
+++ b/doc/en/Gda/XqlValueRef.xml
@@ -1,10 +1,9 @@
 <Type Name="XqlValueRef" FullName="Gda.XqlValueRef">
-  <TypeSignature Language="C#" Value="public sealed struct XqlValueRef" Maintainer="auto" />
+  <TypeSignature Language="C#" Value="public class XqlValueRef : Gda.XqlAtom, IWrapper, IDisposable" Maintainer="auto" />
   <AssemblyInfo>
     <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 01 00 01 00 71 EB 6C 55 75 52 9C BF 72 44 F7 A6 EA 05 62 84 F9 EA E0 3B CF F2 CC 13 2C 9C 49 0A B3 09 EA B0 B5 6B CE 44 9D F5 03 D9 C0 A8 1E 52 05 85 CD BE 70 E2 FB 90 43 4B AC 04 FA 62 22 A8 00 98 B7 A1 A7 B3 AF 99 1A 41 23 24 BB 43 25 F6 B8 65 BB 64 EB F6 D1 C2 06 D5 73 2D DF BC 70 A7 38 9E E5 3E 0C 24 6E 32 79 74 1A D0 05 03 E4 98 42 E1 9B F3 7B 19 8B 40 21 26 CB 36 89 C2 EA 64 96 A4 7C B4]</AssemblyPublicKey>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -14,30 +13,48 @@
     <remarks>To be added</remarks>
   </Docs>
   <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
+    <BaseTypeName>Gda.XqlAtom</BaseTypeName>
   </Base>
-  <Interfaces />
+  <Interfaces>
+    <Interface>
+      <InterfaceName>GLib.IWrapper</InterfaceName>
+    </Interface>
+    <Interface>
+      <InterfaceName>System.IDisposable</InterfaceName>
+    </Interface>
+  </Interfaces>
   <Attributes />
   <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueRef Zero;" />
-      <MemberType>Field</MemberType>
+    <Member MemberName="Finalize">
+      <MemberSignature Language="C#" Value="protected override void Finalize ();" />
+      <MemberType>Method</MemberType>
       <ReturnValue>
-        <ReturnType>Gda.XqlValueRef</ReturnType>
+        <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-      </Parameters>
+      <Parameters />
       <Docs>
         <summary>To be added</summary>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueRef New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueRef</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="protected XqlValueRef (GLib.GType gtype);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="gtype" Type="GLib.GType" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="gtype">a <see cref="T:GLib.GType" /></param>
+        <returns>a <see cref="T:Gda.XqlValueRef" /></returns>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlValueRef (IntPtr raw);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters>
         <Parameter Name="raw" Type="System.IntPtr" />
       </Parameters>
@@ -48,12 +65,10 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueRef New ();" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueRef</ReturnType>
-      </ReturnValue>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public XqlValueRef ();" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
       <Parameters />
       <Docs>
         <summary>To be added</summary>
@@ -68,22 +83,9 @@
         <ReturnType>GLib.GType</ReturnType>
       </ReturnValue>
       <Parameters />
-      <Docs>
-        <summary>GType Property.</summary>
-        <returns>a <see cref="T:GLib.GType" /></returns>
-        <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gda.XqlValueRef" />.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Xqlatom">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtom Xqlatom;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtom</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
       <Docs>
         <summary>To be added</summary>
+        <returns>a <see cref="T:GLib.GType" /></returns>
         <remarks>To be added</remarks>
       </Docs>
     </Member>
diff --git a/doc/en/Gda/XqlValueRefClass.xml b/doc/en/Gda/XqlValueRefClass.xml
deleted file mode 100644
index 73fff2388..000000000
--- a/doc/en/Gda/XqlValueRefClass.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Type Name="XqlValueRefClass" FullName="Gda.XqlValueRefClass">
-  <TypeSignature Language="C#" Value="public sealed struct XqlValueRefClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gda-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueRefClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueRefClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static Gda.XqlValueRefClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlValueRefClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:Gda.XqlValueRefClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="ParentClass">
-      <MemberSignature Language="C#" Value="public Gda.XqlAtomClass ParentClass;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>Gda.XqlAtomClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/gda/Gda.metadata b/gda/Gda.metadata
index a7c00bb70..2b91fce22 100644
--- a/gda/Gda.metadata
+++ b/gda/Gda.metadata
@@ -16,6 +16,7 @@
   <attr path="//struct[@cname='GdaCommand']" name="opaque">1</attr>
   <attr path="//struct[@cname='GdaFieldAttributes']" name="opaque">1</attr>
   <attr path="//struct[@cname='GdaParameter']" name="opaque">1</attr>
+  <attr path="/api/namespace/struct[@cname='GdaValue']" name="opaque">1</attr>
   <attr path="/api/namespace/struct[@cname='GdaValue']/method[@cname='gda_value_get_type']" name="name">GetGdaType</attr>
 </metadata>
 
diff --git a/gda/gda-api.raw b/gda/gda-api.raw
index f6003eec3..69a79a6a9 100644
--- a/gda/gda-api.raw
+++ b/gda/gda-api.raw
@@ -1367,6 +1367,630 @@
         </parameters>
       </method>
     </object>
+    <object name="XqlAtom" cname="GdaXqlAtom" parent="GdaXqlItem">
+      <method name="GetType" cname="gda_xql_atom_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_atom_new">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlBin" cname="GdaXqlBin" parent="GdaXqlItem">
+      <field name="Priv" cname="priv" type="GdaXqlBinPrivate*"/>
+      <method name="GetChild" cname="gda_xql_bin_get_child">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="GetType" cname="gda_xql_bin_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_bin_new">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+          <parameter type="gchar*" name="sqlfmt"/>
+          <parameter type="gchar*" name="sqlop"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_bin_new_exists"/>
+      <constructor cname="gda_xql_bin_new_having"/>
+      <constructor cname="gda_xql_bin_new_having_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="data"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_bin_new_intersect"/>
+      <constructor cname="gda_xql_bin_new_minus"/>
+      <constructor cname="gda_xql_bin_new_not"/>
+      <constructor cname="gda_xql_bin_new_not_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="data"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_bin_new_null"/>
+      <constructor cname="gda_xql_bin_new_null_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="data"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_bin_new_on"/>
+      <constructor cname="gda_xql_bin_new_union"/>
+      <constructor cname="gda_xql_bin_new_unionall"/>
+      <constructor cname="gda_xql_bin_new_where"/>
+      <constructor cname="gda_xql_bin_new_where_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="data"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_bin_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+          <parameter type="gchar*" name="sqlfmt"/>
+          <parameter type="gchar*" name="sqlop"/>
+          <parameter type="GdaXqlItem*" name="child"/>
+        </parameters>
+      </constructor>
+      <method name="SetChild" cname="gda_xql_bin_set_child">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="XqlColumn" cname="GdaXqlColumn" parent="GdaXqlAtom">
+      <method name="GetType" cname="gda_xql_column_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_column_new"/>
+      <constructor cname="gda_xql_column_new_with_data">
+        <parameters>
+          <parameter type="gint" name="num"/>
+          <parameter type="gboolean" name="asc"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlConst" cname="GdaXqlConst" parent="GdaXqlAtom">
+      <method name="GetType" cname="gda_xql_const_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_const_new"/>
+      <constructor cname="gda_xql_const_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="alias"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gchar*" name="null"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlDelete" cname="GdaXqlDelete" parent="GdaXqlDml">
+      <method name="GetType" cname="gda_xql_delete_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_delete_new"/>
+    </object>
+    <object name="XqlDml" cname="GdaXqlDml" parent="GdaXqlItem">
+      <field name="Priv" cname="priv" type="GdaXqlDmlPrivate*"/>
+      <virtual_method name="AddTargetFromText" cname="add_target_from_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="GdaXqlItem*" name="join"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddFieldFromText" cname="add_field_from_text">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="gchar*" name="id"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="gchar*" name="alias"/>
+          <parameter type="gboolean" name="group"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddConstFromText" cname="add_const_from_text">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gboolean" name="null"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddFunc" cname="add_func">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddQuery" cname="add_query">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddRowCondition" cname="add_row_condition">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="GdaXqlItem*" name="cond"/>
+          <parameter type="gchar*" name="type"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddGroupCondition" cname="add_group_condition">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="GdaXqlItem*" name="cond"/>
+          <parameter type="gchar*" name="type"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddOrder" cname="add_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="gint" name="column"/>
+          <parameter type="gboolean" name="asc"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddSet" cname="add_set">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="AddSetConst" cname="add_set_const">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlDml*" name="xqldml"/>
+          <parameter type="gchar*" name="field"/>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gboolean" name="null"/>
+        </parameters>
+      </virtual_method>
+      <method name="AddConstFromText" cname="gda_xql_dml_add_const_from_text">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gboolean" name="null"/>
+        </parameters>
+      </method>
+      <method name="AddFieldFromText" cname="gda_xql_dml_add_field_from_text">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="gchar*" name="alias"/>
+          <parameter type="gboolean" name="group"/>
+        </parameters>
+      </method>
+      <method name="AddFunc" cname="gda_xql_dml_add_func">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </method>
+      <method name="AddGroupCondition" cname="gda_xql_dml_add_group_condition">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="cond"/>
+          <parameter type="gchar*" name="type"/>
+        </parameters>
+      </method>
+      <method name="AddOrder" cname="gda_xql_dml_add_order">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gint" name="column"/>
+          <parameter type="gboolean" name="asc"/>
+        </parameters>
+      </method>
+      <method name="AddQuery" cname="gda_xql_dml_add_query">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </method>
+      <method name="AddRowCondition" cname="gda_xql_dml_add_row_condition">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="cond"/>
+          <parameter type="gchar*" name="type"/>
+        </parameters>
+      </method>
+      <method name="AddSet" cname="gda_xql_dml_add_set">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </method>
+      <method name="AddSetConst" cname="gda_xql_dml_add_set_const">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="field"/>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gboolean" name="null"/>
+        </parameters>
+      </method>
+      <method name="AddTargetFromText" cname="gda_xql_dml_add_target_from_text">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="GdaXqlItem*" name="join"/>
+        </parameters>
+      </method>
+      <method name="GetType" cname="gda_xql_dml_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+    </object>
+    <object name="XqlDual" cname="GdaXqlDual" parent="GdaXqlItem">
+      <field name="Priv" cname="priv" type="GdaXqlDualPrivate*"/>
+      <method name="GetLeft" cname="gda_xql_dual_get_left">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="GetRight" cname="gda_xql_dual_get_right">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="GetType" cname="gda_xql_dual_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_dual_new">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+          <parameter type="gchar*" name="sqlfmt"/>
+          <parameter type="gchar*" name="sqlop"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_eq"/>
+      <constructor cname="gda_xql_dual_new_eq_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_ge"/>
+      <constructor cname="gda_xql_dual_new_ge_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_gt"/>
+      <constructor cname="gda_xql_dual_new_gt_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_in"/>
+      <constructor cname="gda_xql_dual_new_in_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_le"/>
+      <constructor cname="gda_xql_dual_new_le_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_like"/>
+      <constructor cname="gda_xql_dual_new_like_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_lt"/>
+      <constructor cname="gda_xql_dual_new_lt_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_ne"/>
+      <constructor cname="gda_xql_dual_new_ne_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_set"/>
+      <constructor cname="gda_xql_dual_new_set_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_dual_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+          <parameter type="gchar*" name="sqlfmt"/>
+          <parameter type="gchar*" name="sqlop"/>
+          <parameter type="GdaXqlItem*" name="left"/>
+          <parameter type="GdaXqlItem*" name="right"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlField" cname="GdaXqlField" parent="GdaXqlAtom">
+      <method name="GetType" cname="gda_xql_field_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_field_new"/>
+      <constructor cname="gda_xql_field_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="source"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="gchar*" name="alias"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlFunc" cname="GdaXqlFunc" parent="GdaXqlBin">
+      <method name="AddConstFromText" cname="gda_xql_func_add_const_from_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="value"/>
+          <parameter type="gchar*" name="type"/>
+          <parameter type="gchar*" name="null"/>
+        </parameters>
+      </method>
+      <method name="AddFieldFromText" cname="gda_xql_func_add_field_from_text">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="gchar*" name="alias"/>
+        </parameters>
+      </method>
+      <method name="GetType" cname="gda_xql_func_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_func_new"/>
+      <constructor cname="gda_xql_func_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="gchar*" name="alias"/>
+          <parameter type="gchar*" name="aggregate"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlInsert" cname="GdaXqlInsert" parent="GdaXqlDml">
+      <method name="GetType" cname="gda_xql_insert_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_insert_new"/>
+    </object>
+    <object name="XqlItem" cname="GdaXqlItem" parent="GObject">
+      <field name="Priv" cname="priv" type="GdaXqlItemPrivate*"/>
+      <virtual_method name="ToDom" cname="to_dom">
+        <return-type type="xmlNode*"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="xqlitem"/>
+          <parameter type="xmlNode*" name="parNode"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="Add" cname="add">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="xqlitem"/>
+          <parameter type="GdaXqlItem*" name="child"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="FindId" cname="find_id">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="xqlitem"/>
+          <parameter type="gchar*" name="id"/>
+        </parameters>
+      </virtual_method>
+      <virtual_method name="FindRef" cname="find_ref">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="xqlitem"/>
+          <parameter type="gchar*" name="ref"/>
+        </parameters>
+      </virtual_method>
+      <method name="Add" cname="gda_xql_item_add">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="child"/>
+        </parameters>
+      </method>
+      <method name="AddId" cname="gda_xql_item_add_id">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+        </parameters>
+      </method>
+      <method name="AddRef" cname="gda_xql_item_add_ref">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="ref"/>
+        </parameters>
+      </method>
+      <method name="FindId" cname="gda_xql_item_find_id">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+        </parameters>
+      </method>
+      <method name="FindRef" cname="gda_xql_item_find_ref">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="gchar*" name="ref"/>
+        </parameters>
+      </method>
+      <method name="FindRoot" cname="gda_xql_item_find_root">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="GetAttrib" cname="gda_xql_item_get_attrib">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter type="gchar*" name="attrib"/>
+        </parameters>
+      </method>
+      <method name="GetParent" cname="gda_xql_item_get_parent">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="GetRef" cname="gda_xql_item_get_ref">
+        <return-type type="GdaXqlItem*"/>
+        <parameters>
+          <parameter type="gchar*" name="ref"/>
+        </parameters>
+      </method>
+      <method name="GetTag" cname="gda_xql_item_get_tag">
+        <return-type type="gchar*"/>
+      </method>
+      <method name="GetType" cname="gda_xql_item_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <method name="SetAttrib" cname="gda_xql_item_set_attrib">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="attrib"/>
+          <parameter type="gchar*" name="value"/>
+        </parameters>
+      </method>
+      <method name="SetParent" cname="gda_xql_item_set_parent">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="parent"/>
+        </parameters>
+      </method>
+      <method name="SetTag" cname="gda_xql_item_set_tag">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+        </parameters>
+      </method>
+      <method name="ToDom" cname="gda_xql_item_to_dom">
+        <return-type type="xmlNode*"/>
+        <parameters>
+          <parameter type="xmlNode*" name="parent"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="XqlJoin" cname="GdaXqlJoin" parent="GdaXqlDual">
+      <method name="GetType" cname="gda_xql_join_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_join_new"/>
+      <constructor cname="gda_xql_join_new_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="target"/>
+          <parameter type="GdaXqlItem*" name="cond"/>
+          <parameter type="gchar*" name="type"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlList" cname="GdaXqlList" parent="GdaXqlItem">
+      <field name="Priv" cname="priv" type="GdaXqlListPrivate*"/>
+      <method name="GetType" cname="gda_xql_list_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_list_new">
+        <parameters>
+          <parameter type="gchar*" name="tag"/>
+        </parameters>
+      </constructor>
+      <constructor cname="gda_xql_list_new_and"/>
+      <constructor cname="gda_xql_list_new_arglist"/>
+      <constructor cname="gda_xql_list_new_dest"/>
+      <constructor cname="gda_xql_list_new_group"/>
+      <constructor cname="gda_xql_list_new_joinlist"/>
+      <constructor cname="gda_xql_list_new_or"/>
+      <constructor cname="gda_xql_list_new_order"/>
+      <constructor cname="gda_xql_list_new_setlist"/>
+      <constructor cname="gda_xql_list_new_sourcelist"/>
+      <constructor cname="gda_xql_list_new_targetlist"/>
+      <constructor cname="gda_xql_list_new_valuelist"/>
+      <method name="UnrefList" cname="gda_xql_list_unref_list" shared="true">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GSList*" name="list"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="XqlQuery" cname="GdaXqlQuery" parent="GdaXqlBin">
+      <method name="GetType" cname="gda_xql_query_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_query_new"/>
+      <constructor cname="gda_xql_query_new_with_data">
+        <parameters>
+          <parameter type="GdaXqlItem*" name="xqlitem"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlSelect" cname="GdaXqlSelect" parent="GdaXqlDml">
+      <method name="GetType" cname="gda_xql_select_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_select_new"/>
+    </object>
+    <object name="XqlStack" cname="GdaXqlStack" parent="GObject">
+      <field name="Priv" cname="priv" type="GdaXqlStackPrivate*"/>
+      <method name="Empty" cname="gda_xql_stack_empty">
+        <return-type type="gboolean"/>
+      </method>
+      <method name="GetType" cname="gda_xql_stack_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_stack_new"/>
+      <method name="Pop" cname="gda_xql_stack_pop">
+        <return-type type="GdaXqlItem*"/>
+      </method>
+      <method name="Push" cname="gda_xql_stack_push">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GdaXqlItem*" name="item"/>
+        </parameters>
+      </method>
+    </object>
+    <object name="XqlTarget" cname="GdaXqlTarget" parent="GdaXqlBin">
+      <method name="GetType" cname="gda_xql_target_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_target_new"/>
+      <constructor cname="gda_xql_target_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+          <parameter type="gchar*" name="name"/>
+          <parameter type="GdaXqlItem*" name="join"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlUpdate" cname="GdaXqlUpdate" parent="GdaXqlDml*">
+      <method name="GetType" cname="gda_xql_update_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_update_new"/>
+    </object>
+    <object name="XqlValue" cname="GdaXqlValue" parent="GdaXqlBin">
+      <method name="GetType" cname="gda_xql_value_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_value_new"/>
+      <constructor cname="gda_xql_value_new_with_data">
+        <parameters>
+          <parameter type="gchar*" name="id"/>
+        </parameters>
+      </constructor>
+    </object>
+    <object name="XqlValueRef" cname="GdaXqlValueRef" parent="GdaXqlAtom">
+      <method name="GetType" cname="gda_xql_valueref_get_type" shared="true">
+        <return-type type="GType"/>
+      </method>
+      <constructor cname="gda_xql_valueref_new"/>
+    </object>
     <struct name="Blob" cname="GdaBlob">
       <callback cname="open">
         <return-type type="gint"/>
@@ -2268,684 +2892,6 @@
       </method>
     </struct>
     <alias name="ValueList" cname="GdaValueList" type="GList"/>
-    <struct name="XqlAtom" cname="GdaXqlAtom">
-      <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
-      <method name="GetType" cname="gda_xql_atom_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_atom_new">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlAtomClass" cname="GdaXqlAtomClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
-    </struct>
-    <struct name="XqlBin" cname="GdaXqlBin">
-      <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
-      <field name="Priv" cname="priv" type="GdaXqlBinPrivate*"/>
-      <method name="GetChild" cname="gda_xql_bin_get_child">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="GetType" cname="gda_xql_bin_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_bin_new">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-          <parameter type="gchar*" name="sqlfmt"/>
-          <parameter type="gchar*" name="sqlop"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_bin_new_exists"/>
-      <constructor cname="gda_xql_bin_new_having"/>
-      <constructor cname="gda_xql_bin_new_having_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="data"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_bin_new_intersect"/>
-      <constructor cname="gda_xql_bin_new_minus"/>
-      <constructor cname="gda_xql_bin_new_not"/>
-      <constructor cname="gda_xql_bin_new_not_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="data"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_bin_new_null"/>
-      <constructor cname="gda_xql_bin_new_null_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="data"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_bin_new_on"/>
-      <constructor cname="gda_xql_bin_new_union"/>
-      <constructor cname="gda_xql_bin_new_unionall"/>
-      <constructor cname="gda_xql_bin_new_where"/>
-      <constructor cname="gda_xql_bin_new_where_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="data"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_bin_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-          <parameter type="gchar*" name="sqlfmt"/>
-          <parameter type="gchar*" name="sqlop"/>
-          <parameter type="GdaXqlItem*" name="child"/>
-        </parameters>
-      </constructor>
-      <method name="SetChild" cname="gda_xql_bin_set_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="item"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="XqlBinClass" cname="GdaXqlBinClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
-    </struct>
-    <struct name="XqlColumn" cname="GdaXqlColumn">
-      <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
-      <method name="GetType" cname="gda_xql_column_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_column_new"/>
-      <constructor cname="gda_xql_column_new_with_data">
-        <parameters>
-          <parameter type="gint" name="num"/>
-          <parameter type="gboolean" name="asc"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlColumnClass" cname="GdaXqlColumnClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
-    </struct>
-    <struct name="XqlConst" cname="GdaXqlConst">
-      <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
-      <method name="GetType" cname="gda_xql_const_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_const_new"/>
-      <constructor cname="gda_xql_const_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="value"/>
-          <parameter type="gchar*" name="alias"/>
-          <parameter type="gchar*" name="type"/>
-          <parameter type="gchar*" name="null"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlConstClass" cname="GdaXqlConstClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
-    </struct>
-    <struct name="XqlDelete" cname="GdaXqlDelete">
-      <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
-      <method name="GetType" cname="gda_xql_delete_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_delete_new"/>
-    </struct>
-    <struct name="XqlDeleteClass" cname="GdaXqlDeleteClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
-    </struct>
-    <struct name="XqlDml" cname="GdaXqlDml">
-      <field name="Xqldml" cname="xqldml" type="GdaXqlItem"/>
-      <field name="Priv" cname="priv" type="GdaXqlDmlPrivate*" access="private"/>
-      <method name="AddConstFromText" cname="gda_xql_dml_add_const_from_text">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="gchar*" name="value"/>
-          <parameter type="gchar*" name="type"/>
-          <parameter type="gboolean" name="null"/>
-        </parameters>
-      </method>
-      <method name="AddFieldFromText" cname="gda_xql_dml_add_field_from_text">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="gchar*" name="alias"/>
-          <parameter type="gboolean" name="group"/>
-        </parameters>
-      </method>
-      <method name="AddFunc" cname="gda_xql_dml_add_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="item"/>
-        </parameters>
-      </method>
-      <method name="AddGroupCondition" cname="gda_xql_dml_add_group_condition">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="cond"/>
-          <parameter type="gchar*" name="type"/>
-        </parameters>
-      </method>
-      <method name="AddOrder" cname="gda_xql_dml_add_order">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint" name="column"/>
-          <parameter type="gboolean" name="asc"/>
-        </parameters>
-      </method>
-      <method name="AddQuery" cname="gda_xql_dml_add_query">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="item"/>
-        </parameters>
-      </method>
-      <method name="AddRowCondition" cname="gda_xql_dml_add_row_condition">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="cond"/>
-          <parameter type="gchar*" name="type"/>
-        </parameters>
-      </method>
-      <method name="AddSet" cname="gda_xql_dml_add_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="item"/>
-        </parameters>
-      </method>
-      <method name="AddSetConst" cname="gda_xql_dml_add_set_const">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="field"/>
-          <parameter type="gchar*" name="value"/>
-          <parameter type="gchar*" name="type"/>
-          <parameter type="gboolean" name="null"/>
-        </parameters>
-      </method>
-      <method name="AddTargetFromText" cname="gda_xql_dml_add_target_from_text">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="GdaXqlItem*" name="join"/>
-        </parameters>
-      </method>
-      <method name="GetType" cname="gda_xql_dml_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-    </struct>
-    <struct name="XqlDmlClass" cname="GdaXqlDmlClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
-      <callback cname="add_target_from_text">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_field_from_text">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_const_from_text">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_func">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_query">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_row_condition">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_group_condition">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_order">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-      <callback cname="add_set_const">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlDml*" name="xqldml,"/>
-        </parameters>
-      </callback>
-    </struct>
-    <struct name="XqlDual" cname="GdaXqlDual">
-      <field name="Xqldual" cname="xqldual" type="GdaXqlItem"/>
-      <field name="Priv" cname="priv" type="GdaXqlDualPrivate*" access="private"/>
-      <method name="GetLeft" cname="gda_xql_dual_get_left">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="GetRight" cname="gda_xql_dual_get_right">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="GetType" cname="gda_xql_dual_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_dual_new">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-          <parameter type="gchar*" name="sqlfmt"/>
-          <parameter type="gchar*" name="sqlop"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_eq"/>
-      <constructor cname="gda_xql_dual_new_eq_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_ge"/>
-      <constructor cname="gda_xql_dual_new_ge_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_gt"/>
-      <constructor cname="gda_xql_dual_new_gt_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_in"/>
-      <constructor cname="gda_xql_dual_new_in_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_le"/>
-      <constructor cname="gda_xql_dual_new_le_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_like"/>
-      <constructor cname="gda_xql_dual_new_like_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_lt"/>
-      <constructor cname="gda_xql_dual_new_lt_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_ne"/>
-      <constructor cname="gda_xql_dual_new_ne_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_set"/>
-      <constructor cname="gda_xql_dual_new_set_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_dual_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-          <parameter type="gchar*" name="sqlfmt"/>
-          <parameter type="gchar*" name="sqlop"/>
-          <parameter type="GdaXqlItem*" name="left"/>
-          <parameter type="GdaXqlItem*" name="right"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlDualClass" cname="GdaXqlDualClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
-    </struct>
-    <struct name="XqlField" cname="GdaXqlField">
-      <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
-      <method name="GetType" cname="gda_xql_field_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_field_new"/>
-      <constructor cname="gda_xql_field_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="source"/>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="gchar*" name="alias"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlFieldClass" cname="GdaXqlFieldClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
-    </struct>
-    <struct name="XqlFunc" cname="GdaXqlFunc">
-      <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
-      <method name="AddConstFromText" cname="gda_xql_func_add_const_from_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="value"/>
-          <parameter type="gchar*" name="type"/>
-          <parameter type="gchar*" name="null"/>
-        </parameters>
-      </method>
-      <method name="AddFieldFromText" cname="gda_xql_func_add_field_from_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="gchar*" name="alias"/>
-        </parameters>
-      </method>
-      <method name="GetType" cname="gda_xql_func_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_func_new"/>
-      <constructor cname="gda_xql_func_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="gchar*" name="alias"/>
-          <parameter type="gchar*" name="aggregate"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlFuncClass" cname="GdaXqlFuncClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
-    </struct>
-    <struct name="XqlInsert" cname="GdaXqlInsert">
-      <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
-      <method name="GetType" cname="gda_xql_insert_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_insert_new"/>
-    </struct>
-    <struct name="XqlInsertClass" cname="GdaXqlInsertClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
-    </struct>
-    <struct name="XqlItem" cname="GdaXqlItem">
-      <field name="Object" cname="object" type="GObject"/>
-      <field name="Priv" cname="priv" type="GdaXqlItemPrivate*"/>
-      <method name="Add" cname="gda_xql_item_add">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="child"/>
-        </parameters>
-      </method>
-      <method name="AddId" cname="gda_xql_item_add_id">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-        </parameters>
-      </method>
-      <method name="AddRef" cname="gda_xql_item_add_ref">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="ref"/>
-        </parameters>
-      </method>
-      <method name="FindId" cname="gda_xql_item_find_id">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-        </parameters>
-      </method>
-      <method name="FindRef" cname="gda_xql_item_find_ref">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="gchar*" name="ref"/>
-        </parameters>
-      </method>
-      <method name="FindRoot" cname="gda_xql_item_find_root">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="GetAttrib" cname="gda_xql_item_get_attrib">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter type="gchar*" name="attrib"/>
-        </parameters>
-      </method>
-      <method name="GetParent" cname="gda_xql_item_get_parent">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="GetRef" cname="gda_xql_item_get_ref">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="gchar*" name="ref"/>
-        </parameters>
-      </method>
-      <method name="GetTag" cname="gda_xql_item_get_tag">
-        <return-type type="gchar*"/>
-      </method>
-      <method name="GetType" cname="gda_xql_item_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <method name="SetAttrib" cname="gda_xql_item_set_attrib">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="attrib"/>
-          <parameter type="gchar*" name="value"/>
-        </parameters>
-      </method>
-      <method name="SetParent" cname="gda_xql_item_set_parent">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="parent"/>
-        </parameters>
-      </method>
-      <method name="SetTag" cname="gda_xql_item_set_tag">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-        </parameters>
-      </method>
-      <method name="ToDom" cname="gda_xql_item_to_dom">
-        <return-type type="xmlNode*"/>
-        <parameters>
-          <parameter type="xmlNode*" name="parent"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="XqlItemClass" cname="GdaXqlItemClass">
-      <field name="ParentClass" cname="parent_class" type="GObjectClass"/>
-      <callback cname="to_dom">
-        <return-type type="xmlNode*"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="xqlitem,"/>
-        </parameters>
-      </callback>
-      <callback cname="add">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="xqlitem,"/>
-        </parameters>
-      </callback>
-      <callback cname="find_id">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="xqlitem,"/>
-        </parameters>
-      </callback>
-      <callback cname="find_ref">
-        <return-type type="GdaXqlItem*"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="xqlitem,"/>
-        </parameters>
-      </callback>
-    </struct>
-    <struct name="XqlJoin" cname="GdaXqlJoin">
-      <field name="Xqldual" cname="xqldual" type="GdaXqlDual"/>
-      <method name="GetType" cname="gda_xql_join_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_join_new"/>
-      <constructor cname="gda_xql_join_new_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="target"/>
-          <parameter type="GdaXqlItem*" name="cond"/>
-          <parameter type="gchar*" name="type"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlJoinClass" cname="GdaXqlJoinClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlDualClass"/>
-    </struct>
-    <struct name="XqlList" cname="GdaXqlList">
-      <field name="Xqlitem" cname="xqlitem" type="GdaXqlItem"/>
-      <field name="Priv" cname="priv" type="GdaXqlListPrivate*" access="private"/>
-      <method name="GetType" cname="gda_xql_list_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_list_new">
-        <parameters>
-          <parameter type="gchar*" name="tag"/>
-        </parameters>
-      </constructor>
-      <constructor cname="gda_xql_list_new_and"/>
-      <constructor cname="gda_xql_list_new_arglist"/>
-      <constructor cname="gda_xql_list_new_dest"/>
-      <constructor cname="gda_xql_list_new_group"/>
-      <constructor cname="gda_xql_list_new_joinlist"/>
-      <constructor cname="gda_xql_list_new_or"/>
-      <constructor cname="gda_xql_list_new_order"/>
-      <constructor cname="gda_xql_list_new_setlist"/>
-      <constructor cname="gda_xql_list_new_sourcelist"/>
-      <constructor cname="gda_xql_list_new_targetlist"/>
-      <constructor cname="gda_xql_list_new_valuelist"/>
-      <method name="UnrefList" cname="gda_xql_list_unref_list" shared="true">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GSList*" name="list"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="XqlListClass" cname="GdaXqlListClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlItemClass"/>
-    </struct>
-    <struct name="XqlQuery" cname="GdaXqlQuery">
-      <field name="Xqlquery" cname="xqlquery" type="GdaXqlBin"/>
-      <method name="GetType" cname="gda_xql_query_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_query_new"/>
-      <constructor cname="gda_xql_query_new_with_data">
-        <parameters>
-          <parameter type="GdaXqlItem*" name="xqlitem"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlQueryClass" cname="GdaXqlQueryClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
-    </struct>
-    <struct name="XqlSelect" cname="GdaXqlSelect">
-      <field name="Xqldml" cname="xqldml" type="GdaXqlDml"/>
-      <method name="GetType" cname="gda_xql_select_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_select_new"/>
-    </struct>
-    <struct name="XqlSelectClass" cname="GdaXqlSelectClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
-    </struct>
-    <struct name="XqlStack" cname="GdaXqlStack">
-      <field name="Gobject" cname="gobject" type="GObject"/>
-      <field name="Priv" cname="priv" type="GdaXqlStackPrivate*" access="private"/>
-      <method name="Empty" cname="gda_xql_stack_empty">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="GetType" cname="gda_xql_stack_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_stack_new"/>
-      <method name="Pop" cname="gda_xql_stack_pop">
-        <return-type type="GdaXqlItem*"/>
-      </method>
-      <method name="Push" cname="gda_xql_stack_push">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GdaXqlItem*" name="item"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="XqlStackClass" cname="GdaXqlStackClass">
-      <field name="ParentClass" cname="parent_class" type="GObjectClass"/>
-    </struct>
-    <struct name="XqlTarget" cname="GdaXqlTarget">
-      <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
-      <method name="GetType" cname="gda_xql_target_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_target_new"/>
-      <constructor cname="gda_xql_target_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-          <parameter type="gchar*" name="name"/>
-          <parameter type="GdaXqlItem*" name="join"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlTargetClass" cname="GdaXqlTargetClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
-    </struct>
-    <struct name="XqlUpdate" cname="GdaXqlUpdate">
-      <field name="Xqldml" cname="xqldml" type="GdaXqlDml*"/>
-      <method name="GetType" cname="gda_xql_update_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_update_new"/>
-    </struct>
-    <struct name="XqlUpdateClass" cname="GdaXqlUpdateClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlDmlClass"/>
-    </struct>
-    <struct name="XqlValue" cname="GdaXqlValue">
-      <field name="Xqlbin" cname="xqlbin" type="GdaXqlBin"/>
-      <method name="GetType" cname="gda_xql_value_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_value_new"/>
-      <constructor cname="gda_xql_value_new_with_data">
-        <parameters>
-          <parameter type="gchar*" name="id"/>
-        </parameters>
-      </constructor>
-    </struct>
-    <struct name="XqlValueClass" cname="GdaXqlValueClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlBinClass"/>
-    </struct>
-    <struct name="XqlValueRef" cname="GdaXqlValueRef">
-      <field name="Xqlatom" cname="xqlatom" type="GdaXqlAtom"/>
-      <method name="GetType" cname="gda_xql_valueref_get_type" shared="true">
-        <return-type type="GType"/>
-      </method>
-      <constructor cname="gda_xql_valueref_new"/>
-    </struct>
-    <struct name="XqlValueRefClass" cname="GdaXqlValueRefClass">
-      <field name="ParentClass" cname="parent_class" type="GdaXqlAtomClass"/>
-    </struct>
     <class name="Config" cname="GdaConfig_">
       <method name="AddListener" cname="gda_config_add_listener" shared="true">
         <return-type type="guint"/>
diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl
index 73b3efdfd..a654cb4c2 100755
--- a/parser/gapi2xml.pl
+++ b/parser/gapi2xml.pl
@@ -169,12 +169,19 @@ while ($line = <STDIN>) {
 		}
 		$cast_macro =~ s/\\\n\s*//g;
 		$cast_macro =~ s/\s+/ /g;
-		if ($cast_macro =~ /G_TYPE_CHECK_(\w+)_CAST.*,\s*(\w+),\s*(\w+)/) {
+		if ($cast_macro =~ /G_TYPE_CHECK_(\w+)_CAST.*,\s*(\w+),\s*(\w+)\)/) {
 			if ($1 eq "INSTANCE") {
 				$objects{$2} = $3 . $objects{$2};
 			} else {
 				$objects{$2} .= ":$3";
 			}
+		} elsif ($cast_macro =~ /G_TYPE_CHECK_(\w+)_CAST.*,\s*([a-zA-Z0-9]+)_(\w+)_get_type\s*\(\),\s*(\w+)\)/) {
+			$typename = uc ("$2_type_$3");
+			if ($1 eq "INSTANCE") {
+				$objects{$typename} = $4 . $objects{$typename};
+			} else {
+				$objects{$typename} .= ":$4";
+			}
 		} elsif ($cast_macro =~ /GTK_CHECK_CAST.*,\s*(\w+),\s*(\w+)/) {
 			$objects{$1} = $2 . $objects{$1};
 		} elsif ($cast_macro =~ /GTK_CHECK_CLASS_CAST.*,\s*(\w+),\s*(\w+)/) {
@@ -309,7 +316,6 @@ foreach $type (sort(keys(%ifaces))) {
 ##############################################################
 
 foreach $type (sort(keys(%objects))) {
-	
 	($inst, $class) = split(/:/, $objects{$type});
 	$class = $inst . "Class" if (!$class);
 	$initfunc = $pedefs{lc($inst)};