diff --git a/doc/en/Gst/Global.xml b/doc/en/Gst/Global.xml
index dde3ae705e..d27df2ce57 100644
--- a/doc/en/Gst/Global.xml
+++ b/doc/en/Gst/Global.xml
@@ -25,12 +25,6 @@
       <ReturnValue><ReturnType>System.Int32</ReturnType></ReturnValue>
       <Parameters><Parameter Name="value" Type="System.Int32" /></Parameters>
       <Docs><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="DefaultRegistryCheckFeatureVersion">
-      <MemberSignature Language="C#" Value="public static bool DefaultRegistryCheckFeatureVersion (string feature_name, uint min_major, uint min_minor, uint min_micro);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="feature_name" Type="System.String" /><Parameter Name="min_major" Type="System.UInt32" /><Parameter Name="min_minor" Type="System.UInt32" /><Parameter Name="min_micro" Type="System.UInt32" /></Parameters>
-      <Docs><param name="feature_name">To be added.</param><param name="min_major">To be added.</param><param name="min_minor">To be added.</param><param name="min_micro">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="FormatGetByNick">
       <MemberSignature Language="C#" Value="public static Gst.Format FormatGetByNick (string nick);" />
       <MemberType>Method</MemberType>
@@ -97,7 +91,7 @@
       <ReturnValue><ReturnType>Gst.Element</ReturnType></ReturnValue>
       <Parameters><Parameter Name="argv" Type="System.String" /></Parameters>
       <Docs><param name="argv">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="ParseLaunchvFull"><MemberSignature Language="C#" Value="public static Gst.Element ParseLaunchvFull (string argv, Gst.ParseContext context, Gst.ParseFlags flags);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.Element</ReturnType></ReturnValue><Parameters><Parameter Name="argv" Type="System.String" /><Parameter Name="context" Type="Gst.ParseContext" /><Parameter Name="flags" Type="Gst.ParseFlags" /></Parameters><Docs><param name="argv">To be added.</param><param name="context">To be added.</param><param name="flags">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="UpdateRegistry"><MemberSignature Language="C#" Value="public static bool UpdateRegistry ();" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters /><Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member>
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ParseLaunchvFull"><MemberSignature Language="C#" Value="public static Gst.Element ParseLaunchvFull (string argv, Gst.ParseContext context, Gst.ParseFlags flags);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.Element</ReturnType></ReturnValue><Parameters><Parameter Name="argv" Type="System.String" /><Parameter Name="context" Type="Gst.ParseContext" /><Parameter Name="flags" Type="Gst.ParseFlags" /></Parameters><Docs><param name="argv">To be added.</param><param name="context">To be added.</param><param name="flags">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member>
     
     
     
diff --git a/doc/en/Gst/Registry.xml b/doc/en/Gst/Registry.xml
index 34f98b63b0..bf652f17e6 100644
--- a/doc/en/Gst/Registry.xml
+++ b/doc/en/Gst/Registry.xml
@@ -23,8 +23,24 @@
     
     
     
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="protected Registry ();" />
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Registry ();" />
       <MemberType>Constructor</MemberType>
       <Parameters />
       <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
@@ -62,13 +78,7 @@
       <Attributes><Attribute><AttributeName>GLib.Signal("feature-added")</AttributeName></Attribute></Attributes>
       <ReturnValue><ReturnType>Gst.FeatureAddedHandler</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="FeatureFilter">
-      <MemberSignature Language="C#" Value="public GLib.List FeatureFilter (Gst.PluginFeatureFilter filter, bool first);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="filter" Type="Gst.PluginFeatureFilter" /><Parameter Name="first" Type="System.Boolean" /></Parameters>
-      <Docs><param name="filter">To be added.</param><param name="first">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="FindFeature">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="FeatureFilter"><MemberSignature Language="C#" Value="public Gst.PluginFeature[] FeatureFilter (Gst.PluginFeatureFilter filter, bool first);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.PluginFeature[]</ReturnType></ReturnValue><Parameters><Parameter Name="filter" Type="Gst.PluginFeatureFilter" /><Parameter Name="first" Type="System.Boolean" /></Parameters><Docs><param name="filter">To be added.</param><param name="first">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="FindFeature">
       <MemberSignature Language="C#" Value="public Gst.PluginFeature FindFeature (string name, GLib.GType type);" />
       <MemberType>Method</MemberType>
       <ReturnValue><ReturnType>Gst.PluginFeature</ReturnType></ReturnValue>
@@ -80,19 +90,7 @@
       <ReturnValue><ReturnType>Gst.Plugin</ReturnType></ReturnValue>
       <Parameters><Parameter Name="name" Type="System.String" /></Parameters>
       <Docs><param name="name">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="ForkIsEnabled"><MemberSignature Language="C#" Value="public static bool ForkIsEnabled ();" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters /><Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="ForkSetEnabled"><MemberSignature Language="C#" Value="public static void ForkSetEnabled (bool enabled);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue><Parameters><Parameter Name="enabled" Type="System.Boolean" /></Parameters><Docs><param name="enabled">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetFeatureList">
