diff --git a/configure.ac b/configure.ac
index 7467db1022..384ff5d6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,8 +98,8 @@ PKG_CHECK_MODULES(GLIB,
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 
-GSTREAMER_REQUIRED_VERSION=0.10.22
-GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.22
+GSTREAMER_REQUIRED_VERSION=0.10.22.1
+GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.22.1
 AC_SUBST(GSTREAMER_REQUIRED_VERSION)
 AC_SUBST(GSTREAMER_PLUGINS_REQUIRED_VERSION)
 PKG_CHECK_MODULES(GST,
diff --git a/doc/en/Gst/ActivateMode.xml b/doc/en/Gst/ActivateMode.xml
index 1c39a21109..8b55769824 100644
--- a/doc/en/Gst/ActivateMode.xml
+++ b/doc/en/Gst/ActivateMode.xml
@@ -31,4 +31,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ActivateModeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/AssocFlags.xml b/doc/en/Gst/AssocFlags.xml
index a84225e82f..5536eed916 100644
--- a/doc/en/Gst/AssocFlags.xml
+++ b/doc/en/Gst/AssocFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.AssocFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/Bin.xml b/doc/en/Gst/Bin.xml
index 72cded9210..83af6d4f27 100644
--- a/doc/en/Gst/Bin.xml
+++ b/doc/en/Gst/Bin.xml
@@ -132,7 +132,7 @@
       <ReturnValue><ReturnType>Gst.Pad</ReturnType></ReturnValue>
       <Parameters><Parameter Name="direction" Type="Gst.PadDirection" /></Parameters>
       <Docs><param name="direction">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="FindUnlinkedPad"><MemberSignature Language="C#" Value="public Gst.Pad FindUnlinkedPad (Gst.PadDirection direction);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.Pad</ReturnType></ReturnValue><Parameters><Parameter Name="direction" Type="Gst.PadDirection" /></Parameters><Docs><param name="direction">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetByInterface">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><Attributes><Attribute><AttributeName>System.Obsolete</AttributeName></Attribute></Attributes></Member><Member MemberName="FindUnlinkedPad"><MemberSignature Language="C#" Value="public Gst.Pad FindUnlinkedPad (Gst.PadDirection direction);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.Pad</ReturnType></ReturnValue><Parameters><Parameter Name="direction" Type="Gst.PadDirection" /></Parameters><Docs><param name="direction">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetByInterface">
       <MemberSignature Language="C#" Value="public Gst.Element GetByInterface (GLib.GType iface);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>Gst.Element</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/BinFlags.xml b/doc/en/Gst/BinFlags.xml
index 1671771bcb..bcf1d4319c 100644
--- a/doc/en/Gst/BinFlags.xml
+++ b/doc/en/Gst/BinFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BinFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/BufferCopyFlags.xml b/doc/en/Gst/BufferCopyFlags.xml
index 8b266a2f03..347d570fe3 100644
--- a/doc/en/Gst/BufferCopyFlags.xml
+++ b/doc/en/Gst/BufferCopyFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BufferCopyFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/BufferFlags.xml b/doc/en/Gst/BufferFlags.xml
index 03d819906c..b422ec57bd 100644
--- a/doc/en/Gst/BufferFlags.xml
+++ b/doc/en/Gst/BufferFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BufferFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
@@ -63,7 +66,7 @@
       </AssemblyInfo>
       <ReturnValue><ReturnType>Gst.BufferFlags</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary></Docs>
-    </Member><Member MemberName="Preroll">
+    </Member><Member MemberName="Media1"><MemberSignature Language="C#" Value="Media1" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.BufferFlags</ReturnType></ReturnValue><Docs><summary>To be added.</summary></Docs></Member><Member MemberName="Media2"><MemberSignature Language="C#" Value="Media2" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.BufferFlags</ReturnType></ReturnValue><Docs><summary>To be added.</summary></Docs></Member><Member MemberName="Media3"><MemberSignature Language="C#" Value="Media3" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.BufferFlags</ReturnType></ReturnValue><Docs><summary>To be added.</summary></Docs></Member><Member MemberName="Preroll">
       <MemberSignature Language="C#" Value="Preroll" />
       <MemberType>Field</MemberType>
       <AssemblyInfo>
diff --git a/doc/en/Gst/BufferingMode.xml b/doc/en/Gst/BufferingMode.xml
index 2ac599a836..e29d0b33eb 100644
--- a/doc/en/Gst/BufferingMode.xml
+++ b/doc/en/Gst/BufferingMode.xml
@@ -49,4 +49,9 @@
       <Docs><summary>To be added.</summary></Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BufferingModeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/BusFlags.xml b/doc/en/Gst/BusFlags.xml
index b0e7bf1ba2..2235c2fe7d 100644
--- a/doc/en/Gst/BusFlags.xml
+++ b/doc/en/Gst/BusFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BusFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/BusSyncReply.xml b/doc/en/Gst/BusSyncReply.xml
index 22a7611b95..37058d9d73 100644
--- a/doc/en/Gst/BusSyncReply.xml
+++ b/doc/en/Gst/BusSyncReply.xml
@@ -31,4 +31,9 @@
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.BusSyncReplyGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/ClockEntryType.xml b/doc/en/Gst/ClockEntryType.xml
index c4bd466dc9..9ca7f68802 100644
--- a/doc/en/Gst/ClockEntryType.xml
+++ b/doc/en/Gst/ClockEntryType.xml
@@ -25,4 +25,9 @@
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ClockEntryTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/ClockFlags.xml b/doc/en/Gst/ClockFlags.xml
index 4851fda915..05282eb950 100644
--- a/doc/en/Gst/ClockFlags.xml
+++ b/doc/en/Gst/ClockFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ClockFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/ClockReturn.xml b/doc/en/Gst/ClockReturn.xml
index 40974230d9..e623866f0a 100644
--- a/doc/en/Gst/ClockReturn.xml
+++ b/doc/en/Gst/ClockReturn.xml
@@ -55,4 +55,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ClockReturnGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/ClockType.xml b/doc/en/Gst/ClockType.xml
new file mode 100644
index 0000000000..559d1f7d0e
--- /dev/null
+++ b/doc/en/Gst/ClockType.xml
@@ -0,0 +1,47 @@
+<Type Name="ClockType" FullName="Gst.ClockType">
+  <TypeSignature Language="C#" Value="public enum ClockType" />
+  <AssemblyInfo>
+    <AssemblyName>gstreamer-sharp</AssemblyName>
+    <AssemblyVersion>0.9.5.99</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.Enum</BaseTypeName>
+  </Base>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ClockTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="Monotonic">
+      <MemberSignature Language="C#" Value="Monotonic" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>0.9.5.99</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Gst.ClockType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+      </Docs>
+    </Member>
+    <Member MemberName="Realtime">
+      <MemberSignature Language="C#" Value="Realtime" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>0.9.5.99</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>Gst.ClockType</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/doc/en/Gst/ElementFlags.xml b/doc/en/Gst/ElementFlags.xml
index 4dc18e82c7..c6c8298c5a 100644
--- a/doc/en/Gst/ElementFlags.xml
+++ b/doc/en/Gst/ElementFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ElementFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/EventType.xml b/doc/en/Gst/EventType.xml
index 44facf5737..aaf36a0aac 100644
--- a/doc/en/Gst/EventType.xml
+++ b/doc/en/Gst/EventType.xml
@@ -103,4 +103,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.EventTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/EventTypeFlags.xml b/doc/en/Gst/EventTypeFlags.xml
index 881059c099..0956bb29c4 100644
--- a/doc/en/Gst/EventTypeFlags.xml
+++ b/doc/en/Gst/EventTypeFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.EventTypeFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/FlowReturn.xml b/doc/en/Gst/FlowReturn.xml
index dc398f3835..b1c060107a 100644
--- a/doc/en/Gst/FlowReturn.xml
+++ b/doc/en/Gst/FlowReturn.xml
@@ -61,4 +61,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.FlowReturnGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/Format.xml b/doc/en/Gst/Format.xml
index 97aad8350c..5fd1c00a56 100644
--- a/doc/en/Gst/Format.xml
+++ b/doc/en/Gst/Format.xml
@@ -49,4 +49,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.FormatGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/IndexCertainty.xml b/doc/en/Gst/IndexCertainty.xml
index 0e3904de04..6a3e6646ce 100644
--- a/doc/en/Gst/IndexCertainty.xml
+++ b/doc/en/Gst/IndexCertainty.xml
@@ -31,4 +31,9 @@
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.IndexCertaintyGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/IndexEntryType.xml b/doc/en/Gst/IndexEntryType.xml
index 6f67bc32c5..10e1804d0b 100644
--- a/doc/en/Gst/IndexEntryType.xml
+++ b/doc/en/Gst/IndexEntryType.xml
@@ -37,4 +37,9 @@
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.IndexEntryTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/IndexFlags.xml b/doc/en/Gst/IndexFlags.xml
index bf00330f41..b6e39d8a56 100644
--- a/doc/en/Gst/IndexFlags.xml
+++ b/doc/en/Gst/IndexFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.IndexFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/IndexLookupMethod.xml b/doc/en/Gst/IndexLookupMethod.xml
index 5ca19d8114..9de9f9887a 100644
--- a/doc/en/Gst/IndexLookupMethod.xml
+++ b/doc/en/Gst/IndexLookupMethod.xml
@@ -31,4 +31,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.IndexLookupMethodGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/IndexResolverMethod.xml b/doc/en/Gst/IndexResolverMethod.xml
index 0e9d67630e..66e6303a4c 100644
--- a/doc/en/Gst/IndexResolverMethod.xml
+++ b/doc/en/Gst/IndexResolverMethod.xml
@@ -31,4 +31,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.IndexResolverMethodGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/Message.xml b/doc/en/Gst/Message.xml
index 000ac29975..efad8d47b7 100644
--- a/doc/en/Gst/Message.xml
+++ b/doc/en/Gst/Message.xml
@@ -53,7 +53,7 @@
       <MemberType>Constructor</MemberType>
       <Parameters><Parameter Name="src" Type="Gst.Object" /><Parameter Name="clock" Type="Gst.Clock" /></Parameters>
       <Docs><param name="src">To be added.</param><param name="clock">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName=".ctor">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName=".ctor"><MemberSignature Language="C#" Value="public Message (Gst.Object src, Gst.State state);" /><MemberType>Constructor</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><Parameters><Parameter Name="src" Type="Gst.Object" /><Parameter Name="state" Type="Gst.State" /></Parameters><Docs><param name="src">To be added.</param><param name="state">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="public Message (Gst.Object src, Gst.Structure structure);" />
       <MemberType>Constructor</MemberType>
       <Parameters><Parameter Name="src" Type="Gst.Object" /><Parameter Name="structure" Type="Gst.Structure" /></Parameters>
@@ -159,7 +159,7 @@
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
       <Parameters><Parameter Name="clock" Type="Gst.Clock" /></Parameters>
       <Docs><param name="clock">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ParseSegmentDone">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ParseRequestState"><MemberSignature Language="C#" Value="public Gst.State ParseRequestState ();" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.State</ReturnType></ReturnValue><Parameters /><Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="ParseSegmentDone">
       <MemberSignature Language="C#" Value="public void ParseSegmentDone (out Gst.Format format, out long position);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/MessageType.xml b/doc/en/Gst/MessageType.xml
index e92cfa0924..21f832cd64 100644
--- a/doc/en/Gst/MessageType.xml
+++ b/doc/en/Gst/MessageType.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.MessageTypeGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
@@ -91,7 +94,7 @@
       <MemberType>Field</MemberType>
       <ReturnValue><ReturnType>Gst.MessageType</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="SegmentDone">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="RequestState"><MemberSignature Language="C#" Value="RequestState" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.MessageType</ReturnType></ReturnValue><Docs><summary>To be added.</summary></Docs></Member><Member MemberName="SegmentDone">
       <MemberSignature Language="C#" Value="SegmentDone" />
       <MemberType>Field</MemberType>
       <ReturnValue><ReturnType>Gst.MessageType</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/MiniObjectFlags.xml b/doc/en/Gst/MiniObjectFlags.xml
index 4d2ec3cf3e..b69cc7fae0 100644
--- a/doc/en/Gst/MiniObjectFlags.xml
+++ b/doc/en/Gst/MiniObjectFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.MiniObjectFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/ObjectFlags.xml b/doc/en/Gst/ObjectFlags.xml
index b0150f5741..1c48e21a01 100644
--- a/doc/en/Gst/ObjectFlags.xml
+++ b/doc/en/Gst/ObjectFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ObjectFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/Pad.xml b/doc/en/Gst/Pad.xml
index 45141d45db..4216a292ab 100644
--- a/doc/en/Gst/Pad.xml
+++ b/doc/en/Gst/Pad.xml
@@ -439,16 +439,6 @@
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters><Parameter Name="format" Type="Gst.Format" /><Parameter Name="current" Type="System.Int64&amp;" RefType="out" /></Parameters>
       <Docs><param name="format">To be added.</param><param name="current">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="QueryTypes">
-      <MemberSignature Language="C#" Value="public Gst.QueryType QueryTypes { get; }" />
-      <MemberType>Property</MemberType>
-      <ReturnValue><ReturnType>Gst.QueryType</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="QueryTypesDefault">
-      <MemberSignature Language="C#" Value="public Gst.QueryType QueryTypesDefault { get; }" />
-      <MemberType>Property</MemberType>
-      <ReturnValue><ReturnType>Gst.QueryType</ReturnType></ReturnValue>
-      <Docs><summary>To be added.</summary><value>To be added.</value><remarks>To be added.</remarks></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="RemoveBufferProbe">
       <MemberSignature Language="C#" Value="public void RemoveBufferProbe (uint handler_id);" />
       <MemberType>Method</MemberType>
@@ -502,7 +492,7 @@
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters><Parameter Name="blocked" Type="System.Boolean" /><Parameter Name="cb" Type="Gst.PadBlockCallback" /></Parameters>
       <Docs><param name="blocked">To be added.</param><param name="cb">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="SetCaps">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="SetBlockedAsyncFull"><MemberSignature Language="C#" Value="public bool SetBlockedAsyncFull (bool blocked, Gst.PadBlockCallback cb);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="blocked" Type="System.Boolean" /><Parameter Name="cb" Type="Gst.PadBlockCallback" /></Parameters><Docs><param name="blocked">To be added.</param><param name="cb">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="SetCaps">
       <MemberSignature Language="C#" Value="public bool SetCaps (Gst.Caps caps);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/PadDirection.xml b/doc/en/Gst/PadDirection.xml
index 9175600f81..5d5017e79f 100644
--- a/doc/en/Gst/PadDirection.xml
+++ b/doc/en/Gst/PadDirection.xml
@@ -31,4 +31,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PadDirectionGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/PadFlags.xml b/doc/en/Gst/PadFlags.xml
index 38e185cca5..83ccf35257 100644
--- a/doc/en/Gst/PadFlags.xml
+++ b/doc/en/Gst/PadFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PadFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/PadLinkReturn.xml b/doc/en/Gst/PadLinkReturn.xml
index 17441fc1e0..c2cbc9bda7 100644
--- a/doc/en/Gst/PadLinkReturn.xml
+++ b/doc/en/Gst/PadLinkReturn.xml
@@ -55,4 +55,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PadLinkReturnGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/PadPresence.xml b/doc/en/Gst/PadPresence.xml
index 296a086b4a..016aac29b9 100644
--- a/doc/en/Gst/PadPresence.xml
+++ b/doc/en/Gst/PadPresence.xml
@@ -31,4 +31,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PadPresenceGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/PadTemplateFlags.xml b/doc/en/Gst/PadTemplateFlags.xml
index 3ae16441d0..00d01636f3 100644
--- a/doc/en/Gst/PadTemplateFlags.xml
+++ b/doc/en/Gst/PadTemplateFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PadTemplateFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/ParseError.xml b/doc/en/Gst/ParseError.xml
index 621c2b0ee2..ba03950d97 100644
--- a/doc/en/Gst/ParseError.xml
+++ b/doc/en/Gst/ParseError.xml
@@ -55,4 +55,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ParseErrorGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/ParseFlags.xml b/doc/en/Gst/ParseFlags.xml
index 84fd550b14..feeebcc0fa 100644
--- a/doc/en/Gst/ParseFlags.xml
+++ b/doc/en/Gst/ParseFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.ParseFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/PipelineFlags.xml b/doc/en/Gst/PipelineFlags.xml
index 0185033c79..111a9d8221 100644
--- a/doc/en/Gst/PipelineFlags.xml
+++ b/doc/en/Gst/PipelineFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PipelineFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/PluginDependencyFlags.xml b/doc/en/Gst/PluginDependencyFlags.xml
index d060d645a8..b9a19438cd 100644
--- a/doc/en/Gst/PluginDependencyFlags.xml
+++ b/doc/en/Gst/PluginDependencyFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PluginDependencyFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/PluginError.xml b/doc/en/Gst/PluginError.xml
index cab79f6d18..4789fbc3d3 100644
--- a/doc/en/Gst/PluginError.xml
+++ b/doc/en/Gst/PluginError.xml
@@ -31,4 +31,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PluginErrorGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/PluginFlags.xml b/doc/en/Gst/PluginFlags.xml
index 5e37864c23..95ac8dbc8e 100644
--- a/doc/en/Gst/PluginFlags.xml
+++ b/doc/en/Gst/PluginFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.PluginFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/QueryType.xml b/doc/en/Gst/QueryType.xml
index f0d343b838..9b4463f3ec 100644
--- a/doc/en/Gst/QueryType.xml
+++ b/doc/en/Gst/QueryType.xml
@@ -73,4 +73,9 @@
       <ReturnValue><ReturnType>Gst.QueryType</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="Uri"><MemberSignature Language="C#" Value="Uri" /><MemberType>Field</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.QueryType</ReturnType></ReturnValue><Docs><summary>To be added.</summary></Docs></Member></Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.QueryTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/Rank.xml b/doc/en/Gst/Rank.xml
index 21bb20ed4c..28f3883ab9 100644
--- a/doc/en/Gst/Rank.xml
+++ b/doc/en/Gst/Rank.xml
@@ -37,4 +37,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.RankGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/SeekFlags.xml b/doc/en/Gst/SeekFlags.xml
index 1265d05d5b..91f202a3a9 100644
--- a/doc/en/Gst/SeekFlags.xml
+++ b/doc/en/Gst/SeekFlags.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.SeekFlagsGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/SeekType.xml b/doc/en/Gst/SeekType.xml
index bf77d6b94a..4cf29f7ecf 100644
--- a/doc/en/Gst/SeekType.xml
+++ b/doc/en/Gst/SeekType.xml
@@ -37,4 +37,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.SeekTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/State.xml b/doc/en/Gst/State.xml
index 203cb8820d..fa423c7e75 100644
--- a/doc/en/Gst/State.xml
+++ b/doc/en/Gst/State.xml
@@ -43,4 +43,9 @@
       <Docs><summary>To be added.</summary></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.StateGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/StateChange.xml b/doc/en/Gst/StateChange.xml
index 33493c48ca..d321b2e669 100644
--- a/doc/en/Gst/StateChange.xml
+++ b/doc/en/Gst/StateChange.xml
@@ -8,6 +8,9 @@
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
   <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.StateChangeGType))</AttributeName>