-      <MemberSignature Language="C#" Value="public GLib.List GetFeatureList (GLib.GType type);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="type" Type="GLib.GType" /></Parameters>
-      <Docs><param name="type">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="GetFeatureListByPlugin">
-      <MemberSignature Language="C#" Value="public GLib.List GetFeatureListByPlugin (string name);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="name" Type="System.String" /></Parameters>
-      <Docs><param name="name">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="GType">
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="GetFeatureList"><MemberSignature Language="C#" Value="public Gst.PluginFeature[] GetFeatureList (GLib.GType type);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.PluginFeature[]</ReturnType></ReturnValue><Parameters><Parameter Name="type" Type="GLib.GType" /></Parameters><Docs><param name="type">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="GetFeatureListByPlugin"><MemberSignature Language="C#" Value="public Gst.PluginFeature[] GetFeatureListByPlugin (string name);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.PluginFeature[]</ReturnType></ReturnValue><Parameters><Parameter Name="name" Type="System.String" /></Parameters><Docs><param name="name">To be added.</param><summary>To be added.</summary><returns>To be added.</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>
@@ -122,9 +120,9 @@
       <Parameters><Parameter Name="plugin" Type="Gst.Plugin" /></Parameters>
       <Docs><param name="plugin">To be added.</param><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
     <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><Attributes><Attribute><AttributeName>GLib.DefaultSignalHandler(Type=typeof(Gst.Registry), ConnectionMethod="OverridePluginAdded")</AttributeName></Attribute></Attributes></Member><Member MemberName="PathList">
-      <MemberSignature Language="C#" Value="public GLib.List PathList { get; }" />
+      <MemberSignature Language="C#" Value="public string[] PathList { get; }" />
       <MemberType>Property</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
+      <ReturnValue><ReturnType>System.String[]</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="PluginAdded">
       <MemberSignature Language="C#" Value="public event Gst.PluginAddedHandler PluginAdded;" />
@@ -132,16 +130,10 @@
       <Attributes><Attribute><AttributeName>GLib.Signal("plugin-added")</AttributeName></Attribute></Attributes>
       <ReturnValue><ReturnType>Gst.PluginAddedHandler</ReturnType></ReturnValue>
       <Docs><summary>To be added.</summary><remarks>To be added.</remarks></Docs>
-    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="PluginFilter">
-      <MemberSignature Language="C#" Value="public GLib.List PluginFilter (Gst.PluginFilter filter, bool first);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="filter" Type="Gst.PluginFilter" /><Parameter Name="first" Type="System.Boolean" /></Parameters>
-      <Docs><param name="filter">To be added.</param><param name="first">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="PluginList">
-      <MemberSignature Language="C#" Value="public GLib.List PluginList { get; }" />
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="PluginFilter"><MemberSignature Language="C#" Value="public Gst.Plugin[] PluginFilter (Gst.PluginFilter filter, bool first);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>Gst.Plugin[]</ReturnType></ReturnValue><Parameters><Parameter Name="filter" Type="Gst.PluginFilter" /><Parameter Name="first" Type="System.Boolean" /></Parameters><Docs><param name="filter">To be added.</param><param name="first">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="PluginList">
+      <MemberSignature Language="C#" Value="public Gst.Plugin[] PluginList { get; }" />
       <MemberType>Property</MemberType>
-      <ReturnValue><ReturnType>GLib.List</ReturnType></ReturnValue>
+      <ReturnValue><ReturnType>Gst.Plugin[]</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="RemoveFeature">
       <MemberSignature Language="C#" Value="public void RemoveFeature (Gst.PluginFeature feature);" />
@@ -155,33 +147,5 @@
       <ReturnValue><ReturnType>System.Void</ReturnType></ReturnValue>
       <Parameters><Parameter Name="plugin" Type="Gst.Plugin" /></Parameters>
       <Docs><param name="plugin">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="ScanPath"><MemberSignature Language="C#" Value="public bool ScanPath (string path);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="path" Type="System.String" /></Parameters><Docs><param name="path">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="XmlReadCache">
-      <MemberSignature Language="C#" Value="public bool XmlReadCache (string location);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="location" Type="System.String" /></Parameters>
-      <Docs><param name="location">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="XmlWriteCache">
-      <MemberSignature Language="C#" Value="public bool XmlWriteCache (string location);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
-      <Parameters><Parameter Name="location" Type="System.String" /></Parameters>
-      <Docs><param name="location">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>
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  </Members>
+    <AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo></Member><Member MemberName="ScanPath"><MemberSignature Language="C#" Value="public bool ScanPath (string path);" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters><Parameter Name="path" Type="System.String" /></Parameters><Docs><param name="path">To be added.</param><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member><Member MemberName="UpdateDefault"><MemberSignature Language="C#" Value="public static bool UpdateDefault ();" /><MemberType>Method</MemberType><AssemblyInfo><AssemblyVersion>0.9.5.99</AssemblyVersion></AssemblyInfo><ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue><Parameters /><Docs><summary>To be added.</summary><returns>To be added.</returns><remarks>To be added.</remarks></Docs></Member></Members>
 </Type>
diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index 0d493a417a..da35aa6c5e 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -112,6 +112,8 @@
   <attr path="/api/namespace/object[@name='GhostPad']" name="parent">GstPad</attr>
 
   <remove-node path="/api/namespace/class[@name='Global']/method[@cname='gst_version_string']" />
+  <remove-node path="/api/namespace/class[@name='Global']/method[@cname='gst_default_registry_check_feature_version']" />
+  <move-node path="/api/namespace/class[@name='Global']/method[@cname='gst_update_registry']">/api/namespace/object[@name='Registry']</move-node>
 
   <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>
@@ -199,6 +201,31 @@
   <change-node-type path="/api/namespace/object[@name='Query']">boxed</change-node-type>
   <attr path="/api/namespace/boxed[@name='Query']" name="opaque">true</attr>
 
+  <attr path="/api/namespace/object[@name='Registry']" name="disable_void_ctor">1</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_update_registry']" name="name">UpdateDefault</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_feature_filter']/return-type" name="element_type">GstPluginFeature</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_feature_filter']/return-type" name="elements_owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_feature_filter']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list']/return-type" name="element_type">GstPluginFeature</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list']/return-type" name="elements_owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list_by_plugin']/return-type" name="element_type">GstPluginFeature</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list_by_plugin']/return-type" name="elements_owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_feature_list_by_plugin']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_plugin_filter']/return-type" name="element_type">GstPlugin</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_plugin_filter']/return-type" name="elements_owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_plugin_filter']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_path_list']/return-type" name="element_type">const-char*</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_path_list']/return-type" name="elements_owned">false</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_path_list']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_plugin_list']/return-type" name="element_type">GstPlugin</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_plugin_list']/return-type" name="elements_owned">true</attr>
+  <attr path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_get_plugin_list']/return-type" name="owned">true</attr>
+  <remove-node path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_xml_write_cache']" />
+  <remove-node path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_xml_read_cache']" />
+  <remove-node path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_fork_is_enabled']" />
+  <remove-node path="/api/namespace/object[@name='Registry']/method[@cname='gst_registry_fork_set_enabled']" />
+
   <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>
diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index cc7f5c62d4..4ae46d781c 100644
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -52,7 +52,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources))
 
 customs = 			\
 	Bin.custom		\
-	Buffer.custom	\
+	Buffer.custom           \
 	Bus.custom		\
 	Caps.custom		\
 	Clock.custom		\
@@ -61,7 +61,9 @@ customs = 			\
 	Message.custom		\
 	Pad.custom		\
 	Object.custom		\
-	MiniObject.custom
+	MiniObject.custom       \
+	Registry.custom
+
 		
 
 build_customs = $(addprefix $(srcdir)/, $(customs))
diff --git a/gstreamer-sharp/Registry.custom b/gstreamer-sharp/Registry.custom
new file mode 100644
index 0000000000..1c0f06f444
--- /dev/null
+++ b/gstreamer-sharp/Registry.custom
@@ -0,0 +1,4 @@
+public Registry() : base (IntPtr.Zero)
+{
+  CreateNativeObject (new string [0], new GLib.Value [0]);
+}
diff --git a/source/gstreamer-sharp-source.xml b/source/gstreamer-sharp-source.xml
index f50b1c2cfe..f122372933 100644
--- a/source/gstreamer-sharp-source.xml
+++ b/source/gstreamer-sharp-source.xml
@@ -1,23 +1,16 @@
 <gapi-parser-input>
   <api filename="../gstreamer-sharp/gstreamer-api.raw">
-<!--
-	<library name="gstcontroller-0.10.dll">
-	  <namespace name="Gst">
-        <dir>gstreamer-0.10.3/libs/gst/controller</dir>
-      </namespace>
-    </library>
--->	
     <library name="gstreamer-0.10.dll">
       <namespace name="Gst">
         <dir>gstreamer-0.10.22/gst</dir>
-	<!-- Needs to be bound -->
+        <!-- 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>
-	<!-- Not bound -->
+        <!-- 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>
@@ -29,7 +22,7 @@
         <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>
-	<!-- Private headers -->
+        <!-- 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>
@@ -39,6 +32,6 @@
         <exclude>gstreamer-0.10.22/gst/gstquark.h</exclude>
         <exclude>gstreamer-0.10.22/gst/gettext.h</exclude>
       </namespace>
-	</library>
+    </library>
   </api>
 </gapi-parser-input>