+    </Attribute>
     <Attribute>
       <AttributeName>System.Flags</AttributeName>
     </Attribute>
diff --git a/doc/en/Gst/StateChangeReturn.xml b/doc/en/Gst/StateChangeReturn.xml
index dae0279978..1d286e7393 100644
--- a/doc/en/Gst/StateChangeReturn.xml
+++ b/doc/en/Gst/StateChangeReturn.xml
@@ -37,4 +37,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.StateChangeReturnGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/StructureChangeType.xml b/doc/en/Gst/StructureChangeType.xml
index d0758eb015..ea64d0723d 100644
--- a/doc/en/Gst/StructureChangeType.xml
+++ b/doc/en/Gst/StructureChangeType.xml
@@ -31,4 +31,9 @@
       <Docs><summary>To be added.</summary></Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.StructureChangeTypeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/SystemClock.xml b/doc/en/Gst/SystemClock.xml
index 9c7fb4e149..24bb3f3f4c 100644
--- a/doc/en/Gst/SystemClock.xml
+++ b/doc/en/Gst/SystemClock.xml
@@ -32,7 +32,7 @@
       <MemberType>Constructor</MemberType>
       <Parameters><Parameter Name="raw" Type="System.IntPtr" /></Parameters>
       <Docs><param name="raw">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GType">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ClockType"><MemberSignature Language="C#" Value="public Gst.ClockType ClockType { set; get; }" /><MemberType>Property</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><Attributes><Attribute><AttributeName>GLib.Property("clock-type")</AttributeName></Attribute></Attributes><ReturnValue><ReturnType>Gst.ClockType</ReturnType></ReturnValue><Docs><summary>To be added.</summary><value>To be added.</value><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>
diff --git a/doc/en/Gst/TagFlags.xml b/doc/en/Gst/TagFlags.xml
index c08c9287a4..1af4d7b879 100644
--- a/doc/en/Gst/TagFlags.xml
+++ b/doc/en/Gst/TagFlags.xml
@@ -58,4 +58,9 @@
       <Docs><summary>To be added.</summary></Docs>
     </Member>
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.TagFlagsGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/TagList.xml b/doc/en/Gst/TagList.xml
index 5e4e0cd817..bf0d9bb46c 100644
--- a/doc/en/Gst/TagList.xml
+++ b/doc/en/Gst/TagList.xml
@@ -98,7 +98,7 @@
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
       <Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="System.Boolean&amp;" RefType="out" /></Parameters>
       <Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetChar">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetBuffer"><MemberSignature Language="C#" Value="public bool GetBuffer (string tag, Gst.Buffer value);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="value" Type="Gst.Buffer" /></Parameters><Docs><param name="tag">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetBufferIndex"><MemberSignature Language="C#" Value="public bool GetBufferIndex (string tag, uint index, Gst.Buffer value);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="tag" Type="System.String" /><Parameter Name="index" Type="System.UInt32" /><Parameter Name="value" Type="Gst.Buffer" /></Parameters><Docs><param name="tag">To be added.</param><param name="index">To be added.</param><param name="value">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetChar">
       <MemberSignature Language="C#" Value="public bool GetChar (string tag, out string value);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
diff --git a/doc/en/Gst/TagMergeMode.xml b/doc/en/Gst/TagMergeMode.xml
index e83d386566..d82a6d78c6 100644
--- a/doc/en/Gst/TagMergeMode.xml
+++ b/doc/en/Gst/TagMergeMode.xml
@@ -61,4 +61,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.TagMergeModeGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/TaskState.xml b/doc/en/Gst/TaskState.xml
index 347ec389b4..cb0a546d5a 100644
--- a/doc/en/Gst/TaskState.xml
+++ b/doc/en/Gst/TaskState.xml
@@ -31,4 +31,9 @@
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member>
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.TaskStateGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/Gst/TypeFindProbability.xml b/doc/en/Gst/TypeFindProbability.xml
index 8c4f1ebc8f..783ed623b1 100644
--- a/doc/en/Gst/TypeFindProbability.xml
+++ b/doc/en/Gst/TypeFindProbability.xml
@@ -43,4 +43,9 @@
     
     
   </Members>
+  <Attributes>
+    <Attribute>
+      <AttributeName>GLib.GType(typeof(Gst.TypeFindProbabilityGType))</AttributeName>
+    </Attribute>
+  </Attributes>
 </Type>
diff --git a/doc/en/index.xml b/doc/en/index.xml
index b79dc0e7fa..9f6dff1bd6 100644
--- a/doc/en/index.xml
+++ b/doc/en/index.xml
@@ -36,6 +36,7 @@
       <Type Name="ClockEntryType" Kind="Enumeration" />
       <Type Name="ClockFlags" Kind="Enumeration" />
       <Type Name="ClockReturn" Kind="Enumeration" />
+      <Type Name="ClockType" Kind="Enumeration" />
       <Type Name="CommonTags" Kind="Class" />
       <Type Name="Date" Kind="Structure" />
       <Type Name="DecodeBin" Kind="Class" />
diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index 8905d9509e..cfa6e55e5f 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -5,6 +5,11 @@
   <attr path="/api/namespace/object[@name='Bin']/method[@name='RemoveMany']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bin']/field[@name='Children']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Bin']/method[@name='Add']" name="hidden">1</attr> 
+  <add-node path="/api/namespace/object[@name='Bin']">
+    <implements>
+      <interface cname="GstChildProxy" />
+    </implements>
+  </add-node>
 
   <attr path="/api/namespace/enum[@name='BinFlags']/member[@cname='GST_BIN_FLAG_LAST']" name="value">ElementFlags.Last &lt;&lt; 5</attr>
 
@@ -38,6 +43,9 @@
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_IN_CAPS']" name="value">MiniObjectFlags.Last &lt;&lt; 2</attr>
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_GAP']" name="value">MiniObjectFlags.Last &lt;&lt; 3</attr>
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_DELTA_UNIT']" name="value">MiniObjectFlags.Last &lt;&lt; 4</attr>
+  <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_MEDIA1']" name="value">MiniObjectFlags.Last &lt;&lt; 5</attr>
+  <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_MEDIA2']" name="value">MiniObjectFlags.Last &lt;&lt; 6</attr>
+  <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_MEDIA3']" name="value">MiniObjectFlags.Last &lt;&lt; 7</attr>
   <attr path="/api/namespace/enum[@name='BufferFlags']/member[@cname='GST_BUFFER_FLAG_LAST']" name="value">MiniObjectFlags.Last &lt;&lt; 8</attr>
 
   <attr path="/api/namespace/object[@name='Bus']/method[@name='AddWatch']" name="hidden">true</attr>
@@ -94,6 +102,8 @@
   <attr path="/api/namespace/enum[@name='ClockFlags']/member[@cname='GST_CLOCK_FLAG_CAN_SET_MASTER']" name="value">MiniObjectFlags.Last &lt;&lt; 5</attr>
   <attr path="/api/namespace/enum[@name='ClockFlags']/member[@cname='GST_CLOCK_FLAG_LAST']" name="value">MiniObjectFlags.Last &lt;&lt; 8</attr>
 
+  <attr path="/api/namespace/class[@name='Debug']" name="hidden">1</attr>
+
   <attr path="/api/namespace/object[@name='Element']/method[@name='LinkMany']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/method[@name='UnlinkMany']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Element']/method[@cname='gst_element_add_pad']" name="hidden">1</attr>
@@ -200,6 +210,8 @@
   <attr path="/api/namespace/object[@name='Index']/field[@cname='resolver']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Index']/property[@cname='resolver']" name="hidden">1</attr>
 
+  <attr path="/api/namespace/class[@name='Iterator']" name="hidden">1</attr>
+
   <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_FLAG_LAST']" name="name">Last</attr>
   <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_WRITABLE']" name="value">ObjectFlags.Last &lt;&lt; 0</attr>
   <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_READABLE']" name="value">ObjectFlags.Last &lt;&lt; 1</attr>
@@ -266,6 +278,8 @@
   <attr path="/api/namespace/object[@name='Pad']/field[@cname='intlinkfunc']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pad']/field[@cname='bufferallocfunc']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@name='Pad']/field[@cname='iterintlinkfunc']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Pad']/field[@cname='block_destroy_data']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Pad']/field[@cname='block_callback_called']" name="hidden">1</attr>
 
   <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_FLAG_LAST']" name="name">Last</attr>
   <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_BLOCKED']" name="value">ObjectFlags.Last &lt;&lt; 0</attr>
@@ -351,6 +365,8 @@
   <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_lookup']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_lookup_feature']/return-type" name="owned">true</attr>
 
+  <attr path="/api/namespace/enum[@name='SearchMode']" name="hidden">1</attr>
+
   <attr path="/api/namespace/enum[@name='StateChange']/member[@cname='GST_STATE_CHANGE_NULL_TO_READY']" name="value">(State.Null &lt;&lt; 3) | State.Ready</attr>
   <attr path="/api/namespace/enum[@name='StateChange']/member[@cname='GST_STATE_CHANGE_READY_TO_PAUSED']" name="value">(State.Ready &lt;&lt; 3) | State.Paused</attr>
   <attr path="/api/namespace/enum[@name='StateChange']/member[@cname='GST_STATE_CHANGE_PAUSED_TO_PLAYING']" name="value">(State.Paused &lt;&lt; 3) | State.Playing</attr>
@@ -436,6 +452,8 @@
 
   <attr path="/api/namespace/struct[@name='TypeFind']/method[@name='Register']" name="hidden">1</attr>
 
+  <attr path="/api/namespace/class[@name='Util']/method[@cname='gst_util_array_binary_search']" name="hidden">1</attr>
+
   <!-- We implement this ourselves -->
   <attr path="/api/namespace/class[@name='Value']" name="hidden">1</attr>
 </metadata>
diff --git a/gstreamer-sharp/gstreamer-api.raw b/gstreamer-sharp/gstreamer-api.raw
index dc0992b2fc..3e7f2413c1 100644
--- a/gstreamer-sharp/gstreamer-api.raw
+++ b/gstreamer-sharp/gstreamer-api.raw
@@ -7,57 +7,60 @@
 
 -->
   <namespace name="Gst" library="gstreamer-0.10.dll">
-    <enum name="ActivateMode" cname="GstActivateMode" type="enum">
+    <enum name="ActivateMode" cname="GstActivateMode" gtype="gst_activate_mode_get_type" type="enum">
       <member cname="GST_ACTIVATE_NONE" name="None" />
       <member cname="GST_ACTIVATE_PUSH" name="Push" />
       <member cname="GST_ACTIVATE_PULL" name="Pull" />
     </enum>
-    <enum name="AssocFlags" cname="GstAssocFlags" type="flags">
+    <enum name="AssocFlags" cname="GstAssocFlags" gtype="gst_assoc_flags_get_type" type="flags">
       <member cname="GST_ASSOCIATION_FLAG_NONE" name="None" />
       <member cname="GST_ASSOCIATION_FLAG_KEY_UNIT" name="KeyUnit" value="1 &lt;&lt; 0" />
       <member cname="GST_ASSOCIATION_FLAG_DELTA_UNIT" name="DeltaUnit" value="1 &lt;&lt; 1" />
       <member cname="GST_ASSOCIATION_FLAG_LAST" name="Last" value="1 &lt;&lt; 8" />
     </enum>
-    <enum name="BinFlags" cname="GstBinFlags" type="flags">
+    <enum name="BinFlags" cname="GstBinFlags" gtype="gst_bin_flags_get_type" type="flags">
       <member cname="GST_BIN_FLAG_LAST" name="Last" value="GST_ELEMENT_FLAG_LAST &lt;&lt; 5" />
     </enum>
-    <enum name="BufferCopyFlags" cname="GstBufferCopyFlags" type="flags">
+    <enum name="BufferCopyFlags" cname="GstBufferCopyFlags" gtype="gst_buffer_copy_flags_get_type" type="flags">
       <member cname="GST_BUFFER_COPY_FLAGS" name="Flags" value="1 &lt;&lt; 0" />
       <member cname="GST_BUFFER_COPY_TIMESTAMPS" name="Timestamps" value="1 &lt;&lt; 1" />
       <member cname="GST_BUFFER_COPY_CAPS" name="Caps" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="BufferFlag" cname="GstBufferFlag" type="flags">
+    <enum name="BufferFlag" cname="GstBufferFlag" gtype="gst_buffer_flag_get_type" type="flags">
       <member cname="GST_BUFFER_FLAG_READONLY" name="Readonly" value="GST_MINI_OBJECT_FLAG_READONLY" />
       <member cname="GST_BUFFER_FLAG_PREROLL" name="Preroll" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_BUFFER_FLAG_DISCONT" name="Discont" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 1" />
       <member cname="GST_BUFFER_FLAG_IN_CAPS" name="InCaps" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 2" />
       <member cname="GST_BUFFER_FLAG_GAP" name="Gap" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 3" />
       <member cname="GST_BUFFER_FLAG_DELTA_UNIT" name="DeltaUnit" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 4" />
+      <member cname="GST_BUFFER_FLAG_MEDIA1" name="Media1" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 5" />
+      <member cname="GST_BUFFER_FLAG_MEDIA2" name="Media2" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 6" />
+      <member cname="GST_BUFFER_FLAG_MEDIA3" name="Media3" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 7" />
       <member cname="GST_BUFFER_FLAG_LAST" name="Last" value="GST_MINI_OBJECT_FLAG_LAST &lt;&lt; 8" />
     </enum>
-    <enum name="BufferingMode" cname="GstBufferingMode" type="enum">
+    <enum name="BufferingMode" cname="GstBufferingMode" gtype="gst_buffering_mode_get_type" type="enum">
       <member cname="GST_BUFFERING_STREAM" name="Stream" />
       <member cname="GST_BUFFERING_DOWNLOAD" name="Download" />
       <member cname="GST_BUFFERING_TIMESHIFT" name="Timeshift" />
       <member cname="GST_BUFFERING_LIVE" name="Live" />
     </enum>
-    <enum name="BusFlags" cname="GstBusFlags" type="flags">
+    <enum name="BusFlags" cname="GstBusFlags" gtype="gst_bus_flags_get_type" type="flags">
       <member cname="GST_BUS_FLUSHING" name="Flushing" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_BUS_FLAG_LAST" name="FlagLast" value="GST_OBJECT_FLAG_LAST &lt;&lt; 1" />
     </enum>
-    <enum name="BusSyncReply" cname="GstBusSyncReply" type="enum">
+    <enum name="BusSyncReply" cname="GstBusSyncReply" gtype="gst_bus_sync_reply_get_type" type="enum">
       <member cname="GST_BUS_DROP" name="Drop" />
       <member cname="GST_BUS_PASS" name="Pass" value="1" />
       <member cname="GST_BUS_ASYNC" name="Async" value="2" />
     </enum>
-    <enum name="CapsFlags" cname="GstCapsFlags" type="flags">
+    <enum name="CapsFlags" cname="GstCapsFlags" gtype="gst_caps_flags_get_type" type="flags">
       <member cname="GST_CAPS_FLAGS_ANY" name="Any" value="1 &lt;&lt; 0" />
     </enum>
-    <enum name="ClockEntryType" cname="GstClockEntryType" type="enum">
+    <enum name="ClockEntryType" cname="GstClockEntryType" gtype="gst_clock_entry_type_get_type" type="enum">
       <member cname="GST_CLOCK_ENTRY_SINGLE" name="Single" />
       <member cname="GST_CLOCK_ENTRY_PERIODIC" name="Periodic" />
     </enum>
-    <enum name="ClockFlags" cname="GstClockFlags" type="flags">
+    <enum name="ClockFlags" cname="GstClockFlags" gtype="gst_clock_flags_get_type" type="flags">
       <member cname="GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC" name="CanDoSingleSync" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC" name="CanDoSingleAsync" value="GST_OBJECT_FLAG_LAST &lt;&lt; 1" />
       <member cname="GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC" name="CanDoPeriodicSync" value="GST_OBJECT_FLAG_LAST &lt;&lt; 2" />
@@ -66,7 +69,7 @@
       <member cname="GST_CLOCK_FLAG_CAN_SET_MASTER" name="CanSetMaster" value="GST_OBJECT_FLAG_LAST &lt;&lt; 5" />
       <member cname="GST_CLOCK_FLAG_LAST" name="Last" value="GST_OBJECT_FLAG_LAST &lt;&lt; 8" />
     </enum>
-    <enum name="ClockReturn" cname="GstClockReturn" type="enum">
+    <enum name="ClockReturn" cname="GstClockReturn" gtype="gst_clock_return_get_type" type="enum">
       <member cname="GST_CLOCK_OK" name="Ok" />
       <member cname="GST_CLOCK_EARLY" name="Early" value="1" />
       <member cname="GST_CLOCK_UNSCHEDULED" name="Unscheduled" value="2" />
@@ -75,13 +78,17 @@
       <member cname="GST_CLOCK_ERROR" name="Error" value="5" />
       <member cname="GST_CLOCK_UNSUPPORTED" name="Unsupported" value="6" />
     </enum>
-    <enum name="ElementFlags" cname="GstElementFlags" type="flags">
+    <enum name="ClockType" cname="GstClockType" gtype="gst_clock_type_get_type" type="enum">
+      <member cname="GST_CLOCK_TYPE_REALTIME" name="Realtime" />
+      <member cname="GST_CLOCK_TYPE_MONOTONIC" name="Monotonic" value="1" />
+    </enum>
+    <enum name="ElementFlags" cname="GstElementFlags" gtype="gst_element_flags_get_type" type="flags">
       <member cname="GST_ELEMENT_LOCKED_STATE" name="LockedState" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_ELEMENT_IS_SINK" name="IsSink" value="GST_OBJECT_FLAG_LAST &lt;&lt; 1" />
       <member cname="GST_ELEMENT_UNPARENTING" name="Unparenting" value="GST_OBJECT_FLAG_LAST &lt;&lt; 2" />
       <member cname="GST_ELEMENT_FLAG_LAST" name="FlagLast" value="GST_OBJECT_FLAG_LAST &lt;&lt; 16" />
     </enum>
-    <enum name="EventType" cname="GstEventType" type="enum">
+    <enum name="EventType" cname="GstEventType" gtype="gst_event_type_get_type" type="enum">
       <member cname="_GST_EVENT_UNKNOWN" name="GstEventUnknown" value="GST_EVENT_MAKE_TYPE (0" />
       <member cname="_0" name="0_" />
       <member cname="_GST_EVENT_FLUSH_START" name="GstEventFlushStart" value="GST_EVENT_MAKE_TYPE (1" />
@@ -115,12 +122,12 @@
       <member cname="_GST_EVENT_CUSTOM_BOTH_OOB" name="GstEventCustomBothOob" value="GST_EVENT_MAKE_TYPE (32" />
       <member cname="_FLAG" name="Flag" />
     </enum>
-    <enum name="EventTypeFlags" cname="GstEventTypeFlags" type="flags">
+    <enum name="EventTypeFlags" cname="GstEventTypeFlags" gtype="gst_event_type_flags_get_type" type="flags">
       <member cname="GST_EVENT_TYPE_UPSTREAM" name="Upstream" value="1 &lt;&lt; 0" />
       <member cname="GST_EVENT_TYPE_DOWNSTREAM" name="Downstream" value="1 &lt;&lt; 1" />
       <member cname="GST_EVENT_TYPE_SERIALIZED" name="Serialized" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="FlowReturn" cname="GstFlowReturn" type="enum">
+    <enum name="FlowReturn" cname="GstFlowReturn" gtype="gst_flow_return_get_type" type="enum">
       <member cname="GST_FLOW_CUSTOM_SUCCESS" name="CustomSuccess" value="100" />
       <member cname="GST_FLOW_RESEND" name="Resend" value="1" />
       <member cname="GST_FLOW_OK" name="Ok" />
@@ -132,7 +139,7 @@
       <member cname="GST_FLOW_NOT_SUPPORTED" name="NotSupported" value="-6" />
       <member cname="GST_FLOW_CUSTOM_ERROR" name="CustomError" value="-100" />
     </enum>
-    <enum name="Format" cname="GstFormat" type="enum">
+    <enum name="Format" cname="GstFormat" gtype="gst_format_get_type" type="enum">
       <member cname="GST_FORMAT_UNDEFINED" name="Undefined" />
       <member cname="GST_FORMAT_DEFAULT" name="Default" value="1" />
       <member cname="GST_FORMAT_BYTES" name="Bytes" value="2" />
@@ -140,33 +147,33 @@
       <member cname="GST_FORMAT_BUFFERS" name="Buffers" value="4" />
       <member cname="GST_FORMAT_PERCENT" name="Percent" value="5" />
     </enum>
-    <enum name="IndexCertainty" cname="GstIndexCertainty" type="enum">
+    <enum name="IndexCertainty" cname="GstIndexCertainty" gtype="gst_index_certainty_get_type" type="enum">
       <member cname="GST_INDEX_UNKNOWN" name="Unknown" />
       <member cname="GST_INDEX_CERTAIN" name="Certain" />
       <member cname="GST_INDEX_FUZZY" name="Fuzzy" />
     </enum>
-    <enum name="IndexEntryType" cname="GstIndexEntryType" type="enum">
+    <enum name="IndexEntryType" cname="GstIndexEntryType" gtype="gst_index_entry_type_get_type" type="enum">
       <member cname="GST_INDEX_ENTRY_ID" name="Id" />
       <member cname="GST_INDEX_ENTRY_ASSOCIATION" name="Association" />
       <member cname="GST_INDEX_ENTRY_OBJECT" name="Object" />
       <member cname="GST_INDEX_ENTRY_FORMAT" name="Format" />
     </enum>
-    <enum name="IndexFlags" cname="GstIndexFlags" type="flags">
+    <enum name="IndexFlags" cname="GstIndexFlags" gtype="gst_index_flags_get_type" type="flags">
       <member cname="GST_INDEX_WRITABLE" name="Writable" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_INDEX_READABLE" name="Readable" value="GST_OBJECT_FLAG_LAST &lt;&lt; 1" />
       <member cname="GST_INDEX_FLAG_LAST" name="FlagLast" value="GST_OBJECT_FLAG_LAST &lt;&lt; 8" />
     </enum>
-    <enum name="IndexLookupMethod" cname="GstIndexLookupMethod" type="enum">
+    <enum name="IndexLookupMethod" cname="GstIndexLookupMethod" gtype="gst_index_lookup_method_get_type" type="enum">
       <member cname="GST_INDEX_LOOKUP_EXACT" name="Exact" />
       <member cname="GST_INDEX_LOOKUP_BEFORE" name="Before" />
       <member cname="GST_INDEX_LOOKUP_AFTER" name="After" />
     </enum>
-    <enum name="IndexResolverMethod" cname="GstIndexResolverMethod" type="enum">
+    <enum name="IndexResolverMethod" cname="GstIndexResolverMethod" gtype="gst_index_resolver_method_get_type" type="enum">
       <member cname="GST_INDEX_RESOLVER_CUSTOM" name="Custom" />
       <member cname="GST_INDEX_RESOLVER_GTYPE" name="Gtype" />
       <member cname="GST_INDEX_RESOLVER_PATH" name="Path" />
     </enum>
-    <enum name="MessageType" cname="GstMessageType" type="flags">
+    <enum name="MessageType" cname="GstMessageType" gtype="gst_message_type_get_type" type="flags">
       <member cname="GST_MESSAGE_UNKNOWN" name="Unknown" />
       <member cname="GST_MESSAGE_EOS" name="Eos" value="1 &lt;&lt; 0" />
       <member cname="GST_MESSAGE_ERROR" name="Error" value="1 &lt;&lt; 1" />
@@ -190,23 +197,24 @@
       <member cname="GST_MESSAGE_LATENCY" name="Latency" value="1 &lt;&lt; 19" />
       <member cname="GST_MESSAGE_ASYNC_START" name="AsyncStart" value="1 &lt;&lt; 20" />
       <member cname="GST_MESSAGE_ASYNC_DONE" name="AsyncDone" value="1 &lt;&lt; 21" />
+      <member cname="GST_MESSAGE_REQUEST_STATE" name="RequestState" value="1 &lt;&lt; 22" />
       <member cname="GST_MESSAGE_ANY" name="Any" value="~0" />
     </enum>
-    <enum name="MiniObjectFlags" cname="GstMiniObjectFlags" type="flags">
+    <enum name="MiniObjectFlags" cname="GstMiniObjectFlags" gtype="gst_mini_object_flags_get_type" type="flags">
       <member cname="GST_MINI_OBJECT_FLAG_READONLY" name="Readonly" value="1 &lt;&lt; 0" />
       <member cname="GST_MINI_OBJECT_FLAG_LAST" name="Last" value="1 &lt;&lt; 4" />
     </enum>
-    <enum name="ObjectFlags" cname="GstObjectFlags" type="flags">
+    <enum name="ObjectFlags" cname="GstObjectFlags" gtype="gst_object_flags_get_type" type="flags">
       <member cname="GST_OBJECT_DISPOSING" name="Disposing" value="1 &lt;&lt; 0" />
       <member cname="GST_OBJECT_FLOATING" name="Floating" value="1 &lt;&lt; 1" />
       <member cname="GST_OBJECT_FLAG_LAST" name="FlagLast" value="1 &lt;&lt; 4" />
     </enum>
-    <enum name="PadDirection" cname="GstPadDirection" type="enum">
+    <enum name="PadDirection" cname="GstPadDirection" gtype="gst_pad_direction_get_type" type="enum">
       <member cname="GST_PAD_UNKNOWN" name="Unknown" />
       <member cname="GST_PAD_SRC" name="Src" />
       <member cname="GST_PAD_SINK" name="Sink" />
     </enum>
-    <enum name="PadFlags" cname="GstPadFlags" type="flags">
+    <enum name="PadFlags" cname="GstPadFlags" gtype="gst_pad_flags_get_type" type="flags">
       <member cname="GST_PAD_BLOCKED" name="Blocked" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_PAD_FLUSHING" name="Flushing" value="GST_OBJECT_FLAG_LAST &lt;&lt; 1" />
       <member cname="GST_PAD_IN_GETCAPS" name="InGetcaps" value="GST_OBJECT_FLAG_LAST &lt;&lt; 2" />
@@ -214,7 +222,7 @@
       <member cname="GST_PAD_BLOCKING" name="Blocking" value="GST_OBJECT_FLAG_LAST &lt;&lt; 4" />
       <member cname="GST_PAD_FLAG_LAST" name="FlagLast" value="GST_OBJECT_FLAG_LAST &lt;&lt; 8" />
     </enum>
-    <enum name="PadLinkReturn" cname="GstPadLinkReturn" type="enum">
+    <enum name="PadLinkReturn" cname="GstPadLinkReturn" gtype="gst_pad_link_return_get_type" type="enum">
       <member cname="GST_PAD_LINK_OK" name="Ok" />
       <member cname="GST_PAD_LINK_WRONG_HIERARCHY" name="WrongHierarchy" value="-1" />
       <member cname="GST_PAD_LINK_WAS_LINKED" name="WasLinked" value="-2" />
@@ -223,16 +231,16 @@
       <member cname="GST_PAD_LINK_NOSCHED" name="Nosched" value="-5" />
       <member cname="GST_PAD_LINK_REFUSED" name="Refused" value="-6" />
     </enum>
-    <enum name="PadPresence" cname="GstPadPresence" type="enum">
+    <enum name="PadPresence" cname="GstPadPresence" gtype="gst_pad_presence_get_type" type="enum">
       <member cname="GST_PAD_ALWAYS" name="Always" />
       <member cname="GST_PAD_SOMETIMES" name="Sometimes" />
       <member cname="GST_PAD_REQUEST" name="Request" />
     </enum>
-    <enum name="PadTemplateFlags" cname="GstPadTemplateFlags" type="flags">
+    <enum name="PadTemplateFlags" cname="GstPadTemplateFlags" gtype="gst_pad_template_flags_get_type" type="flags">
       <member cname="GST_PAD_TEMPLATE_FIXED" name="Fixed" value="GST_OBJECT_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_PAD_TEMPLATE_FLAG_LAST" name="FlagLast" value="GST_OBJECT_FLAG_LAST &lt;&lt; 4" />
     </enum>
-    <enum name="ParseError" cname="GstParseError" type="enum">
+    <enum name="ParseError" cname="GstParseError" gtype="gst_parse_error_get_type" type="enum">
       <member cname="GST_PARSE_ERROR_SYNTAX" name="Syntax" />
       <member cname="GST_PARSE_ERROR_NO_SUCH_ELEMENT" name="NoSuchElement" />
       <member cname="GST_PARSE_ERROR_NO_SUCH_PROPERTY" name="NoSuchProperty" />
@@ -241,29 +249,29 @@
       <member cname="GST_PARSE_ERROR_EMPTY_BIN" name="EmptyBin" />
       <member cname="GST_PARSE_ERROR_EMPTY" name="Empty" />
     </enum>
-    <enum name="ParseFlags" cname="GstParseFlags" type="flags">
+    <enum name="ParseFlags" cname="GstParseFlags" gtype="gst_parse_flags_get_type" type="flags">
       <member cname="GST_PARSE_FLAG_NONE" name="None" />
       <member cname="GST_PARSE_FLAG_FATAL_ERRORS" name="FatalErrors" value="1 &lt;&lt; 0" />
     </enum>
-    <enum name="PipelineFlags" cname="GstPipelineFlags" type="flags">
+    <enum name="PipelineFlags" cname="GstPipelineFlags" gtype="gst_pipeline_flags_get_type" type="flags">
       <member cname="GST_PIPELINE_FLAG_FIXED_CLOCK" name="FixedClock" value="GST_BIN_FLAG_LAST &lt;&lt; 0" />
       <member cname="GST_PIPELINE_FLAG_LAST" name="Last" value="GST_BIN_FLAG_LAST &lt;&lt; 4" />
     </enum>
-    <enum name="PluginDependencyFlags" cname="GstPluginDependencyFlags" type="flags">
+    <enum name="PluginDependencyFlags" cname="GstPluginDependencyFlags" gtype="gst_plugin_dependency_flags_get_type" type="flags">
       <member cname="GST_PLUGIN_DEPENDENCY_FLAG_NONE" name="None" />
       <member cname="GST_PLUGIN_DEPENDENCY_FLAG_RECURSE" name="Recurse" value="1 &lt;&lt; 0" />
       <member cname="GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY" name="PathsAreDefaultOnly" value="1 &lt;&lt; 1" />
       <member cname="GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX" name="FileNameIsSuffix" value="1 &lt;&lt; 2" />
     </enum>
-    <enum name="PluginError" cname="GstPluginError" type="enum">
+    <enum name="PluginError" cname="GstPluginError" gtype="gst_plugin_error_get_type" type="enum">
       <member cname="GST_PLUGIN_ERROR_MODULE" name="Module" />
       <member cname="GST_PLUGIN_ERROR_DEPENDENCIES" name="Dependencies" />
       <member cname="GST_PLUGIN_ERROR_NAME_MISMATCH" name="NameMismatch" />
     </enum>
-    <enum name="PluginFlags" cname="GstPluginFlags" type="flags">
+    <enum name="PluginFlags" cname="GstPluginFlags" gtype="gst_plugin_flags_get_type" type="flags">
       <member cname="GST_PLUGIN_FLAG_CACHED" name="Cached" value="1 &lt;&lt; 0" />
     </enum>
-    <enum name="QueryType" cname="GstQueryType" type="enum">
+    <enum name="QueryType" cname="GstQueryType" gtype="gst_query_type_get_type" type="enum">
       <member cname="GST_QUERY_NONE" name="None" />
       <member cname="GST_QUERY_POSITION" name="Position" />
       <member cname="GST_QUERY_DURATION" name="Duration" />
@@ -278,13 +286,18 @@
       <member cname="GST_QUERY_CUSTOM" name="Custom" />
       <member cname="GST_QUERY_URI" name="Uri" />
     </enum>
-    <enum name="Rank" cname="GstRank" type="enum">
+    <enum name="Rank" cname="GstRank" gtype="gst_rank_get_type" type="enum">
       <member cname="GST_RANK_NONE" name="None" />
       <member cname="GST_RANK_MARGINAL" name="Marginal" value="64" />
       <member cname="GST_RANK_SECONDARY" name="Secondary" value="128" />
       <member cname="GST_RANK_PRIMARY" name="Primary" value="256" />
     </enum>
-    <enum name="SeekFlags" cname="GstSeekFlags" type="flags">
+    <enum name="SearchMode" cname="GstSearchMode" gtype="gst_search_mode_get_type" type="enum">
+      <member cname="GST_SEARCH_MODE_EXACT" name="Exact" />
+      <member cname="GST_SEARCH_MODE_BEFORE" name="Before" />
+      <member cname="GST_SEARCH_MODE_AFTER" name="After" />
+    </enum>
+    <enum name="SeekFlags" cname="GstSeekFlags" gtype="gst_seek_flags_get_type" type="flags">
       <member cname="GST_SEEK_FLAG_NONE" name="None" />
       <member cname="GST_SEEK_FLAG_FLUSH" name="Flush" value="1 &lt;&lt; 0" />
       <member cname="GST_SEEK_FLAG_ACCURATE" name="Accurate" value="1 &lt;&lt; 1" />
@@ -292,20 +305,20 @@
       <member cname="GST_SEEK_FLAG_SEGMENT" name="Segment" value="1 &lt;&lt; 3" />
       <member cname="GST_SEEK_FLAG_SKIP" name="Skip" value="1 &lt;&lt; 4" />
     </enum>
-    <enum name="SeekType" cname="GstSeekType" type="enum">
+    <enum name="SeekType" cname="GstSeekType" gtype="gst_seek_type_get_type" type="enum">
       <member cname="GST_SEEK_TYPE_NONE" name="None" />
       <member cname="GST_SEEK_TYPE_CUR" name="Cur" value="1" />
       <member cname="GST_SEEK_TYPE_SET" name="Set" value="2" />
       <member cname="GST_SEEK_TYPE_END" name="End" value="3" />
     </enum>
-    <enum name="State" cname="GstState" type="enum">
+    <enum name="State" cname="GstState" gtype="gst_state_get_type" type="enum">
       <member cname="GST_STATE_VOID_PENDING" name="VoidPending" />
       <member cname="GST_STATE_NULL" name="Null" value="1" />
       <member cname="GST_STATE_READY" name="Ready" value="2" />
       <member cname="GST_STATE_PAUSED" name="Paused" value="3" />
       <member cname="GST_STATE_PLAYING" name="Playing" value="4" />
     </enum>
-    <enum name="StateChange" cname="GstStateChange" type="flags">
+    <enum name="StateChange" cname="GstStateChange" gtype="gst_state_change_get_type" type="flags">
       <member cname="GST_STATE_CHANGE_NULL_TO_READY" name="NullToReady" value="GST_STATE_NULL&lt;&lt;3| GST_STATE_READY" />
       <member cname="GST_STATE_CHANGE_READY_TO_PAUSED" name="ReadyToPaused" value="GST_STATE_READY&lt;&lt;3| GST_STATE_PAUSED" />
       <member cname="GST_STATE_CHANGE_PAUSED_TO_PLAYING" name="PausedToPlaying" value="GST_STATE_PAUSED&lt;&lt;3| GST_STATE_PLAYING" />
@@ -313,24 +326,24 @@
       <member cname="GST_STATE_CHANGE_PAUSED_TO_READY" name="PausedToReady" value="GST_STATE_PAUSED&lt;&lt;3| GST_STATE_READY" />
       <member cname="GST_STATE_CHANGE_READY_TO_NULL" name="ReadyToNull" value="GST_STATE_READY&lt;&lt;3| GST_STATE_NULL" />
     </enum>
-    <enum name="StateChangeReturn" cname="GstStateChangeReturn" type="enum">
+    <enum name="StateChangeReturn" cname="GstStateChangeReturn" gtype="gst_state_change_return_get_type" type="enum">
       <member cname="GST_STATE_CHANGE_FAILURE" name="Failure" />
       <member cname="GST_STATE_CHANGE_SUCCESS" name="Success" value="1" />
       <member cname="GST_STATE_CHANGE_ASYNC" name="Async" value="2" />
       <member cname="GST_STATE_CHANGE_NO_PREROLL" name="NoPreroll" value="3" />
     </enum>
-    <enum name="StructureChangeType" cname="GstStructureChangeType" type="enum">
+    <enum name="StructureChangeType" cname="GstStructureChangeType" gtype="gst_structure_change_type_get_type" type="enum">
       <member cname="GST_STRUCTURE_CHANGE_TYPE_PAD_LINK" name="Link" />
       <member cname="GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK" name="Unlink" value="1" />
     </enum>
-    <enum name="TagFlag" cname="GstTagFlag" type="enum">
+    <enum name="TagFlag" cname="GstTagFlag" gtype="gst_tag_flag_get_type" type="enum">
       <member cname="GST_TAG_FLAG_UNDEFINED" name="Undefined" />
       <member cname="GST_TAG_FLAG_META" name="Meta" />
       <member cname="GST_TAG_FLAG_ENCODED" name="Encoded" />
       <member cname="GST_TAG_FLAG_DECODED" name="Decoded" />
       <member cname="GST_TAG_FLAG_COUNT" name="Count" />
     </enum>
-    <enum name="TagMergeMode" cname="GstTagMergeMode" type="enum">
+    <enum name="TagMergeMode" cname="GstTagMergeMode" gtype="gst_tag_merge_mode_get_type" type="enum">
       <member cname="GST_TAG_MERGE_UNDEFINED" name="Undefined" />
       <member cname="GST_TAG_MERGE_REPLACE_ALL" name="ReplaceAll" />
       <member cname="GST_TAG_MERGE_REPLACE" name="Replace" />
@@ -340,12 +353,12 @@
       <member cname="GST_TAG_MERGE_KEEP_ALL" name="KeepAll" />
       <member cname="GST_TAG_MERGE_COUNT" name="Count" />
     </enum>
-    <enum name="TaskState" cname="GstTaskState" type="enum">
+    <enum name="TaskState" cname="GstTaskState" gtype="gst_task_state_get_type" type="enum">
       <member cname="GST_TASK_STARTED" name="Started" />
       <member cname="GST_TASK_STOPPED" name="Stopped" />
       <member cname="GST_TASK_PAUSED" name="Paused" />
     </enum>
-    <enum name="TypeFindProbability" cname="GstTypeFindProbability" type="enum">
+    <enum name="TypeFindProbability" cname="GstTypeFindProbability" gtype="gst_type_find_probability_get_type" type="enum">
       <member cname="GST_TYPE_FIND_MINIMUM" name="Minimum" value="1" />
       <member cname="GST_TYPE_FIND_POSSIBLE" name="Possible" value="50" />
       <member cname="GST_TYPE_FIND_LIKELY" name="Likely" value="80" />
@@ -828,9 +841,6 @@
           <parameter type="GstMessage*" name="message" />
         </parameters>
       </virtual_method>
-      <implements>
-        <interface cname="GstChildProxy" />
-      </implements>
       <method name="Add" cname="gst_bin_add">
         <return-type type="gboolean" />
         <parameters>
@@ -844,7 +854,7 @@
           <parameter ellipsis="true" />
         </parameters>
       </method>
-      <method name="FindUnconnectedPad" cname="gst_bin_find_unconnected_pad">
+      <method name="FindUnconnectedPad" cname="gst_bin_find_unconnected_pad" deprecated="1">
         <return-type type="GstPad*" />
         <parameters>
           <parameter type="GstPadDirection" name="direction" />
@@ -995,7 +1005,7 @@
           <parameter type="guint32" name="len" />
         </parameters>
       </method>
-      <method name="Stamp" cname="gst_buffer_stamp">
+      <method name="Stamp" cname="gst_buffer_stamp" deprecated="1">
         <return-type type="void" />
         <parameters>
           <parameter type="const-GstBuffer*" name="src" />
@@ -2457,6 +2467,12 @@
           <parameter type="GstClock*" name="clock" />
         </parameters>
       </constructor>
+      <constructor cname="gst_message_new_request_state">
+        <parameters>
+          <parameter type="GstObject*" name="src" />
+          <parameter type="GstState" name="state" />
+        </parameters>
+      </constructor>
       <constructor cname="gst_message_new_segment_done">
         <parameters>
           <parameter type="GstObject*" name="src" />
@@ -2566,6 +2582,12 @@
           <parameter type="GstClock**" name="clock" />
         </parameters>
       </method>
+      <method name="ParseRequestState" cname="gst_message_parse_request_state">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GstState*" name="state" />
+        </parameters>
+      </method>
       <method name="ParseSegmentDone" cname="gst_message_parse_segment_done">
         <return-type type="void" />
         <parameters>
@@ -2860,7 +2882,8 @@
       <field name="DoBufferSignals" cname="do_buffer_signals" type="gint" access="public" />
       <field name="DoEventSignals" cname="do_event_signals" type="gint" access="public" />
       <field name="Iterintlinkfunc" cname="iterintlinkfunc" type="GstPadIterIntLinkFunction" access="public" />
-      <field name="GstReserved" cname="_gst_reserved" array_len="GST_PADDING - 1" type="gpointer" />
+      <field name="BlockDestroyData" cname="block_destroy_data" type="GDestroyNotify" access="public" />
+      <field name="BlockCallbackCalled" cname="block_callback_called" type="gboolean" />
       <signal name="Linked" cname="linked" when="LAST" field_name="linked">
         <return-type type="void" />
         <parameters>
@@ -3042,12 +3065,6 @@
       <method name="GetPeer" cname="gst_pad_get_peer">
         <return-type type="GstPad*" />
       </method>
-      <method name="GetQueryTypes" cname="gst_pad_get_query_types">
-        <return-type type="const-GstQueryType*" />
-      </method>
-      <method name="GetQueryTypesDefault" cname="gst_pad_get_query_types_default">
-        <return-type type="const-GstQueryType*" />
-      </method>
       <method name="GetRange" cname="gst_pad_get_range">
         <return-type type="GstFlowReturn" />
         <parameters>
@@ -3281,6 +3298,15 @@
           <parameter type="gpointer" name="user_data" />
         </parameters>
       </method>
+      <method name="SetBlockedAsyncFull" cname="gst_pad_set_blocked_async_full">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="gboolean" name="blocked" />
+          <parameter type="GstPadBlockCallback" name="callback" />
+          <parameter type="gpointer" name="user_data" />
+          <parameter type="GDestroyNotify" name="destroy_data" />
+        </parameters>
+      </method>
       <method name="SetBufferallocFunction" cname="gst_pad_set_bufferalloc_function">
         <return-type type="void" />
         <parameters>
@@ -4096,7 +4122,9 @@
     <object name="SystemClock" cname="GstSystemClock" parent="GstClock">
       <field name="Thread" cname="thread" type="GThread*" />
       <field name="Stopping" cname="stopping" type="gboolean" />
-      <field name="GstReserved" cname="_gst_reserved" array_len="GST_PADDING" type="gpointer" />
+      <field name="Priv" cname="priv" type="GstSystemClockPrivate*" />
+      <field name="GstReserved" cname="_gst_reserved" array_len="GST_PADDING - 1" type="gpointer" />
+      <property name="ClockType" cname="clock-type" type="GstClockType" readable="true" writeable="true" />
       <method name="GetType" cname="gst_system_clock_get_type" shared="true">
         <return-type type="GType" />
       </method>
@@ -5022,6 +5050,21 @@
           <parameter type="gboolean*" name="value" />
         </parameters>
       </method>
+      <method name="GetBuffer" cname="gst_tag_list_get_buffer">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="const-gchar*" name="tag" />
+          <parameter type="GstBuffer**" name="value" />
+        </parameters>
+      </method>
+      <method name="GetBufferIndex" cname="gst_tag_list_get_buffer_index">
+        <return-type type="gboolean" />
+        <parameters>
+          <parameter type="const-gchar*" name="tag" />
+          <parameter type="guint" name="index" />
+          <parameter type="GstBuffer**" name="value" />
+        </parameters>
+      </method>
       <method name="GetChar" cname="gst_tag_list_get_char">
         <return-type type="gboolean" />
         <parameters>
@@ -5327,7 +5370,10 @@
       <field name="Type" cname="type" type="GType" />
     </struct>
     <class name="Global" cname="GstGlobal">
-      <method name="AtomicIntSet" cname="gst_atomic_int_set" shared="true">
+      <method name="AllocTraceFlagsGetType" cname="gst_alloc_trace_flags_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="AtomicIntSet" cname="gst_atomic_int_set" deprecated="1" shared="true">
         <return-type type="void" />
         <parameters>
           <parameter type="gint*" name="atomic_int" />
@@ -5342,6 +5388,9 @@
           <parameter type="GstXmlNodePtr" name="self" />
         </parameters>
       </method>
+      <method name="CoreErrorGetType" cname="gst_core_error_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
       <method name="DefaultRegistryCheckFeatureVersion" cname="gst_default_registry_check_feature_version" shared="true">
         <return-type type="gboolean" />
         <parameters>
@@ -5398,6 +5447,9 @@
           <parameter type="gconstpointer" name="p" />
         </parameters>
       </method>
+      <method name="LibraryErrorGetType" cname="gst_library_error_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
       <method name="ParamSpecMiniObject" cname="gst_param_spec_mini_object" shared="true">
         <return-type type="GParamSpec*" />
         <parameters>
@@ -5461,6 +5513,12 @@
           <parameter type="GError**" name="error" />
         </parameters>
       </method>
+      <method name="ResourceErrorGetType" cname="gst_resource_error_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="StreamErrorGetType" cname="gst_stream_error_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
       <method name="TypeRegisterStaticFull" cname="gst_type_register_static_full" shared="true">
         <return-type type="GType" />
         <parameters>
@@ -5482,10 +5540,24 @@
       <method name="UpdateRegistry" cname="gst_update_registry" shared="true">
         <return-type type="gboolean" />
       </method>
+      <method name="UriTypeGetType" cname="gst_uri_type_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
       <method name="VersionString" cname="gst_version_string" shared="true">
         <return-type type="gchar*" />
       </method>
     </class>
+    <class name="Debug" cname="GstDebug_">
+      <method name="ColorFlagsGetType" cname="gst_debug_color_flags_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="GraphDetailsGetType" cname="gst_debug_graph_details_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="LevelGetType" cname="gst_debug_level_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+    </class>
     <class name="Flow" cname="GstFlow_">
       <method name="GetName" cname="gst_flow_get_name" shared="true">
         <return-type type="const-gchar*" />
@@ -5513,6 +5585,14 @@
         <return-type type="GOptionGroup*" />
       </method>
     </class>
+    <class name="Iterator" cname="GstIterator_">
+      <method name="ItemGetType" cname="gst_iterator_item_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+      <method name="ResultGetType" cname="gst_iterator_result_get_type" shared="true">
+        <return-type type="GType" />
+      </method>
+    </class>
     <class name="Print" cname="GstPrint_">
       <method name="ElementArgs" cname="gst_print_element_args" shared="true">
         <return-type type="void" />
@@ -5606,6 +5686,18 @@
       </method>
     </class>
     <class name="Util" cname="GstUtil_">
+      <method name="ArrayBinarySearch" cname="gst_util_array_binary_search" shared="true">
+        <return-type type="gpointer" />
+        <parameters>
+          <parameter type="gpointer" name="array" />
+          <parameter type="guint" name="num_elements" />
+          <parameter type="gsize" name="element_size" />
+          <parameter type="GCompareDataFunc" name="search_func" />
+          <parameter type="GstSearchMode" name="mode" />
+          <parameter type="gconstpointer" name="search_data" />
+          <parameter type="gpointer" name="user_data" />
+        </parameters>
+      </method>
       <method name="DumpMem" cname="gst_util_dump_mem" shared="true">
         <return-type type="void" />
         <parameters>
diff --git a/source/Makefile.am b/source/Makefile.am
index b3d2e74a16..fb2746228b 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -1,11 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-BASE_PATH="http://gstreamer.freedesktop.org/src"
-
-update-source:
-	wget -O - $(BASE_PATH)/gstreamer/gstreamer-$(GSTREAMER_REQUIRED_VERSION).tar.gz | tar xz
-	wget -O - $(BASE_PATH)/gst-plugins-base/gst-plugins-base-$(GSTREAMER_REQUIRED_VERSION).tar.gz | tar xz
-
 api:
 	$(GAPI_PARSER) gstreamer-sharp-source.xml
 
diff --git a/source/gstreamer-sharp-source.xml b/source/gstreamer-sharp-source.xml
index f122372933..f19bb2b641 100644
--- a/source/gstreamer-sharp-source.xml
+++ b/source/gstreamer-sharp-source.xml
@@ -2,35 +2,34 @@
   <api filename="../gstreamer-sharp/gstreamer-api.raw">
     <library name="gstreamer-0.10.dll">
       <namespace name="Gst">
-        <dir>gstreamer-0.10.22/gst</dir>
+        <dir>../../gstreamer/gst</dir>
         <!-- Needs to be bound -->
-        <exclude>gstreamer-0.10.22/gst/gstdebugutils.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gsterror.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstinfo.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstinterface.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gsturi.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstpreset.h</exclude>
+        <exclude>../../gstreamer/gst/gstdebugutils.h</exclude>
+        <exclude>../../gstreamer/gst/gsterror.h</exclude>
+        <exclude>../../gstreamer/gst/gstinfo.h</exclude>
+        <exclude>../../gstreamer/gst/gstinterface.h</exclude>
+        <exclude>../../gstreamer/gst/gsturi.h</exclude>
+        <exclude>../../gstreamer/gst/gstpreset.h</exclude>
         <!-- Not bound -->
-        <exclude>gstreamer-0.10.22/gst/gstconfig.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstenumtypes.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstfilter.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstiterator.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstmacros.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstmarshal.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstparamspecs.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstpoll.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gsttrace.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstvalue.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstversion.h</exclude>
+        <exclude>../../gstreamer/gst/gstconfig.h</exclude>
+        <exclude>../../gstreamer/gst/gstfilter.h</exclude>
+        <exclude>../../gstreamer/gst/gstiterator.h</exclude>
+        <exclude>../../gstreamer/gst/gstmacros.h</exclude>
+        <exclude>../../gstreamer/gst/gstmarshal.h</exclude>
+        <exclude>../../gstreamer/gst/gstparamspecs.h</exclude>
+        <exclude>../../gstreamer/gst/gstpoll.h</exclude>
+        <exclude>../../gstreamer/gst/gsttrace.h</exclude>
+        <exclude>../../gstreamer/gst/gstvalue.h</exclude>
+        <exclude>../../gstreamer/gst/gstversion.h</exclude>
         <!-- Private headers -->
-        <exclude>gstreamer-0.10.22/gst/gstregistrybinary.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstregistryxml.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gst_private.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/glib-compat-private.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/glib-i18n-lib.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/glib-i18n-app.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gstquark.h</exclude>
-        <exclude>gstreamer-0.10.22/gst/gettext.h</exclude>
+        <exclude>../../gstreamer/gst/gstregistrybinary.h</exclude>
+        <exclude>../../gstreamer/gst/gstregistryxml.h</exclude>
+        <exclude>../../gstreamer/gst/gst_private.h</exclude>
+        <exclude>../../gstreamer/gst/glib-compat-private.h</exclude>
+        <exclude>../../gstreamer/gst/glib-i18n-lib.h</exclude>
+        <exclude>../../gstreamer/gst/glib-i18n-app.h</exclude>
+        <exclude>../../gstreamer/gst/gstquark.h</exclude>
+        <exclude>../../gstreamer/gst/gettext.h</exclude>
       </namespace>
     </library>
   </api>