diff --git a/GI/Gio.hs b/GI/Gio.hs
--- a/GI/Gio.hs
+++ b/GI/Gio.hs
@@ -32,9 +32,9 @@
 import GI.Gio.Objects
 import GI.Gio.Structs
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Callbacks.hs b/GI/Gio/Callbacks.hs
--- a/GI/Gio/Callbacks.hs
+++ b/GI/Gio/Callbacks.hs
@@ -275,9 +275,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Constants.hs b/GI/Gio/Constants.hs
--- a/GI/Gio/Constants.hs
+++ b/GI/Gio/Constants.hs
@@ -114,9 +114,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Enums.hs b/GI/Gio/Enums.hs
--- a/GI/Gio/Enums.hs
+++ b/GI/Gio/Enums.hs
@@ -62,9 +62,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Flags.hs b/GI/Gio/Flags.hs
--- a/GI/Gio/Flags.hs
+++ b/GI/Gio/Flags.hs
@@ -52,9 +52,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -88,8 +88,8 @@
 foreign import ccall "g_tls_password_flags_get_type" c_g_tls_password_flags_get_type :: 
     IO GType
 
-instance BoxedEnum TlsPasswordFlags where
-    boxedEnumType _ = c_g_tls_password_flags_get_type
+instance BoxedFlags TlsPasswordFlags where
+    boxedFlagsType _ = c_g_tls_password_flags_get_type
 
 instance IsGFlag TlsPasswordFlags
 
@@ -110,8 +110,8 @@
 foreign import ccall "g_tls_database_verify_flags_get_type" c_g_tls_database_verify_flags_get_type :: 
     IO GType
 
-instance BoxedEnum TlsDatabaseVerifyFlags where
-    boxedEnumType _ = c_g_tls_database_verify_flags_get_type
+instance BoxedFlags TlsDatabaseVerifyFlags where
+    boxedFlagsType _ = c_g_tls_database_verify_flags_get_type
 
 instance IsGFlag TlsDatabaseVerifyFlags
 
@@ -153,8 +153,8 @@
 foreign import ccall "g_tls_certificate_flags_get_type" c_g_tls_certificate_flags_get_type :: 
     IO GType
 
-instance BoxedEnum TlsCertificateFlags where
-    boxedEnumType _ = c_g_tls_certificate_flags_get_type
+instance BoxedFlags TlsCertificateFlags where
+    boxedFlagsType _ = c_g_tls_certificate_flags_get_type
 
 instance IsGFlag TlsCertificateFlags
 
@@ -175,8 +175,8 @@
 foreign import ccall "g_test_dbus_flags_get_type" c_g_test_dbus_flags_get_type :: 
     IO GType
 
-instance BoxedEnum TestDBusFlags where
-    boxedEnumType _ = c_g_test_dbus_flags_get_type
+instance BoxedFlags TestDBusFlags where
+    boxedFlagsType _ = c_g_test_dbus_flags_get_type
 
 instance IsGFlag TestDBusFlags
 
@@ -221,8 +221,8 @@
 foreign import ccall "g_subprocess_flags_get_type" c_g_subprocess_flags_get_type :: 
     IO GType
 
-instance BoxedEnum SubprocessFlags where
-    boxedEnumType _ = c_g_subprocess_flags_get_type
+instance BoxedFlags SubprocessFlags where
+    boxedFlagsType _ = c_g_subprocess_flags_get_type
 
 instance IsGFlag SubprocessFlags
 
@@ -252,8 +252,8 @@
 foreign import ccall "g_socket_msg_flags_get_type" c_g_socket_msg_flags_get_type :: 
     IO GType
 
-instance BoxedEnum SocketMsgFlags where
-    boxedEnumType _ = c_g_socket_msg_flags_get_type
+instance BoxedFlags SocketMsgFlags where
+    boxedFlagsType _ = c_g_socket_msg_flags_get_type
 
 instance IsGFlag SocketMsgFlags
 
@@ -289,8 +289,8 @@
 foreign import ccall "g_settings_bind_flags_get_type" c_g_settings_bind_flags_get_type :: 
     IO GType
 
-instance BoxedEnum SettingsBindFlags where
-    boxedEnumType _ = c_g_settings_bind_flags_get_type
+instance BoxedFlags SettingsBindFlags where
+    boxedFlagsType _ = c_g_settings_bind_flags_get_type
 
 instance IsGFlag SettingsBindFlags
 
@@ -311,8 +311,8 @@
 foreign import ccall "g_resource_lookup_flags_get_type" c_g_resource_lookup_flags_get_type :: 
     IO GType
 
-instance BoxedEnum ResourceLookupFlags where
-    boxedEnumType _ = c_g_resource_lookup_flags_get_type
+instance BoxedFlags ResourceLookupFlags where
+    boxedFlagsType _ = c_g_resource_lookup_flags_get_type
 
 instance IsGFlag ResourceLookupFlags
 
@@ -336,8 +336,8 @@
 foreign import ccall "g_resource_flags_get_type" c_g_resource_flags_get_type :: 
     IO GType
 
-instance BoxedEnum ResourceFlags where
-    boxedEnumType _ = c_g_resource_flags_get_type
+instance BoxedFlags ResourceFlags where
+    boxedFlagsType _ = c_g_resource_flags_get_type
 
 instance IsGFlag ResourceFlags
 
@@ -364,8 +364,8 @@
 foreign import ccall "g_output_stream_splice_flags_get_type" c_g_output_stream_splice_flags_get_type :: 
     IO GType
 
-instance BoxedEnum OutputStreamSpliceFlags where
-    boxedEnumType _ = c_g_output_stream_splice_flags_get_type
+instance BoxedFlags OutputStreamSpliceFlags where
+    boxedFlagsType _ = c_g_output_stream_splice_flags_get_type
 
 instance IsGFlag OutputStreamSpliceFlags
 
@@ -389,8 +389,8 @@
 foreign import ccall "g_mount_unmount_flags_get_type" c_g_mount_unmount_flags_get_type :: 
     IO GType
 
-instance BoxedEnum MountUnmountFlags where
-    boxedEnumType _ = c_g_mount_unmount_flags_get_type
+instance BoxedFlags MountUnmountFlags where
+    boxedFlagsType _ = c_g_mount_unmount_flags_get_type
 
 instance IsGFlag MountUnmountFlags
 
@@ -411,8 +411,8 @@
 foreign import ccall "g_mount_mount_flags_get_type" c_g_mount_mount_flags_get_type :: 
     IO GType
 
-instance BoxedEnum MountMountFlags where
-    boxedEnumType _ = c_g_mount_mount_flags_get_type
+instance BoxedFlags MountMountFlags where
+    boxedFlagsType _ = c_g_mount_mount_flags_get_type
 
 instance IsGFlag MountMountFlags
 
@@ -442,8 +442,8 @@
 foreign import ccall "g_io_stream_splice_flags_get_type" c_g_io_stream_splice_flags_get_type :: 
     IO GType
 
-instance BoxedEnum IOStreamSpliceFlags where
-    boxedEnumType _ = c_g_io_stream_splice_flags_get_type
+instance BoxedFlags IOStreamSpliceFlags where
+    boxedFlagsType _ = c_g_io_stream_splice_flags_get_type
 
 instance IsGFlag IOStreamSpliceFlags
 
@@ -467,8 +467,8 @@
 foreign import ccall "g_file_query_info_flags_get_type" c_g_file_query_info_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileQueryInfoFlags where
-    boxedEnumType _ = c_g_file_query_info_flags_get_type
+instance BoxedFlags FileQueryInfoFlags where
+    boxedFlagsType _ = c_g_file_query_info_flags_get_type
 
 instance IsGFlag FileQueryInfoFlags
 
@@ -501,8 +501,8 @@
 foreign import ccall "g_file_monitor_flags_get_type" c_g_file_monitor_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileMonitorFlags where
-    boxedEnumType _ = c_g_file_monitor_flags_get_type
+instance BoxedFlags FileMonitorFlags where
+    boxedFlagsType _ = c_g_file_monitor_flags_get_type
 
 instance IsGFlag FileMonitorFlags
 
@@ -532,8 +532,8 @@
 foreign import ccall "g_file_measure_flags_get_type" c_g_file_measure_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileMeasureFlags where
-    boxedEnumType _ = c_g_file_measure_flags_get_type
+instance BoxedFlags FileMeasureFlags where
+    boxedFlagsType _ = c_g_file_measure_flags_get_type
 
 instance IsGFlag FileMeasureFlags
 
@@ -560,8 +560,8 @@
 foreign import ccall "g_file_create_flags_get_type" c_g_file_create_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileCreateFlags where
-    boxedEnumType _ = c_g_file_create_flags_get_type
+instance BoxedFlags FileCreateFlags where
+    boxedFlagsType _ = c_g_file_create_flags_get_type
 
 instance IsGFlag FileCreateFlags
 
@@ -600,8 +600,8 @@
 foreign import ccall "g_file_copy_flags_get_type" c_g_file_copy_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileCopyFlags where
-    boxedEnumType _ = c_g_file_copy_flags_get_type
+instance BoxedFlags FileCopyFlags where
+    boxedFlagsType _ = c_g_file_copy_flags_get_type
 
 instance IsGFlag FileCopyFlags
 
@@ -628,8 +628,8 @@
 foreign import ccall "g_file_attribute_info_flags_get_type" c_g_file_attribute_info_flags_get_type :: 
     IO GType
 
-instance BoxedEnum FileAttributeInfoFlags where
-    boxedEnumType _ = c_g_file_attribute_info_flags_get_type
+instance BoxedFlags FileAttributeInfoFlags where
+    boxedFlagsType _ = c_g_file_attribute_info_flags_get_type
 
 instance IsGFlag FileAttributeInfoFlags
 
@@ -650,8 +650,8 @@
 foreign import ccall "g_drive_start_flags_get_type" c_g_drive_start_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DriveStartFlags where
-    boxedEnumType _ = c_g_drive_start_flags_get_type
+instance BoxedFlags DriveStartFlags where
+    boxedFlagsType _ = c_g_drive_start_flags_get_type
 
 instance IsGFlag DriveStartFlags
 
@@ -675,8 +675,8 @@
 foreign import ccall "g_dbus_subtree_flags_get_type" c_g_dbus_subtree_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusSubtreeFlags where
-    boxedEnumType _ = c_g_dbus_subtree_flags_get_type
+instance BoxedFlags DBusSubtreeFlags where
+    boxedFlagsType _ = c_g_dbus_subtree_flags_get_type
 
 instance IsGFlag DBusSubtreeFlags
 
@@ -706,8 +706,8 @@
 foreign import ccall "g_dbus_signal_flags_get_type" c_g_dbus_signal_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusSignalFlags where
-    boxedEnumType _ = c_g_dbus_signal_flags_get_type
+instance BoxedFlags DBusSignalFlags where
+    boxedFlagsType _ = c_g_dbus_signal_flags_get_type
 
 instance IsGFlag DBusSignalFlags
 
@@ -734,8 +734,8 @@
 foreign import ccall "g_dbus_server_flags_get_type" c_g_dbus_server_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusServerFlags where
-    boxedEnumType _ = c_g_dbus_server_flags_get_type
+instance BoxedFlags DBusServerFlags where
+    boxedFlagsType _ = c_g_dbus_server_flags_get_type
 
 instance IsGFlag DBusServerFlags
 
@@ -759,8 +759,8 @@
 foreign import ccall "g_dbus_send_message_flags_get_type" c_g_dbus_send_message_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusSendMessageFlags where
-    boxedEnumType _ = c_g_dbus_send_message_flags_get_type
+instance BoxedFlags DBusSendMessageFlags where
+    boxedFlagsType _ = c_g_dbus_send_message_flags_get_type
 
 instance IsGFlag DBusSendMessageFlags
 
@@ -796,8 +796,8 @@
 foreign import ccall "g_dbus_proxy_flags_get_type" c_g_dbus_proxy_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusProxyFlags where
-    boxedEnumType _ = c_g_dbus_proxy_flags_get_type
+instance BoxedFlags DBusProxyFlags where
+    boxedFlagsType _ = c_g_dbus_proxy_flags_get_type
 
 instance IsGFlag DBusProxyFlags
 
@@ -824,8 +824,8 @@
 foreign import ccall "g_dbus_property_info_flags_get_type" c_g_dbus_property_info_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusPropertyInfoFlags where
-    boxedEnumType _ = c_g_dbus_property_info_flags_get_type
+instance BoxedFlags DBusPropertyInfoFlags where
+    boxedFlagsType _ = c_g_dbus_property_info_flags_get_type
 
 instance IsGFlag DBusPropertyInfoFlags
 
@@ -849,8 +849,8 @@
 foreign import ccall "g_dbus_object_manager_client_flags_get_type" c_g_dbus_object_manager_client_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusObjectManagerClientFlags where
-    boxedEnumType _ = c_g_dbus_object_manager_client_flags_get_type
+instance BoxedFlags DBusObjectManagerClientFlags where
+    boxedFlagsType _ = c_g_dbus_object_manager_client_flags_get_type
 
 instance IsGFlag DBusObjectManagerClientFlags
 
@@ -880,8 +880,8 @@
 foreign import ccall "g_dbus_message_flags_get_type" c_g_dbus_message_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusMessageFlags where
-    boxedEnumType _ = c_g_dbus_message_flags_get_type
+instance BoxedFlags DBusMessageFlags where
+    boxedFlagsType _ = c_g_dbus_message_flags_get_type
 
 instance IsGFlag DBusMessageFlags
 
@@ -905,8 +905,8 @@
 foreign import ccall "g_dbus_interface_skeleton_flags_get_type" c_g_dbus_interface_skeleton_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusInterfaceSkeletonFlags where
-    boxedEnumType _ = c_g_dbus_interface_skeleton_flags_get_type
+instance BoxedFlags DBusInterfaceSkeletonFlags where
+    boxedFlagsType _ = c_g_dbus_interface_skeleton_flags_get_type
 
 instance IsGFlag DBusInterfaceSkeletonFlags
 
@@ -942,8 +942,8 @@
 foreign import ccall "g_dbus_connection_flags_get_type" c_g_dbus_connection_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusConnectionFlags where
-    boxedEnumType _ = c_g_dbus_connection_flags_get_type
+instance BoxedFlags DBusConnectionFlags where
+    boxedFlagsType _ = c_g_dbus_connection_flags_get_type
 
 instance IsGFlag DBusConnectionFlags
 
@@ -967,8 +967,8 @@
 foreign import ccall "g_dbus_capability_flags_get_type" c_g_dbus_capability_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusCapabilityFlags where
-    boxedEnumType _ = c_g_dbus_capability_flags_get_type
+instance BoxedFlags DBusCapabilityFlags where
+    boxedFlagsType _ = c_g_dbus_capability_flags_get_type
 
 instance IsGFlag DBusCapabilityFlags
 
@@ -995,8 +995,8 @@
 foreign import ccall "g_dbus_call_flags_get_type" c_g_dbus_call_flags_get_type :: 
     IO GType
 
-instance BoxedEnum DBusCallFlags where
-    boxedEnumType _ = c_g_dbus_call_flags_get_type
+instance BoxedFlags DBusCallFlags where
+    boxedFlagsType _ = c_g_dbus_call_flags_get_type
 
 instance IsGFlag DBusCallFlags
 
@@ -1023,8 +1023,8 @@
 foreign import ccall "g_converter_flags_get_type" c_g_converter_flags_get_type :: 
     IO GType
 
-instance BoxedEnum ConverterFlags where
-    boxedEnumType _ = c_g_converter_flags_get_type
+instance BoxedFlags ConverterFlags where
+    boxedFlagsType _ = c_g_converter_flags_get_type
 
 instance IsGFlag ConverterFlags
 
@@ -1048,8 +1048,8 @@
 foreign import ccall "g_bus_name_watcher_flags_get_type" c_g_bus_name_watcher_flags_get_type :: 
     IO GType
 
-instance BoxedEnum BusNameWatcherFlags where
-    boxedEnumType _ = c_g_bus_name_watcher_flags_get_type
+instance BoxedFlags BusNameWatcherFlags where
+    boxedFlagsType _ = c_g_bus_name_watcher_flags_get_type
 
 instance IsGFlag BusNameWatcherFlags
 
@@ -1076,8 +1076,8 @@
 foreign import ccall "g_bus_name_owner_flags_get_type" c_g_bus_name_owner_flags_get_type :: 
     IO GType
 
-instance BoxedEnum BusNameOwnerFlags where
-    boxedEnumType _ = c_g_bus_name_owner_flags_get_type
+instance BoxedFlags BusNameOwnerFlags where
+    boxedFlagsType _ = c_g_bus_name_owner_flags_get_type
 
 instance IsGFlag BusNameOwnerFlags
 
@@ -1110,8 +1110,8 @@
 foreign import ccall "g_ask_password_flags_get_type" c_g_ask_password_flags_get_type :: 
     IO GType
 
-instance BoxedEnum AskPasswordFlags where
-    boxedEnumType _ = c_g_ask_password_flags_get_type
+instance BoxedFlags AskPasswordFlags where
+    boxedFlagsType _ = c_g_ask_password_flags_get_type
 
 instance IsGFlag AskPasswordFlags
 
@@ -1150,8 +1150,8 @@
 foreign import ccall "g_application_flags_get_type" c_g_application_flags_get_type :: 
     IO GType
 
-instance BoxedEnum ApplicationFlags where
-    boxedEnumType _ = c_g_application_flags_get_type
+instance BoxedFlags ApplicationFlags where
+    boxedFlagsType _ = c_g_application_flags_get_type
 
 instance IsGFlag ApplicationFlags
 
@@ -1181,8 +1181,8 @@
 foreign import ccall "g_app_info_create_flags_get_type" c_g_app_info_create_flags_get_type :: 
     IO GType
 
-instance BoxedEnum AppInfoCreateFlags where
-    boxedEnumType _ = c_g_app_info_create_flags_get_type
+instance BoxedFlags AppInfoCreateFlags where
+    boxedFlagsType _ = c_g_app_info_create_flags_get_type
 
 instance IsGFlag AppInfoCreateFlags
 
diff --git a/GI/Gio/Functions.hs b/GI/Gio/Functions.hs
--- a/GI/Gio/Functions.hs
+++ b/GI/Gio/Functions.hs
@@ -298,9 +298,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -313,7 +313,7 @@
 -- function g_unix_mounts_changed_since
 -- Args : [Arg {argCName = "time", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -335,7 +335,7 @@
 -- function g_unix_mount_points_changed_since
 -- Args : [Arg {argCName = "time", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -357,7 +357,7 @@
 -- function g_unix_mount_is_system_internal
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -381,7 +381,7 @@
 -- function g_unix_mount_is_readonly
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -405,7 +405,7 @@
 -- function g_unix_mount_guess_symbolic_icon
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -430,7 +430,7 @@
 -- function g_unix_mount_guess_should_display
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -454,7 +454,7 @@
 -- function g_unix_mount_guess_name
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -480,7 +480,7 @@
 -- function g_unix_mount_guess_icon
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -505,7 +505,7 @@
 -- function g_unix_mount_guess_can_eject
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -529,7 +529,7 @@
 -- function g_unix_mount_get_mount_path
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -554,7 +554,7 @@
 -- function g_unix_mount_get_fs_type
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -579,7 +579,7 @@
 -- function g_unix_mount_get_device_path
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -604,7 +604,7 @@
 -- function g_unix_mount_free
 -- Args : [Arg {argCName = "mount_entry", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -627,7 +627,7 @@
 -- function g_unix_mount_compare
 -- Args : [Arg {argCName = "mount1", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount2", argType = TInterface "Gio" "UnixMountEntry", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -654,7 +654,7 @@
 -- function g_unix_is_mount_path_system_internal
 -- Args : [Arg {argCName = "mount_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -676,16 +676,16 @@
 
 
 -- function g_simple_async_report_gerror_in_idle
--- Args : [Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_simple_async_report_gerror_in_idle" g_simple_async_report_gerror_in_idle :: 
     Ptr GObject.Object ->                   -- object : TInterface "GObject" "Object"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     Ptr GError ->                           -- error : TError
     IO ()
 
@@ -720,7 +720,7 @@
 -- function g_resources_unregister
 -- Args : [Arg {argCName = "resource", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -743,7 +743,7 @@
 -- function g_resources_register
 -- Args : [Arg {argCName = "resource", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -766,7 +766,7 @@
 -- function g_resources_open_stream
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : True
 -- Skip return : False
 
@@ -799,7 +799,7 @@
 -- function g_resources_lookup_data
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : True
 -- Skip return : False
 
@@ -832,7 +832,7 @@
 -- function g_resources_get_info
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "flags", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -873,7 +873,7 @@
 -- function g_resources_enumerate_children
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -908,7 +908,7 @@
 -- function g_pollable_stream_write_all
 -- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_written", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -958,7 +958,7 @@
 -- function g_pollable_stream_write
 -- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1003,7 +1003,7 @@
 -- function g_pollable_stream_read
 -- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1048,7 +1048,7 @@
 -- function g_pollable_source_new_full
 -- Args : [Arg {argCName = "pollable_stream", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_source", argType = TInterface "GLib" "Source", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Source"
+-- returnType : Just (TInterface "GLib" "Source")
 -- throws : False
 -- Skip return : False
 
@@ -1089,7 +1089,7 @@
 -- function g_pollable_source_new
 -- Args : [Arg {argCName = "pollable_stream", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Source"
+-- returnType : Just (TInterface "GLib" "Source")
 -- throws : False
 -- Skip return : False
 
@@ -1114,7 +1114,7 @@
 -- function g_networking_init
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1131,17 +1131,17 @@
 
 
 -- function g_io_scheduler_push_job
--- Args : [Arg {argCName = "job_func", argType = TInterface "Gio" "IOSchedulerJobFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 1, argDestroy = 2, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "job_func", argType = TInterface "Gio" "IOSchedulerJobFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 1, argDestroy = 2, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_io_scheduler_push_job" g_io_scheduler_push_job :: 
     FunPtr IOSchedulerJobFuncC ->           -- job_func : TInterface "Gio" "IOSchedulerJobFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- notify : TInterface "GLib" "DestroyNotify"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     IO ()
 
@@ -1169,7 +1169,7 @@
 -- function g_io_scheduler_cancel_all_jobs
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1188,7 +1188,7 @@
 -- function g_io_modules_scan_all_in_directory_with_scope
 -- Args : [Arg {argCName = "dirname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "scope", argType = TInterface "Gio" "IOModuleScope", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1215,7 +1215,7 @@
 -- function g_io_modules_scan_all_in_directory
 -- Args : [Arg {argCName = "dirname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1238,7 +1238,7 @@
 -- function g_io_error_quark
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -1255,14 +1255,14 @@
 
 
 -- function g_io_error_from_errno
--- Args : [Arg {argCName = "err_no", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "err_no", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOErrorEnum"
+-- returnType : Just (TInterface "Gio" "IOErrorEnum")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_io_error_from_errno" g_io_error_from_errno :: 
-    Int32 ->                                -- err_no : TBasicType TInt32
+    Int32 ->                                -- err_no : TBasicType TInt
     IO CUInt
 
 
@@ -1279,7 +1279,7 @@
 -- function g_dbus_is_unique_name
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1303,7 +1303,7 @@
 -- function g_dbus_is_supported_address
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1331,7 +1331,7 @@
 -- function g_dbus_is_name
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1355,7 +1355,7 @@
 -- function g_dbus_is_member_name
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1379,7 +1379,7 @@
 -- function g_dbus_is_interface_name
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1403,7 +1403,7 @@
 -- function g_dbus_is_guid
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1427,7 +1427,7 @@
 -- function g_dbus_is_address
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1451,7 +1451,7 @@
 -- function g_dbus_gvariant_to_gvalue
 -- Args : [Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_gvalue", argType = TInterface "GObject" "Value", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1476,7 +1476,7 @@
 -- function g_dbus_gvalue_to_gvariant
 -- Args : [Arg {argCName = "gvalue", argType = TInterface "GObject" "Value", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1505,7 +1505,7 @@
 -- function g_dbus_generate_guid
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1527,7 +1527,7 @@
 -- function g_dbus_address_get_stream_sync
 -- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : True
 -- Skip return : False
 
@@ -1570,7 +1570,7 @@
 -- function g_dbus_address_get_stream_finish
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : True
 -- Skip return : False
 
@@ -1602,9 +1602,9 @@
 
 
 -- function g_dbus_address_get_stream
--- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1612,7 +1612,7 @@
     CString ->                              -- address : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1646,7 +1646,7 @@
 -- function g_dbus_address_get_for_bus_sync
 -- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -1684,7 +1684,7 @@
 -- function g_dbus_address_escape_value
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1710,7 +1710,7 @@
 -- function g_content_types_get_registered
 -- Args : []
 -- Lengths : []
--- returnType : TGList (TBasicType TUTF8)
+-- returnType : Just (TGList (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1723,7 +1723,6 @@
     m [T.Text]                              -- result
 contentTypesGetRegistered  = liftIO $ do
     result <- g_content_types_get_registered
-    checkUnexpectedReturnNULL "g_content_types_get_registered" result
     result' <- unpackGList result
     result'' <- mapM cstringToText result'
     mapGList freeMem result
@@ -1734,7 +1733,7 @@
 -- function g_content_type_is_unknown
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1758,7 +1757,7 @@
 -- function g_content_type_is_a
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "supertype", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1786,7 +1785,7 @@
 -- function g_content_type_guess_for_tree
 -- Args : [Arg {argCName = "root", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1813,7 +1812,7 @@
 -- function g_content_type_guess
 -- Args : [Arg {argCName = "filename", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result_uncertain", argType = TBasicType TBoolean, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "data_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1860,7 +1859,7 @@
 -- function g_content_type_get_symbolic_icon
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -1885,7 +1884,7 @@
 -- function g_content_type_get_mime_type
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1897,21 +1896,22 @@
 contentTypeGetMimeType ::
     (MonadIO m) =>
     T.Text                                  -- type_
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 contentTypeGetMimeType type_ = liftIO $ do
     type_' <- textToCString type_
     result <- g_content_type_get_mime_type type_'
-    checkUnexpectedReturnNULL "g_content_type_get_mime_type" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     freeMem type_'
-    return result'
+    return maybeResult
 
 
 -- function g_content_type_get_icon
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -1936,7 +1936,7 @@
 -- function g_content_type_get_generic_icon_name
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1962,7 +1962,7 @@
 -- function g_content_type_get_description
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1988,7 +1988,7 @@
 -- function g_content_type_from_mime_type
 -- Args : [Arg {argCName = "mime_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2000,21 +2000,22 @@
 contentTypeFromMimeType ::
     (MonadIO m) =>
     T.Text                                  -- mimeType
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 contentTypeFromMimeType mimeType = liftIO $ do
     mimeType' <- textToCString mimeType
     result <- g_content_type_from_mime_type mimeType'
-    checkUnexpectedReturnNULL "g_content_type_from_mime_type" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     freeMem mimeType'
-    return result'
+    return maybeResult
 
 
 -- function g_content_type_equals
 -- Args : [Arg {argCName = "type1", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type2", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2042,7 +2043,7 @@
 -- function g_content_type_can_be_executable
 -- Args : [Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2066,7 +2067,7 @@
 -- function g_bus_watch_name_on_connection_with_closures
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "BusNameWatcherFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_appeared_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_vanished_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2112,7 +2113,7 @@
 -- function g_bus_watch_name_with_closures
 -- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "BusNameWatcherFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_appeared_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_vanished_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2155,14 +2156,14 @@
 
 
 -- function g_bus_unwatch_name
--- Args : [Arg {argCName = "watcher_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "watcher_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_bus_unwatch_name" g_bus_unwatch_name :: 
-    Word32 ->                               -- watcher_id : TBasicType TUInt32
+    Word32 ->                               -- watcher_id : TBasicType TUInt
     IO ()
 
 
@@ -2176,14 +2177,14 @@
 
 
 -- function g_bus_unown_name
--- Args : [Arg {argCName = "owner_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "owner_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_bus_unown_name" g_bus_unown_name :: 
-    Word32 ->                               -- owner_id : TBasicType TUInt32
+    Word32 ->                               -- owner_id : TBasicType TUInt
     IO ()
 
 
@@ -2199,7 +2200,7 @@
 -- function g_bus_own_name_on_connection_with_closures
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "BusNameOwnerFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_acquired_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_lost_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2245,7 +2246,7 @@
 -- function g_bus_own_name_with_closures
 -- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "BusNameOwnerFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_acquired_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_acquired_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_lost_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2298,7 +2299,7 @@
 -- function g_bus_get_sync
 -- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -2335,7 +2336,7 @@
 -- function g_bus_get_finish
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -2363,9 +2364,9 @@
 
 
 -- function g_bus_get
--- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2373,7 +2374,7 @@
     CUInt ->                                -- bus_type : TInterface "Gio" "BusType"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
diff --git a/GI/Gio/Interfaces.hs b/GI/Gio/Interfaces.hs
--- a/GI/Gio/Interfaces.hs
+++ b/GI/Gio/Interfaces.hs
@@ -76,9 +76,9 @@
 import GI.Gio.Interfaces.TlsServerConnection
 import GI.Gio.Interfaces.Volume
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Action.hs b/GI/Gio/Interfaces/Action.hs
--- a/GI/Gio/Interfaces/Action.hs
+++ b/GI/Gio/Interfaces/Action.hs
@@ -74,26 +74,31 @@
  -- * Properties
 -- ** Enabled
     ActionEnabledPropertyInfo               ,
+    actionEnabled                           ,
     getActionEnabled                        ,
 
 
 -- ** Name
     ActionNamePropertyInfo                  ,
+    actionName                              ,
     getActionName                           ,
 
 
 -- ** ParameterType
     ActionParameterTypePropertyInfo         ,
+    actionParameterType                     ,
     getActionParameterType                  ,
 
 
 -- ** State
     ActionStatePropertyInfo                 ,
+    actionState                             ,
     getActionState                          ,
 
 
 -- ** StateType
     ActionStateTypePropertyInfo             ,
+    actionStateType                         ,
     getActionStateType                      ,
 
 
@@ -101,9 +106,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -163,6 +168,7 @@
 -- VVV Prop "enabled"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getActionEnabled :: (MonadIO m, ActionK o) => o -> m Bool
 getActionEnabled obj = liftIO $ getObjectPropertyBool obj "enabled"
@@ -177,17 +183,19 @@
     attrGet _ = getActionEnabled
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getActionName :: (MonadIO m, ActionK o) => o -> m T.Text
-getActionName obj = liftIO $ getObjectPropertyString obj "name"
+getActionName obj = liftIO $ checkUnexpectedNothing "getActionName" $ getObjectPropertyString obj "name"
 
 data ActionNamePropertyInfo
 instance AttrInfo ActionNamePropertyInfo where
-    type AttrAllowedOps ActionNamePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps ActionNamePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ActionNamePropertyInfo = (~) ()
     type AttrBaseTypeConstraint ActionNamePropertyInfo = ActionK
     type AttrGetType ActionNamePropertyInfo = T.Text
@@ -195,17 +203,19 @@
     attrGet _ = getActionName
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "parameter-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getActionParameterType :: (MonadIO m, ActionK o) => o -> m GLib.VariantType
-getActionParameterType obj = liftIO $ getObjectPropertyBoxed obj "parameter-type" GLib.VariantType
+getActionParameterType obj = liftIO $ checkUnexpectedNothing "getActionParameterType" $ getObjectPropertyBoxed obj "parameter-type" GLib.VariantType
 
 data ActionParameterTypePropertyInfo
 instance AttrInfo ActionParameterTypePropertyInfo where
-    type AttrAllowedOps ActionParameterTypePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps ActionParameterTypePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ActionParameterTypePropertyInfo = (~) ()
     type AttrBaseTypeConstraint ActionParameterTypePropertyInfo = ActionK
     type AttrGetType ActionParameterTypePropertyInfo = GLib.VariantType
@@ -213,35 +223,39 @@
     attrGet _ = getActionParameterType
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "state"
    -- Type: TVariant
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getActionState :: (MonadIO m, ActionK o) => o -> m GVariant
+getActionState :: (MonadIO m, ActionK o) => o -> m (Maybe GVariant)
 getActionState obj = liftIO $ getObjectPropertyVariant obj "state"
 
 data ActionStatePropertyInfo
 instance AttrInfo ActionStatePropertyInfo where
-    type AttrAllowedOps ActionStatePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps ActionStatePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ActionStatePropertyInfo = (~) ()
     type AttrBaseTypeConstraint ActionStatePropertyInfo = ActionK
-    type AttrGetType ActionStatePropertyInfo = GVariant
+    type AttrGetType ActionStatePropertyInfo = (Maybe GVariant)
     type AttrLabel ActionStatePropertyInfo = "state"
     attrGet _ = getActionState
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "state-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getActionStateType :: (MonadIO m, ActionK o) => o -> m GLib.VariantType
-getActionStateType obj = liftIO $ getObjectPropertyBoxed obj "state-type" GLib.VariantType
+getActionStateType obj = liftIO $ checkUnexpectedNothing "getActionStateType" $ getObjectPropertyBoxed obj "state-type" GLib.VariantType
 
 data ActionStateTypePropertyInfo
 instance AttrInfo ActionStateTypePropertyInfo where
-    type AttrAllowedOps ActionStateTypePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps ActionStateTypePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ActionStateTypePropertyInfo = (~) ()
     type AttrBaseTypeConstraint ActionStateTypePropertyInfo = ActionK
     type AttrGetType ActionStateTypePropertyInfo = GLib.VariantType
@@ -249,10 +263,26 @@
     attrGet _ = getActionStateType
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList Action = ActionAttributeList
 type ActionAttributeList = ('[ '("enabled", ActionEnabledPropertyInfo), '("name", ActionNamePropertyInfo), '("parameterType", ActionParameterTypePropertyInfo), '("state", ActionStatePropertyInfo), '("stateType", ActionStateTypePropertyInfo)] :: [(Symbol, *)])
 
+actionEnabled :: AttrLabelProxy "enabled"
+actionEnabled = AttrLabelProxy
+
+actionName :: AttrLabelProxy "name"
+actionName = AttrLabelProxy
+
+actionParameterType :: AttrLabelProxy "parameterType"
+actionParameterType = AttrLabelProxy
+
+actionState :: AttrLabelProxy "state"
+actionState = AttrLabelProxy
+
+actionStateType :: AttrLabelProxy "stateType"
+actionStateType = AttrLabelProxy
+
 type instance SignalList Action = ActionSignalList
 type ActionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -277,7 +307,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameter", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -311,7 +341,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -341,7 +371,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -369,7 +399,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -398,7 +428,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantType"
+-- returnType : Just (TInterface "GLib" "VariantType")
 -- throws : False
 -- Skip return : False
 
@@ -427,7 +457,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -456,7 +486,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -468,24 +498,25 @@
 actionGetStateHint ::
     (MonadIO m, ActionK a) =>
     a                                       -- _obj
-    -> m GVariant                           -- result
+    -> m (Maybe GVariant)                   -- result
 actionGetStateHint _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_action_get_state_hint _obj'
-    checkUnexpectedReturnNULL "g_action_get_state_hint" result
-    result' <- wrapGVariantPtr result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- wrapGVariantPtr result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data ActionGetStateHintMethodInfo
-instance (signature ~ (m GVariant), MonadIO m, ActionK a) => MethodInfo ActionGetStateHintMethodInfo a signature where
+instance (signature ~ (m (Maybe GVariant)), MonadIO m, ActionK a) => MethodInfo ActionGetStateHintMethodInfo a signature where
     overloadedMethod _ = actionGetStateHint
 
 -- method Action::get_state_type
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantType"
+-- returnType : Just (TInterface "GLib" "VariantType")
 -- throws : False
 -- Skip return : False
 
@@ -514,7 +545,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -538,7 +569,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "detailed_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "target_value", argType = TVariant, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -579,7 +610,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target_value", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Action.hs-boot b/GI/Gio/Interfaces/Action.hs-boot
--- a/GI/Gio/Interfaces/Action.hs-boot
+++ b/GI/Gio/Interfaces/Action.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Action where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/ActionGroup.hs b/GI/Gio/Interfaces/ActionGroup.hs
--- a/GI/Gio/Interfaces/ActionGroup.hs
+++ b/GI/Gio/Interfaces/ActionGroup.hs
@@ -142,9 +142,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -430,7 +430,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -461,7 +461,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "enabled", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -495,7 +495,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -526,7 +526,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "state", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -560,7 +560,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameter", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -598,7 +598,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -632,7 +632,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -664,7 +664,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantType"
+-- returnType : Just (TInterface "GLib" "VariantType")
 -- throws : False
 -- Skip return : False
 
@@ -678,26 +678,27 @@
     (MonadIO m, ActionGroupK a) =>
     a                                       -- _obj
     -> T.Text                               -- actionName
-    -> m GLib.VariantType                   -- result
+    -> m (Maybe GLib.VariantType)           -- result
 actionGroupGetActionParameterType _obj actionName = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     actionName' <- textToCString actionName
     result <- g_action_group_get_action_parameter_type _obj' actionName'
-    checkUnexpectedReturnNULL "g_action_group_get_action_parameter_type" result
-    result' <- (newBoxed GLib.VariantType) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (newBoxed GLib.VariantType) result'
+        return result''
     touchManagedPtr _obj
     freeMem actionName'
-    return result'
+    return maybeResult
 
 data ActionGroupGetActionParameterTypeMethodInfo
-instance (signature ~ (T.Text -> m GLib.VariantType), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionParameterTypeMethodInfo a signature where
+instance (signature ~ (T.Text -> m (Maybe GLib.VariantType)), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionParameterTypeMethodInfo a signature where
     overloadedMethod _ = actionGroupGetActionParameterType
 
 -- method ActionGroup::get_action_state
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -711,26 +712,27 @@
     (MonadIO m, ActionGroupK a) =>
     a                                       -- _obj
     -> T.Text                               -- actionName
-    -> m GVariant                           -- result
+    -> m (Maybe GVariant)                   -- result
 actionGroupGetActionState _obj actionName = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     actionName' <- textToCString actionName
     result <- g_action_group_get_action_state _obj' actionName'
-    checkUnexpectedReturnNULL "g_action_group_get_action_state" result
-    result' <- wrapGVariantPtr result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- wrapGVariantPtr result'
+        return result''
     touchManagedPtr _obj
     freeMem actionName'
-    return result'
+    return maybeResult
 
 data ActionGroupGetActionStateMethodInfo
-instance (signature ~ (T.Text -> m GVariant), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateMethodInfo a signature where
+instance (signature ~ (T.Text -> m (Maybe GVariant)), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateMethodInfo a signature where
     overloadedMethod _ = actionGroupGetActionState
 
 -- method ActionGroup::get_action_state_hint
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -744,26 +746,27 @@
     (MonadIO m, ActionGroupK a) =>
     a                                       -- _obj
     -> T.Text                               -- actionName
-    -> m GVariant                           -- result
+    -> m (Maybe GVariant)                   -- result
 actionGroupGetActionStateHint _obj actionName = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     actionName' <- textToCString actionName
     result <- g_action_group_get_action_state_hint _obj' actionName'
-    checkUnexpectedReturnNULL "g_action_group_get_action_state_hint" result
-    result' <- wrapGVariantPtr result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- wrapGVariantPtr result'
+        return result''
     touchManagedPtr _obj
     freeMem actionName'
-    return result'
+    return maybeResult
 
 data ActionGroupGetActionStateHintMethodInfo
-instance (signature ~ (T.Text -> m GVariant), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateHintMethodInfo a signature where
+instance (signature ~ (T.Text -> m (Maybe GVariant)), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateHintMethodInfo a signature where
     overloadedMethod _ = actionGroupGetActionStateHint
 
 -- method ActionGroup::get_action_state_type
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantType"
+-- returnType : Just (TInterface "GLib" "VariantType")
 -- throws : False
 -- Skip return : False
 
@@ -777,26 +780,27 @@
     (MonadIO m, ActionGroupK a) =>
     a                                       -- _obj
     -> T.Text                               -- actionName
-    -> m GLib.VariantType                   -- result
+    -> m (Maybe GLib.VariantType)           -- result
 actionGroupGetActionStateType _obj actionName = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     actionName' <- textToCString actionName
     result <- g_action_group_get_action_state_type _obj' actionName'
-    checkUnexpectedReturnNULL "g_action_group_get_action_state_type" result
-    result' <- (newBoxed GLib.VariantType) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (newBoxed GLib.VariantType) result'
+        return result''
     touchManagedPtr _obj
     freeMem actionName'
-    return result'
+    return maybeResult
 
 data ActionGroupGetActionStateTypeMethodInfo
-instance (signature ~ (T.Text -> m GLib.VariantType), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateTypeMethodInfo a signature where
+instance (signature ~ (T.Text -> m (Maybe GLib.VariantType)), MonadIO m, ActionGroupK a) => MethodInfo ActionGroupGetActionStateTypeMethodInfo a signature where
     overloadedMethod _ = actionGroupGetActionStateType
 
 -- method ActionGroup::has_action
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -828,7 +832,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -859,7 +863,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "enabled", argType = TBasicType TBoolean, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "parameter_type", argType = TInterface "GLib" "VariantType", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "state_type", argType = TInterface "GLib" "VariantType", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "state_hint", argType = TVariant, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "state", argType = TVariant, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/ActionGroup.hs-boot b/GI/Gio/Interfaces/ActionGroup.hs-boot
--- a/GI/Gio/Interfaces/ActionGroup.hs-boot
+++ b/GI/Gio/Interfaces/ActionGroup.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.ActionGroup where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/ActionMap.hs b/GI/Gio/Interfaces/ActionMap.hs
--- a/GI/Gio/Interfaces/ActionMap.hs
+++ b/GI/Gio/Interfaces/ActionMap.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -122,7 +122,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionMap", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -151,17 +151,17 @@
 
 -- method ActionMap::add_action_entries
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionMap", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "entries", argType = TCArray False (-1) 2 (TInterface "Gio" "ActionEntry"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_entries", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_entries", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionMap", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "entries", argType = TCArray False (-1) 2 (TInterface "Gio" "ActionEntry"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_entries", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_entries", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_action_map_add_action_entries" g_action_map_add_action_entries :: 
     Ptr ActionMap ->                        -- _obj : TInterface "Gio" "ActionMap"
     Ptr ActionEntry ->                      -- entries : TCArray False (-1) 2 (TInterface "Gio" "ActionEntry")
-    Int32 ->                                -- n_entries : TBasicType TInt32
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Int32 ->                                -- n_entries : TBasicType TInt
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -190,7 +190,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionMap", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Action"
+-- returnType : Just (TInterface "Gio" "Action")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +223,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ActionMap", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/ActionMap.hs-boot b/GI/Gio/Interfaces/ActionMap.hs-boot
--- a/GI/Gio/Interfaces/ActionMap.hs-boot
+++ b/GI/Gio/Interfaces/ActionMap.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.ActionMap where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/AppInfo.hs b/GI/Gio/Interfaces/AppInfo.hs
--- a/GI/Gio/Interfaces/AppInfo.hs
+++ b/GI/Gio/Interfaces/AppInfo.hs
@@ -172,9 +172,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -272,7 +272,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -308,7 +308,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -336,7 +336,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -364,7 +364,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -392,7 +392,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -421,7 +421,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "appinfo2", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -453,7 +453,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -482,7 +482,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -511,7 +511,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -540,7 +540,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -569,7 +569,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -598,7 +598,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -627,7 +627,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -656,7 +656,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -685,7 +685,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "files", argType = TGList (TInterface "Gio" "File"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "launch_context", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -731,7 +731,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uris", argType = TGList (TBasicType TUTF8), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "launch_context", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -778,7 +778,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -814,7 +814,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "extension", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -850,7 +850,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -886,7 +886,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -922,7 +922,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -950,7 +950,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -978,7 +978,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1006,7 +1006,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "commandline", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "application_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "AppInfoCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : True
 -- Skip return : False
 
@@ -1048,7 +1048,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "AppInfo")
+-- returnType : Just (TGList (TInterface "Gio" "AppInfo"))
 -- throws : False
 -- Skip return : False
 
@@ -1061,7 +1061,6 @@
     m [AppInfo]                             -- result
 appInfoGetAll  = liftIO $ do
     result <- g_app_info_get_all
-    checkUnexpectedReturnNULL "g_app_info_get_all" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject AppInfo) result'
     g_list_free result
@@ -1071,7 +1070,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "AppInfo")
+-- returnType : Just (TGList (TInterface "Gio" "AppInfo"))
 -- throws : False
 -- Skip return : False
 
@@ -1087,7 +1086,6 @@
 appInfoGetAllForType contentType = liftIO $ do
     contentType' <- textToCString contentType
     result <- g_app_info_get_all_for_type contentType'
-    checkUnexpectedReturnNULL "g_app_info_get_all_for_type" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject AppInfo) result'
     g_list_free result
@@ -1098,7 +1096,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "must_support_uris", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -1126,7 +1124,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "uri_scheme", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -1151,7 +1149,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "AppInfo")
+-- returnType : Just (TGList (TInterface "Gio" "AppInfo"))
 -- throws : False
 -- Skip return : False
 
@@ -1167,7 +1165,6 @@
 appInfoGetFallbackForType contentType = liftIO $ do
     contentType' <- textToCString contentType
     result <- g_app_info_get_fallback_for_type contentType'
-    checkUnexpectedReturnNULL "g_app_info_get_fallback_for_type" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject AppInfo) result'
     g_list_free result
@@ -1178,7 +1175,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "AppInfo")
+-- returnType : Just (TGList (TInterface "Gio" "AppInfo"))
 -- throws : False
 -- Skip return : False
 
@@ -1194,7 +1191,6 @@
 appInfoGetRecommendedForType contentType = liftIO $ do
     contentType' <- textToCString contentType
     result <- g_app_info_get_recommended_for_type contentType'
-    checkUnexpectedReturnNULL "g_app_info_get_recommended_for_type" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject AppInfo) result'
     g_list_free result
@@ -1205,7 +1201,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "launch_context", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1241,7 +1237,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/AppInfo.hs-boot b/GI/Gio/Interfaces/AppInfo.hs-boot
--- a/GI/Gio/Interfaces/AppInfo.hs-boot
+++ b/GI/Gio/Interfaces/AppInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.AppInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/AsyncInitable.hs b/GI/Gio/Interfaces/AsyncInitable.hs
--- a/GI/Gio/Interfaces/AsyncInitable.hs
+++ b/GI/Gio/Interfaces/AsyncInitable.hs
@@ -40,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -118,18 +118,18 @@
 
 -- method AsyncInitable::init_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncInitable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncInitable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_async_initable_init_async" g_async_initable_init_async :: 
     Ptr AsyncInitable ->                    -- _obj : TInterface "Gio" "AsyncInitable"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -168,7 +168,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncInitable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -204,7 +204,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncInitable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GObject" "Object"
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : True
 -- Skip return : False
 
@@ -240,20 +240,20 @@
 
 -- method AsyncInitable::newv_async
 -- method type : MemberFunction
--- Args : [Arg {argCName = "object_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_parameters", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TInterface "GObject" "Parameter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "object_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_parameters", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TInterface "GObject" "Parameter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_async_initable_newv_async" g_async_initable_newv_async :: 
     CGType ->                               -- object_type : TBasicType TGType
-    Word32 ->                               -- n_parameters : TBasicType TUInt32
+    Word32 ->                               -- n_parameters : TBasicType TUInt
     Ptr GObject.Parameter ->                -- parameters : TInterface "GObject" "Parameter"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
diff --git a/GI/Gio/Interfaces/AsyncInitable.hs-boot b/GI/Gio/Interfaces/AsyncInitable.hs-boot
--- a/GI/Gio/Interfaces/AsyncInitable.hs-boot
+++ b/GI/Gio/Interfaces/AsyncInitable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.AsyncInitable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/AsyncResult.hs b/GI/Gio/Interfaces/AsyncResult.hs
--- a/GI/Gio/Interfaces/AsyncResult.hs
+++ b/GI/Gio/Interfaces/AsyncResult.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -122,7 +122,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GObject" "Object"
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : False
 -- Skip return : False
 
@@ -151,40 +151,40 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_async_result_get_user_data" g_async_result_get_user_data :: 
     Ptr AsyncResult ->                      -- _obj : TInterface "Gio" "AsyncResult"
-    IO ()
+    IO (Ptr ())
 
 
 asyncResultGetUserData ::
     (MonadIO m, AsyncResultK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 asyncResultGetUserData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    g_async_result_get_user_data _obj'
+    result <- g_async_result_get_user_data _obj'
     touchManagedPtr _obj
-    return ()
+    return result
 
 data AsyncResultGetUserDataMethodInfo
-instance (signature ~ (m ()), MonadIO m, AsyncResultK a) => MethodInfo AsyncResultGetUserDataMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, AsyncResultK a) => MethodInfo AsyncResultGetUserDataMethodInfo a signature where
     overloadedMethod _ = asyncResultGetUserData
 
 -- method AsyncResult::is_tagged
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_async_result_is_tagged" g_async_result_is_tagged :: 
     Ptr AsyncResult ->                      -- _obj : TInterface "Gio" "AsyncResult"
-    Ptr () ->                               -- source_tag : TBasicType TVoid
+    Ptr () ->                               -- source_tag : TBasicType TPtr
     IO CInt
 
 
@@ -208,7 +208,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/AsyncResult.hs-boot b/GI/Gio/Interfaces/AsyncResult.hs-boot
--- a/GI/Gio/Interfaces/AsyncResult.hs-boot
+++ b/GI/Gio/Interfaces/AsyncResult.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.AsyncResult where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Converter.hs b/GI/Gio/Interfaces/Converter.hs
--- a/GI/Gio/Interfaces/Converter.hs
+++ b/GI/Gio/Interfaces/Converter.hs
@@ -31,9 +31,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -108,9 +108,9 @@
 
 -- method Converter::convert
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Converter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inbuf", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inbuf_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "outbuf", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "outbuf_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "ConverterFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_read", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "bytes_written", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Converter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inbuf", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inbuf_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "outbuf", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "outbuf_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "ConverterFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_read", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "bytes_written", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "inbuf_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "ConverterResult"
+-- returnType : Just (TInterface "Gio" "ConverterResult")
 -- throws : True
 -- Skip return : False
 
@@ -118,7 +118,7 @@
     Ptr Converter ->                        -- _obj : TInterface "Gio" "Converter"
     Ptr Word8 ->                            -- inbuf : TCArray False (-1) 2 (TBasicType TUInt8)
     Word64 ->                               -- inbuf_size : TBasicType TUInt64
-    Ptr () ->                               -- outbuf : TBasicType TVoid
+    Ptr () ->                               -- outbuf : TBasicType TPtr
     Word64 ->                               -- outbuf_size : TBasicType TUInt64
     CUInt ->                                -- flags : TInterface "Gio" "ConverterFlags"
     Ptr Word64 ->                           -- bytes_read : TBasicType TUInt64
@@ -166,7 +166,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Converter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Converter.hs-boot b/GI/Gio/Interfaces/Converter.hs-boot
--- a/GI/Gio/Interfaces/Converter.hs-boot
+++ b/GI/Gio/Interfaces/Converter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Converter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/DBusInterface.hs b/GI/Gio/Interfaces/DBusInterface.hs
--- a/GI/Gio/Interfaces/DBusInterface.hs
+++ b/GI/Gio/Interfaces/DBusInterface.hs
@@ -36,9 +36,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -116,7 +116,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterface", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObject"
+-- returnType : Just (TInterface "Gio" "DBusObject")
 -- throws : False
 -- Skip return : False
 
@@ -145,7 +145,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterface", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceInfo"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceInfo")
 -- throws : False
 -- Skip return : False
 
@@ -174,7 +174,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterface", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "Gio" "DBusObject", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/DBusInterface.hs-boot b/GI/Gio/Interfaces/DBusInterface.hs-boot
--- a/GI/Gio/Interfaces/DBusInterface.hs-boot
+++ b/GI/Gio/Interfaces/DBusInterface.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.DBusInterface where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/DBusObject.hs b/GI/Gio/Interfaces/DBusObject.hs
--- a/GI/Gio/Interfaces/DBusObject.hs
+++ b/GI/Gio/Interfaces/DBusObject.hs
@@ -63,9 +63,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -237,7 +237,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObject", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterface"
+-- returnType : Just (TInterface "Gio" "DBusInterface")
 -- throws : False
 -- Skip return : False
 
@@ -270,7 +270,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObject", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "DBusInterface")
+-- returnType : Just (TGList (TInterface "Gio" "DBusInterface"))
 -- throws : False
 -- Skip return : False
 
@@ -286,7 +286,6 @@
 dBusObjectGetInterfaces _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_dbus_object_get_interfaces _obj'
-    checkUnexpectedReturnNULL "g_dbus_object_get_interfaces" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject DBusInterface) result'
     g_list_free result
@@ -301,7 +300,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObject", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/DBusObject.hs-boot b/GI/Gio/Interfaces/DBusObject.hs-boot
--- a/GI/Gio/Interfaces/DBusObject.hs-boot
+++ b/GI/Gio/Interfaces/DBusObject.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.DBusObject where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/DBusObjectManager.hs b/GI/Gio/Interfaces/DBusObjectManager.hs
--- a/GI/Gio/Interfaces/DBusObjectManager.hs
+++ b/GI/Gio/Interfaces/DBusObjectManager.hs
@@ -92,9 +92,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -369,7 +369,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManager", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterface"
+-- returnType : Just (TInterface "Gio" "DBusInterface")
 -- throws : False
 -- Skip return : False
 
@@ -406,7 +406,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManager", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObject"
+-- returnType : Just (TInterface "Gio" "DBusObject")
 -- throws : False
 -- Skip return : False
 
@@ -439,7 +439,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManager", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -468,7 +468,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManager", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "DBusObject")
+-- returnType : Just (TGList (TInterface "Gio" "DBusObject"))
 -- throws : False
 -- Skip return : False
 
@@ -484,7 +484,6 @@
 dBusObjectManagerGetObjects _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_dbus_object_manager_get_objects _obj'
-    checkUnexpectedReturnNULL "g_dbus_object_manager_get_objects" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject DBusObject) result'
     g_list_free result
diff --git a/GI/Gio/Interfaces/DBusObjectManager.hs-boot b/GI/Gio/Interfaces/DBusObjectManager.hs-boot
--- a/GI/Gio/Interfaces/DBusObjectManager.hs-boot
+++ b/GI/Gio/Interfaces/DBusObjectManager.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.DBusObjectManager where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/DesktopAppInfoLookup.hs b/GI/Gio/Interfaces/DesktopAppInfoLookup.hs
--- a/GI/Gio/Interfaces/DesktopAppInfoLookup.hs
+++ b/GI/Gio/Interfaces/DesktopAppInfoLookup.hs
@@ -26,9 +26,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -104,7 +104,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfoLookup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri_scheme", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/DesktopAppInfoLookup.hs-boot b/GI/Gio/Interfaces/DesktopAppInfoLookup.hs-boot
--- a/GI/Gio/Interfaces/DesktopAppInfoLookup.hs-boot
+++ b/GI/Gio/Interfaces/DesktopAppInfoLookup.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.DesktopAppInfoLookup where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Drive.hs b/GI/Gio/Interfaces/Drive.hs
--- a/GI/Gio/Interfaces/Drive.hs
+++ b/GI/Gio/Interfaces/Drive.hs
@@ -207,9 +207,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -483,7 +483,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -511,7 +511,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -539,7 +539,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -567,7 +567,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -595,7 +595,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -621,9 +621,9 @@
 
 -- method Drive::eject
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -632,7 +632,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED driveEject ["(Since version 2.22)","Use g_drive_eject_with_operation() instead."]#-}
@@ -672,7 +672,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -706,9 +706,9 @@
 
 -- method Drive::eject_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -718,7 +718,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -765,7 +765,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -801,7 +801,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -832,7 +832,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -861,7 +861,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "kind", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -895,7 +895,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -925,7 +925,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -954,7 +954,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DriveStartStopType"
+-- returnType : Just (TInterface "Gio" "DriveStartStopType")
 -- throws : False
 -- Skip return : False
 
@@ -982,7 +982,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -1011,7 +1011,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "Volume")
+-- returnType : Just (TGList (TInterface "Gio" "Volume"))
 -- throws : False
 -- Skip return : False
 
@@ -1027,7 +1027,6 @@
 driveGetVolumes _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_drive_get_volumes _obj'
-    checkUnexpectedReturnNULL "g_drive_get_volumes" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject Volume) result'
     g_list_free result
@@ -1042,7 +1041,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1070,7 +1069,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1098,7 +1097,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1126,7 +1125,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1152,9 +1151,9 @@
 
 -- method Drive::poll_for_media
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1162,7 +1161,7 @@
     Ptr Drive ->                            -- _obj : TInterface "Gio" "Drive"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1200,7 +1199,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1234,9 +1233,9 @@
 
 -- method Drive::start
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DriveStartFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DriveStartFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1246,7 +1245,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1293,7 +1292,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1327,9 +1326,9 @@
 
 -- method Drive::stop
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1339,7 +1338,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1386,7 +1385,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Drive", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Drive.hs-boot b/GI/Gio/Interfaces/Drive.hs-boot
--- a/GI/Gio/Interfaces/Drive.hs-boot
+++ b/GI/Gio/Interfaces/Drive.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Drive where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/File.hs b/GI/Gio/Interfaces/File.hs
--- a/GI/Gio/Interfaces/File.hs
+++ b/GI/Gio/Interfaces/File.hs
@@ -615,9 +615,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -807,7 +807,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -850,19 +850,19 @@
 
 -- method File::append_to_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_append_to_async" g_file_append_to_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -903,7 +903,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -939,9 +939,9 @@
 
 -- method File::copy
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCopyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback", argType = TInterface "Gio" "FileProgressCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCopyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback", argType = TInterface "Gio" "FileProgressCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -951,7 +951,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "FileCopyFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr FileProgressCallbackC ->         -- progress_callback : TInterface "Gio" "FileProgressCallback"
-    Ptr () ->                               -- progress_callback_data : TBasicType TVoid
+    Ptr () ->                               -- progress_callback_data : TBasicType TPtr
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -999,7 +999,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCopyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1046,7 +1046,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1082,7 +1082,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -1125,19 +1125,19 @@
 
 -- method File::create_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_create_async" g_file_create_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1178,7 +1178,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -1216,7 +1216,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -1259,19 +1259,19 @@
 
 -- method File::create_readwrite_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_create_readwrite_async" g_file_create_readwrite_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1312,7 +1312,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -1350,7 +1350,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1388,18 +1388,18 @@
 
 -- method File::delete_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_delete_async" g_file_delete_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1438,7 +1438,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1474,7 +1474,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -1501,9 +1501,9 @@
 
 -- method File::eject_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1512,7 +1512,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED fileEjectMountable ["(Since version 2.22)","Use g_file_eject_mountable_with_operation() instead."]#-}
@@ -1552,7 +1552,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1586,9 +1586,9 @@
 
 -- method File::eject_mountable_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1598,7 +1598,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1645,7 +1645,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1681,7 +1681,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileEnumerator"
+-- returnType : Just (TInterface "Gio" "FileEnumerator")
 -- throws : True
 -- Skip return : False
 
@@ -1728,9 +1728,9 @@
 
 -- method File::enumerate_children_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1738,10 +1738,10 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CString ->                              -- attributes : TBasicType TUTF8
     CUInt ->                                -- flags : TInterface "Gio" "FileQueryInfoFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1785,7 +1785,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileEnumerator"
+-- returnType : Just (TInterface "Gio" "FileEnumerator")
 -- throws : True
 -- Skip return : False
 
@@ -1823,7 +1823,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "file2", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1855,7 +1855,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Mount"
+-- returnType : Just (TInterface "Gio" "Mount")
 -- throws : True
 -- Skip return : False
 
@@ -1895,18 +1895,18 @@
 
 -- method File::find_enclosing_mount_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_find_enclosing_mount_async" g_file_find_enclosing_mount_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1945,7 +1945,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Mount"
+-- returnType : Just (TInterface "Gio" "Mount")
 -- throws : True
 -- Skip return : False
 
@@ -1983,7 +1983,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1995,25 +1995,26 @@
 fileGetBasename ::
     (MonadIO m, FileK a) =>
     a                                       -- _obj
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 fileGetBasename _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_file_get_basename _obj'
-    checkUnexpectedReturnNULL "g_file_get_basename" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data FileGetBasenameMethodInfo
-instance (signature ~ (m T.Text), MonadIO m, FileK a) => MethodInfo FileGetBasenameMethodInfo a signature where
+instance (signature ~ (m (Maybe T.Text)), MonadIO m, FileK a) => MethodInfo FileGetBasenameMethodInfo a signature where
     overloadedMethod _ = fileGetBasename
 
 -- method File::get_child
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -2046,7 +2047,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "display_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : True
 -- Skip return : False
 
@@ -2084,7 +2085,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -2096,24 +2097,25 @@
 fileGetParent ::
     (MonadIO m, FileK a) =>
     a                                       -- _obj
-    -> m File                               -- result
+    -> m (Maybe File)                       -- result
 fileGetParent _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_file_get_parent _obj'
-    checkUnexpectedReturnNULL "g_file_get_parent" result
-    result' <- (wrapObject File) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (wrapObject File) result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data FileGetParentMethodInfo
-instance (signature ~ (m File), MonadIO m, FileK a) => MethodInfo FileGetParentMethodInfo a signature where
+instance (signature ~ (m (Maybe File)), MonadIO m, FileK a) => MethodInfo FileGetParentMethodInfo a signature where
     overloadedMethod _ = fileGetParent
 
 -- method File::get_parse_name
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2143,7 +2145,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2155,25 +2157,26 @@
 fileGetPath ::
     (MonadIO m, FileK a) =>
     a                                       -- _obj
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 fileGetPath _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_file_get_path _obj'
-    checkUnexpectedReturnNULL "g_file_get_path" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data FileGetPathMethodInfo
-instance (signature ~ (m T.Text), MonadIO m, FileK a) => MethodInfo FileGetPathMethodInfo a signature where
+instance (signature ~ (m (Maybe T.Text)), MonadIO m, FileK a) => MethodInfo FileGetPathMethodInfo a signature where
     overloadedMethod _ = fileGetPath
 
 -- method File::get_relative_path
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "descendant", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2187,27 +2190,28 @@
     (MonadIO m, FileK a, FileK b) =>
     a                                       -- _obj
     -> b                                    -- descendant
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 fileGetRelativePath _obj descendant = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     let descendant' = unsafeManagedPtrCastPtr descendant
     result <- g_file_get_relative_path _obj' descendant'
-    checkUnexpectedReturnNULL "g_file_get_relative_path" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
     touchManagedPtr descendant
-    return result'
+    return maybeResult
 
 data FileGetRelativePathMethodInfo
-instance (signature ~ (b -> m T.Text), MonadIO m, FileK a, FileK b) => MethodInfo FileGetRelativePathMethodInfo a signature where
+instance (signature ~ (b -> m (Maybe T.Text)), MonadIO m, FileK a, FileK b) => MethodInfo FileGetRelativePathMethodInfo a signature where
     overloadedMethod _ = fileGetRelativePath
 
 -- method File::get_uri
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2237,7 +2241,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -2267,7 +2271,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parent", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2303,7 +2307,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "prefix", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2335,7 +2339,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri_scheme", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2367,7 +2371,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2394,7 +2398,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2422,7 +2426,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "etag_out", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2478,9 +2482,9 @@
 
 -- method File::load_contents_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2488,7 +2492,7 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -2526,7 +2530,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "etag_out", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2580,7 +2584,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "etag_out", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2634,7 +2638,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2672,18 +2676,18 @@
 
 -- method File::make_directory_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_make_directory_async" g_file_make_directory_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -2722,7 +2726,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2758,7 +2762,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2798,7 +2802,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "symlink_value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2842,7 +2846,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "disk_usage", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "num_dirs", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "num_files", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2892,7 +2896,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileMonitorFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileMonitor"
+-- returnType : Just (TInterface "Gio" "FileMonitor")
 -- throws : True
 -- Skip return : False
 
@@ -2937,7 +2941,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileMonitorFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileMonitor"
+-- returnType : Just (TInterface "Gio" "FileMonitor")
 -- throws : True
 -- Skip return : False
 
@@ -2982,7 +2986,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileMonitorFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileMonitor"
+-- returnType : Just (TInterface "Gio" "FileMonitor")
 -- throws : True
 -- Skip return : False
 
@@ -3025,9 +3029,9 @@
 
 -- method File::mount_enclosing_volume
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3037,7 +3041,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3084,7 +3088,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -3118,9 +3122,9 @@
 
 -- method File::mount_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3130,7 +3134,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3177,7 +3181,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : True
 -- Skip return : False
 
@@ -3213,9 +3217,9 @@
 
 -- method File::move
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCopyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback", argType = TInterface "Gio" "FileProgressCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCopyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback", argType = TInterface "Gio" "FileProgressCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "progress_callback_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -3225,7 +3229,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "FileCopyFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr FileProgressCallbackC ->         -- progress_callback : TInterface "Gio" "FileProgressCallback"
-    Ptr () ->                               -- progress_callback_data : TBasicType TVoid
+    Ptr () ->                               -- progress_callback_data : TBasicType TPtr
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -3273,7 +3277,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -3313,18 +3317,18 @@
 
 -- method File::open_readwrite_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_open_readwrite_async" g_file_open_readwrite_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3363,7 +3367,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -3399,9 +3403,9 @@
 
 -- method File::poll_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3409,7 +3413,7 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3447,7 +3451,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -3483,7 +3487,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfo"
+-- returnType : Just (TInterface "Gio" "AppInfo")
 -- throws : True
 -- Skip return : False
 
@@ -3525,7 +3529,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3561,7 +3565,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileType"
+-- returnType : Just (TInterface "Gio" "FileType")
 -- throws : False
 -- Skip return : False
 
@@ -3600,7 +3604,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -3644,19 +3648,19 @@
 
 -- method File::query_filesystem_info_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_query_filesystem_info_async" g_file_query_filesystem_info_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CString ->                              -- attributes : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3698,7 +3702,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -3736,7 +3740,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -3783,9 +3787,9 @@
 
 -- method File::query_info_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3793,10 +3797,10 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CString ->                              -- attributes : TBasicType TUTF8
     CUInt ->                                -- flags : TInterface "Gio" "FileQueryInfoFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -3840,7 +3844,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -3878,7 +3882,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfoList"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfoList")
 -- throws : True
 -- Skip return : False
 
@@ -3920,7 +3924,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfoList"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfoList")
 -- throws : True
 -- Skip return : False
 
@@ -3962,7 +3966,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInputStream"
+-- returnType : Just (TInterface "Gio" "FileInputStream")
 -- throws : True
 -- Skip return : False
 
@@ -4002,18 +4006,18 @@
 
 -- method File::read_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_read_async" g_file_read_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -4052,7 +4056,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInputStream"
+-- returnType : Just (TInterface "Gio" "FileInputStream")
 -- throws : True
 -- Skip return : False
 
@@ -4090,7 +4094,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -4144,9 +4148,9 @@
 
 -- method File::replace_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4155,10 +4159,10 @@
     CString ->                              -- etag : TBasicType TUTF8
     CInt ->                                 -- make_backup : TBasicType TBoolean
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -4208,7 +4212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "new_etag", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4274,9 +4278,9 @@
 
 -- method File::replace_contents_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4289,7 +4293,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -4340,9 +4344,9 @@
 
 -- method File::replace_contents_bytes_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "contents", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4354,7 +4358,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -4406,7 +4410,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "new_etag", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4448,7 +4452,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileOutputStream"
+-- returnType : Just (TInterface "Gio" "FileOutputStream")
 -- throws : True
 -- Skip return : False
 
@@ -4486,7 +4490,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -4540,9 +4544,9 @@
 
 -- method File::replace_readwrite_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "etag", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "make_backup", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileCreateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4551,10 +4555,10 @@
     CString ->                              -- etag : TBasicType TUTF8
     CInt ->                                 -- make_backup : TBasicType TBoolean
     CUInt ->                                -- flags : TInterface "Gio" "FileCreateFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -4604,7 +4608,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIOStream"
+-- returnType : Just (TInterface "Gio" "FileIOStream")
 -- throws : True
 -- Skip return : False
 
@@ -4642,7 +4646,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "relative_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -4673,9 +4677,9 @@
 
 -- method File::set_attribute
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value_p", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value_p", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4683,7 +4687,7 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CString ->                              -- attribute : TBasicType TUTF8
     CUInt ->                                -- type : TInterface "Gio" "FileAttributeType"
-    Ptr () ->                               -- value_p : TBasicType TVoid
+    Ptr () ->                               -- value_p : TBasicType TPtr
     CUInt ->                                -- flags : TInterface "Gio" "FileQueryInfoFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
@@ -4695,7 +4699,7 @@
     a                                       -- _obj
     -> T.Text                               -- attribute
     -> FileAttributeType                    -- type_
-    -> Maybe (Ptr ())                       -- valueP
+    -> Ptr ()                               -- valueP
     -> [FileQueryInfoFlags]                 -- flags
     -> Maybe (b)                            -- cancellable
     -> m ()                                 -- result
@@ -4703,10 +4707,6 @@
     let _obj' = unsafeManagedPtrCastPtr _obj
     attribute' <- textToCString attribute
     let type_' = (fromIntegral . fromEnum) type_
-    maybeValueP <- case valueP of
-        Nothing -> return nullPtr
-        Just jValueP -> do
-            return jValueP
     let flags' = gflagsToWord flags
     maybeCancellable <- case cancellable of
         Nothing -> return nullPtr
@@ -4714,7 +4714,7 @@
             let jCancellable' = unsafeManagedPtrCastPtr jCancellable
             return jCancellable'
     onException (do
-        _ <- propagateGError $ g_file_set_attribute _obj' attribute' type_' maybeValueP flags' maybeCancellable
+        _ <- propagateGError $ g_file_set_attribute _obj' attribute' type_' valueP flags' maybeCancellable
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
         freeMem attribute'
@@ -4724,14 +4724,14 @@
      )
 
 data FileSetAttributeMethodInfo
-instance (signature ~ (T.Text -> FileAttributeType -> Maybe (Ptr ()) -> [FileQueryInfoFlags] -> Maybe (b) -> m ()), MonadIO m, FileK a, CancellableK b) => MethodInfo FileSetAttributeMethodInfo a signature where
+instance (signature ~ (T.Text -> FileAttributeType -> Ptr () -> [FileQueryInfoFlags] -> Maybe (b) -> m ()), MonadIO m, FileK a, CancellableK b) => MethodInfo FileSetAttributeMethodInfo a signature where
     overloadedMethod _ = fileSetAttribute
 
 -- method File::set_attribute_byte_string
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4783,7 +4783,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4832,7 +4832,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4881,7 +4881,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4933,7 +4933,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -4982,7 +4982,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5029,9 +5029,9 @@
 
 -- method File::set_attributes_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5039,10 +5039,10 @@
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     Ptr FileInfo ->                         -- info : TInterface "Gio" "FileInfo"
     CUInt ->                                -- flags : TInterface "Gio" "FileQueryInfoFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5086,7 +5086,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "FileInfo", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5127,7 +5127,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileQueryInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5174,7 +5174,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "display_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : True
 -- Skip return : False
 
@@ -5218,19 +5218,19 @@
 
 -- method File::set_display_name_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "display_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "display_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_set_display_name_async" g_file_set_display_name_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
     CString ->                              -- display_name : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5272,7 +5272,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : True
 -- Skip return : False
 
@@ -5308,9 +5308,9 @@
 
 -- method File::start_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DriveStartFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DriveStartFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5320,7 +5320,7 @@
     Ptr MountOperation ->                   -- start_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5367,7 +5367,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5401,9 +5401,9 @@
 
 -- method File::stop_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5413,7 +5413,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5460,7 +5460,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5496,7 +5496,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -5524,7 +5524,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5562,18 +5562,18 @@
 
 -- method File::trash_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_trash_async" g_file_trash_async :: 
     Ptr File ->                             -- _obj : TInterface "Gio" "File"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5612,7 +5612,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5646,9 +5646,9 @@
 
 -- method File::unmount_mountable
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5657,7 +5657,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED fileUnmountMountable ["(Since version 2.22)","Use g_file_unmount_mountable_with_operation() instead."]#-}
@@ -5697,7 +5697,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5731,9 +5731,9 @@
 
 -- method File::unmount_mountable_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5743,7 +5743,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -5790,7 +5790,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5826,7 +5826,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "arg", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -5851,7 +5851,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "arg", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cwd", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -5880,7 +5880,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -5905,7 +5905,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -5930,7 +5930,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "tmpl", argType = TBasicType TFileName, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "iostream", argType = TInterface "Gio" "FileIOStream", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : True
 -- Skip return : False
 
@@ -5970,7 +5970,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "parse_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/File.hs-boot b/GI/Gio/Interfaces/File.hs-boot
--- a/GI/Gio/Interfaces/File.hs-boot
+++ b/GI/Gio/Interfaces/File.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.File where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/FileDescriptorBased.hs b/GI/Gio/Interfaces/FileDescriptorBased.hs
--- a/GI/Gio/Interfaces/FileDescriptorBased.hs
+++ b/GI/Gio/Interfaces/FileDescriptorBased.hs
@@ -26,9 +26,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -104,7 +104,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileDescriptorBased", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/FileDescriptorBased.hs-boot b/GI/Gio/Interfaces/FileDescriptorBased.hs-boot
--- a/GI/Gio/Interfaces/FileDescriptorBased.hs-boot
+++ b/GI/Gio/Interfaces/FileDescriptorBased.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.FileDescriptorBased where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Icon.hs b/GI/Gio/Interfaces/Icon.hs
--- a/GI/Gio/Interfaces/Icon.hs
+++ b/GI/Gio/Interfaces/Icon.hs
@@ -48,9 +48,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -128,7 +128,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon2", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -164,7 +164,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -193,7 +193,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -205,25 +205,26 @@
 iconToString ::
     (MonadIO m, IconK a) =>
     a                                       -- _obj
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 iconToString _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_icon_to_string _obj'
-    checkUnexpectedReturnNULL "g_icon_to_string" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data IconToStringMethodInfo
-instance (signature ~ (m T.Text), MonadIO m, IconK a) => MethodInfo IconToStringMethodInfo a signature where
+instance (signature ~ (m (Maybe T.Text)), MonadIO m, IconK a) => MethodInfo IconToStringMethodInfo a signature where
     overloadedMethod _ = iconToString
 
 -- method Icon::deserialize
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -245,14 +246,14 @@
 
 -- method Icon::hash
 -- method type : MemberFunction
--- Args : [Arg {argCName = "icon", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "icon", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_icon_hash" g_icon_hash :: 
-    Ptr () ->                               -- icon : TBasicType TVoid
+    Ptr () ->                               -- icon : TBasicType TPtr
     IO Word32
 
 
@@ -268,7 +269,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "str", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Icon.hs-boot b/GI/Gio/Interfaces/Icon.hs-boot
--- a/GI/Gio/Interfaces/Icon.hs-boot
+++ b/GI/Gio/Interfaces/Icon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Icon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Initable.hs b/GI/Gio/Interfaces/Initable.hs
--- a/GI/Gio/Interfaces/Initable.hs
+++ b/GI/Gio/Interfaces/Initable.hs
@@ -30,9 +30,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -108,7 +108,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Initable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -146,15 +146,15 @@
 
 -- method Initable::newv
 -- method type : MemberFunction
--- Args : [Arg {argCName = "object_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_parameters", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TCArray False (-1) 1 (TInterface "GObject" "Parameter"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_parameters", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "GObject" "Object"
+-- Args : [Arg {argCName = "object_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_parameters", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TCArray False (-1) 1 (TInterface "GObject" "Parameter"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_parameters", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_initable_newv" g_initable_newv :: 
     CGType ->                               -- object_type : TBasicType TGType
-    Word32 ->                               -- n_parameters : TBasicType TUInt32
+    Word32 ->                               -- n_parameters : TBasicType TUInt
     Ptr GObject.Parameter ->                -- parameters : TCArray False (-1) 1 (TInterface "GObject" "Parameter")
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
diff --git a/GI/Gio/Interfaces/Initable.hs-boot b/GI/Gio/Interfaces/Initable.hs-boot
--- a/GI/Gio/Interfaces/Initable.hs-boot
+++ b/GI/Gio/Interfaces/Initable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Initable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/ListModel.hs b/GI/Gio/Interfaces/ListModel.hs
--- a/GI/Gio/Interfaces/ListModel.hs
+++ b/GI/Gio/Interfaces/ListModel.hs
@@ -56,9 +56,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -189,7 +189,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -217,7 +217,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -242,15 +242,15 @@
 
 -- method ListModel::get_item
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GObject" "Object"
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_model_get_object" g_list_model_get_object :: 
     Ptr ListModel ->                        -- _obj : TInterface "Gio" "ListModel"
-    Word32 ->                               -- position : TBasicType TUInt32
+    Word32 ->                               -- position : TBasicType TUInt
     IO (Ptr GObject.Object)
 
 
@@ -258,32 +258,33 @@
     (MonadIO m, ListModelK a) =>
     a                                       -- _obj
     -> Word32                               -- position
-    -> m GObject.Object                     -- result
+    -> m (Maybe GObject.Object)             -- result
 listModelGetItem _obj position = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_list_model_get_object _obj' position
-    checkUnexpectedReturnNULL "g_list_model_get_object" result
-    result' <- (wrapObject GObject.Object) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (wrapObject GObject.Object) result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data ListModelGetItemMethodInfo
-instance (signature ~ (Word32 -> m GObject.Object), MonadIO m, ListModelK a) => MethodInfo ListModelGetItemMethodInfo a signature where
+instance (signature ~ (Word32 -> m (Maybe GObject.Object)), MonadIO m, ListModelK a) => MethodInfo ListModelGetItemMethodInfo a signature where
     overloadedMethod _ = listModelGetItem
 
 -- method ListModel::items_changed
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "removed", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "added", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "removed", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "added", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_model_items_changed" g_list_model_items_changed :: 
     Ptr ListModel ->                        -- _obj : TInterface "Gio" "ListModel"
-    Word32 ->                               -- position : TBasicType TUInt32
-    Word32 ->                               -- removed : TBasicType TUInt32
-    Word32 ->                               -- added : TBasicType TUInt32
+    Word32 ->                               -- position : TBasicType TUInt
+    Word32 ->                               -- removed : TBasicType TUInt
+    Word32 ->                               -- added : TBasicType TUInt
     IO ()
 
 
diff --git a/GI/Gio/Interfaces/ListModel.hs-boot b/GI/Gio/Interfaces/ListModel.hs-boot
--- a/GI/Gio/Interfaces/ListModel.hs-boot
+++ b/GI/Gio/Interfaces/ListModel.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.ListModel where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/LoadableIcon.hs b/GI/Gio/Interfaces/LoadableIcon.hs
--- a/GI/Gio/Interfaces/LoadableIcon.hs
+++ b/GI/Gio/Interfaces/LoadableIcon.hs
@@ -36,9 +36,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -117,15 +117,15 @@
 
 -- method LoadableIcon::load
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "LoadableIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "LoadableIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_loadable_icon_load" g_loadable_icon_load :: 
     Ptr LoadableIcon ->                     -- _obj : TInterface "Gio" "LoadableIcon"
-    Int32 ->                                -- size : TBasicType TInt32
+    Int32 ->                                -- size : TBasicType TInt
     Ptr CString ->                          -- type : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
@@ -167,18 +167,18 @@
 
 -- method LoadableIcon::load_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "LoadableIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "LoadableIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_loadable_icon_load_async" g_loadable_icon_load_async :: 
     Ptr LoadableIcon ->                     -- _obj : TInterface "Gio" "LoadableIcon"
-    Int32 ->                                -- size : TBasicType TInt32
+    Int32 ->                                -- size : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -217,7 +217,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "LoadableIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/LoadableIcon.hs-boot b/GI/Gio/Interfaces/LoadableIcon.hs-boot
--- a/GI/Gio/Interfaces/LoadableIcon.hs-boot
+++ b/GI/Gio/Interfaces/LoadableIcon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.LoadableIcon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Mount.hs b/GI/Gio/Interfaces/Mount.hs
--- a/GI/Gio/Interfaces/Mount.hs
+++ b/GI/Gio/Interfaces/Mount.hs
@@ -195,9 +195,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -428,7 +428,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -456,7 +456,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -482,9 +482,9 @@
 
 -- method Mount::eject
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -493,7 +493,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED mountEject ["(Since version 2.22)","Use g_mount_eject_with_operation() instead."]#-}
@@ -533,7 +533,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -567,9 +567,9 @@
 
 -- method Mount::eject_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -579,7 +579,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -626,7 +626,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -662,7 +662,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -691,7 +691,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Drive"
+-- returnType : Just (TInterface "Gio" "Drive")
 -- throws : False
 -- Skip return : False
 
@@ -720,7 +720,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -749,7 +749,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -779,7 +779,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -808,7 +808,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -837,7 +837,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -866,7 +866,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -896,7 +896,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Volume"
+-- returnType : Just (TInterface "Gio" "Volume")
 -- throws : False
 -- Skip return : False
 
@@ -923,9 +923,9 @@
 
 -- method Mount::guess_content_type
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "force_rescan", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "force_rescan", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -934,7 +934,7 @@
     CInt ->                                 -- force_rescan : TBasicType TBoolean
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -974,7 +974,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -1014,7 +1014,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "force_rescan", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -1061,7 +1061,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1087,9 +1087,9 @@
 
 -- method Mount::remount
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1099,7 +1099,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1146,7 +1146,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1182,7 +1182,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1207,9 +1207,9 @@
 
 -- method Mount::unmount
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1218,7 +1218,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED mountUnmount ["(Since version 2.22)","Use g_mount_unmount_with_operation() instead."]#-}
@@ -1258,7 +1258,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1292,9 +1292,9 @@
 
 -- method Mount::unmount_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1304,7 +1304,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1351,7 +1351,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1387,7 +1387,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Mount.hs-boot b/GI/Gio/Interfaces/Mount.hs-boot
--- a/GI/Gio/Interfaces/Mount.hs-boot
+++ b/GI/Gio/Interfaces/Mount.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Mount where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/NetworkMonitor.hs b/GI/Gio/Interfaces/NetworkMonitor.hs
--- a/GI/Gio/Interfaces/NetworkMonitor.hs
+++ b/GI/Gio/Interfaces/NetworkMonitor.hs
@@ -57,16 +57,19 @@
 -- ** Connectivity
     NetworkMonitorConnectivityPropertyInfo  ,
     getNetworkMonitorConnectivity           ,
+    networkMonitorConnectivity              ,
 
 
 -- ** NetworkAvailable
     NetworkMonitorNetworkAvailablePropertyInfo,
     getNetworkMonitorNetworkAvailable       ,
+    networkMonitorNetworkAvailable          ,
 
 
 -- ** NetworkMetered
     NetworkMonitorNetworkMeteredPropertyInfo,
     getNetworkMonitorNetworkMetered         ,
+    networkMonitorNetworkMetered            ,
 
 
 
@@ -88,9 +91,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -190,6 +193,7 @@
 -- VVV Prop "connectivity"
    -- Type: TInterface "Gio" "NetworkConnectivity"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkMonitorConnectivity :: (MonadIO m, NetworkMonitorK o) => o -> m NetworkConnectivity
 getNetworkMonitorConnectivity obj = liftIO $ getObjectPropertyEnum obj "connectivity"
@@ -204,10 +208,12 @@
     attrGet _ = getNetworkMonitorConnectivity
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "network-available"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkMonitorNetworkAvailable :: (MonadIO m, NetworkMonitorK o) => o -> m Bool
 getNetworkMonitorNetworkAvailable obj = liftIO $ getObjectPropertyBool obj "network-available"
@@ -222,10 +228,12 @@
     attrGet _ = getNetworkMonitorNetworkAvailable
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "network-metered"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkMonitorNetworkMetered :: (MonadIO m, NetworkMonitorK o) => o -> m Bool
 getNetworkMonitorNetworkMetered obj = liftIO $ getObjectPropertyBool obj "network-metered"
@@ -240,10 +248,20 @@
     attrGet _ = getNetworkMonitorNetworkMetered
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList NetworkMonitor = NetworkMonitorAttributeList
 type NetworkMonitorAttributeList = ('[ '("connectivity", NetworkMonitorConnectivityPropertyInfo), '("networkAvailable", NetworkMonitorNetworkAvailablePropertyInfo), '("networkMetered", NetworkMonitorNetworkMeteredPropertyInfo)] :: [(Symbol, *)])
 
+networkMonitorConnectivity :: AttrLabelProxy "connectivity"
+networkMonitorConnectivity = AttrLabelProxy
+
+networkMonitorNetworkAvailable :: AttrLabelProxy "networkAvailable"
+networkMonitorNetworkAvailable = AttrLabelProxy
+
+networkMonitorNetworkMetered :: AttrLabelProxy "networkMetered"
+networkMonitorNetworkMetered = AttrLabelProxy
+
 data NetworkMonitorNetworkChangedSignalInfo
 instance SignalInfo NetworkMonitorNetworkChangedSignalInfo where
     type HaskellCallbackType NetworkMonitorNetworkChangedSignalInfo = NetworkMonitorNetworkChangedCallback
@@ -273,7 +291,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -315,9 +333,9 @@
 
 -- method NetworkMonitor::can_reach_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -326,7 +344,7 @@
     Ptr SocketConnectable ->                -- connectable : TInterface "Gio" "SocketConnectable"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -367,7 +385,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -403,7 +421,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkConnectivity"
+-- returnType : Just (TInterface "Gio" "NetworkConnectivity")
 -- throws : False
 -- Skip return : False
 
@@ -431,7 +449,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -459,7 +477,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -487,7 +505,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkMonitor"
+-- returnType : Just (TInterface "Gio" "NetworkMonitor")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/NetworkMonitor.hs-boot b/GI/Gio/Interfaces/NetworkMonitor.hs-boot
--- a/GI/Gio/Interfaces/NetworkMonitor.hs-boot
+++ b/GI/Gio/Interfaces/NetworkMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.NetworkMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/PollableInputStream.hs b/GI/Gio/Interfaces/PollableInputStream.hs
--- a/GI/Gio/Interfaces/PollableInputStream.hs
+++ b/GI/Gio/Interfaces/PollableInputStream.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,7 +142,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -170,7 +170,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Source"
+-- returnType : Just (TInterface "GLib" "Source")
 -- throws : False
 -- Skip return : False
 
@@ -207,7 +207,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -235,7 +235,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/PollableInputStream.hs-boot b/GI/Gio/Interfaces/PollableInputStream.hs-boot
--- a/GI/Gio/Interfaces/PollableInputStream.hs-boot
+++ b/GI/Gio/Interfaces/PollableInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.PollableInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/PollableOutputStream.hs b/GI/Gio/Interfaces/PollableOutputStream.hs
--- a/GI/Gio/Interfaces/PollableOutputStream.hs
+++ b/GI/Gio/Interfaces/PollableOutputStream.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -146,7 +146,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -174,7 +174,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Source"
+-- returnType : Just (TInterface "GLib" "Source")
 -- throws : False
 -- Skip return : False
 
@@ -211,7 +211,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -239,7 +239,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "PollableOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/PollableOutputStream.hs-boot b/GI/Gio/Interfaces/PollableOutputStream.hs-boot
--- a/GI/Gio/Interfaces/PollableOutputStream.hs-boot
+++ b/GI/Gio/Interfaces/PollableOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.PollableOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Proxy.hs b/GI/Gio/Interfaces/Proxy.hs
--- a/GI/Gio/Interfaces/Proxy.hs
+++ b/GI/Gio/Interfaces/Proxy.hs
@@ -45,9 +45,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -126,7 +126,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Proxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "proxy_address", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : True
 -- Skip return : False
 
@@ -174,9 +174,9 @@
 
 -- method Proxy::connect_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Proxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "proxy_address", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Proxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "proxy_address", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -186,7 +186,7 @@
     Ptr ProxyAddress ->                     -- proxy_address : TInterface "Gio" "ProxyAddress"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -230,7 +230,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Proxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : True
 -- Skip return : False
 
@@ -268,7 +268,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Proxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -296,7 +296,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Proxy"
+-- returnType : Just (TInterface "Gio" "Proxy")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Proxy.hs-boot b/GI/Gio/Interfaces/Proxy.hs-boot
--- a/GI/Gio/Interfaces/Proxy.hs-boot
+++ b/GI/Gio/Interfaces/Proxy.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Proxy where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/ProxyResolver.hs b/GI/Gio/Interfaces/ProxyResolver.hs
--- a/GI/Gio/Interfaces/ProxyResolver.hs
+++ b/GI/Gio/Interfaces/ProxyResolver.hs
@@ -45,9 +45,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -126,7 +126,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -154,7 +154,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -200,9 +200,9 @@
 
 -- method ProxyResolver::lookup_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -211,7 +211,7 @@
     CString ->                              -- uri : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -252,7 +252,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -292,7 +292,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "ProxyResolver"
+-- returnType : Just (TInterface "Gio" "ProxyResolver")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/ProxyResolver.hs-boot b/GI/Gio/Interfaces/ProxyResolver.hs-boot
--- a/GI/Gio/Interfaces/ProxyResolver.hs-boot
+++ b/GI/Gio/Interfaces/ProxyResolver.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.ProxyResolver where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/RemoteActionGroup.hs b/GI/Gio/Interfaces/RemoteActionGroup.hs
--- a/GI/Gio/Interfaces/RemoteActionGroup.hs
+++ b/GI/Gio/Interfaces/RemoteActionGroup.hs
@@ -31,9 +31,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -124,7 +124,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "RemoteActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameter", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "platform_data", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -165,7 +165,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "RemoteActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "platform_data", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/RemoteActionGroup.hs-boot b/GI/Gio/Interfaces/RemoteActionGroup.hs-boot
--- a/GI/Gio/Interfaces/RemoteActionGroup.hs-boot
+++ b/GI/Gio/Interfaces/RemoteActionGroup.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.RemoteActionGroup where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Seekable.hs b/GI/Gio/Interfaces/Seekable.hs
--- a/GI/Gio/Interfaces/Seekable.hs
+++ b/GI/Gio/Interfaces/Seekable.hs
@@ -46,9 +46,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -129,7 +129,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Seekable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -157,7 +157,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Seekable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -185,7 +185,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Seekable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "offset", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "GLib" "SeekType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -230,7 +230,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Seekable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -257,7 +257,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Seekable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "offset", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Seekable.hs-boot b/GI/Gio/Interfaces/Seekable.hs-boot
--- a/GI/Gio/Interfaces/Seekable.hs-boot
+++ b/GI/Gio/Interfaces/Seekable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Seekable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/SocketConnectable.hs b/GI/Gio/Interfaces/SocketConnectable.hs
--- a/GI/Gio/Interfaces/SocketConnectable.hs
+++ b/GI/Gio/Interfaces/SocketConnectable.hs
@@ -31,9 +31,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -110,7 +110,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddressEnumerator"
+-- returnType : Just (TInterface "Gio" "SocketAddressEnumerator")
 -- throws : False
 -- Skip return : False
 
@@ -139,7 +139,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddressEnumerator"
+-- returnType : Just (TInterface "Gio" "SocketAddressEnumerator")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/SocketConnectable.hs-boot b/GI/Gio/Interfaces/SocketConnectable.hs-boot
--- a/GI/Gio/Interfaces/SocketConnectable.hs-boot
+++ b/GI/Gio/Interfaces/SocketConnectable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.SocketConnectable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/TlsBackend.hs b/GI/Gio/Interfaces/TlsBackend.hs
--- a/GI/Gio/Interfaces/TlsBackend.hs
+++ b/GI/Gio/Interfaces/TlsBackend.hs
@@ -55,9 +55,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -138,7 +138,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -166,7 +166,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -194,7 +194,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsDatabase"
+-- returnType : Just (TInterface "Gio" "TlsDatabase")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +223,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -251,7 +251,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -279,7 +279,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -307,7 +307,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsBackend"
+-- returnType : Just (TInterface "Gio" "TlsBackend")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/TlsBackend.hs-boot b/GI/Gio/Interfaces/TlsBackend.hs-boot
--- a/GI/Gio/Interfaces/TlsBackend.hs-boot
+++ b/GI/Gio/Interfaces/TlsBackend.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.TlsBackend where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/TlsClientConnection.hs b/GI/Gio/Interfaces/TlsClientConnection.hs
--- a/GI/Gio/Interfaces/TlsClientConnection.hs
+++ b/GI/Gio/Interfaces/TlsClientConnection.hs
@@ -67,6 +67,7 @@
 -- ** AcceptedCas
     TlsClientConnectionAcceptedCasPropertyInfo,
     getTlsClientConnectionAcceptedCas       ,
+    tlsClientConnectionAcceptedCas          ,
 
 
 -- ** ServerIdentity
@@ -74,6 +75,7 @@
     constructTlsClientConnectionServerIdentity,
     getTlsClientConnectionServerIdentity    ,
     setTlsClientConnectionServerIdentity    ,
+    tlsClientConnectionServerIdentity       ,
 
 
 -- ** UseSsl3
@@ -81,6 +83,7 @@
     constructTlsClientConnectionUseSsl3     ,
     getTlsClientConnectionUseSsl3           ,
     setTlsClientConnectionUseSsl3           ,
+    tlsClientConnectionUseSsl3              ,
 
 
 -- ** ValidationFlags
@@ -88,15 +91,16 @@
     constructTlsClientConnectionValidationFlags,
     getTlsClientConnectionValidationFlags   ,
     setTlsClientConnectionValidationFlags   ,
+    tlsClientConnectionValidationFlags      ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -181,8 +185,9 @@
 #endif
 
 -- VVV Prop "accepted-cas"
-   -- Type: TGList (TBasicType TVoid)
+   -- Type: TGList (TBasicType TPtr)
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getTlsClientConnectionAcceptedCas :: (MonadIO m, TlsClientConnectionK o) => o -> m [Ptr ()]
 getTlsClientConnectionAcceptedCas obj = liftIO $ getObjectPropertyPtrGList obj "accepted-cas"
@@ -197,19 +202,21 @@
     attrGet _ = getTlsClientConnectionAcceptedCas
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "server-identity"
    -- Type: TInterface "Gio" "SocketConnectable"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsClientConnectionServerIdentity :: (MonadIO m, TlsClientConnectionK o) => o -> m SocketConnectable
-getTlsClientConnectionServerIdentity obj = liftIO $ getObjectPropertyObject obj "server-identity" SocketConnectable
+getTlsClientConnectionServerIdentity obj = liftIO $ checkUnexpectedNothing "getTlsClientConnectionServerIdentity" $ getObjectPropertyObject obj "server-identity" SocketConnectable
 
 setTlsClientConnectionServerIdentity :: (MonadIO m, TlsClientConnectionK o, SocketConnectableK a) => o -> a -> m ()
-setTlsClientConnectionServerIdentity obj val = liftIO $ setObjectPropertyObject obj "server-identity" val
+setTlsClientConnectionServerIdentity obj val = liftIO $ setObjectPropertyObject obj "server-identity" (Just val)
 
 constructTlsClientConnectionServerIdentity :: (SocketConnectableK a) => a -> IO ([Char], GValue)
-constructTlsClientConnectionServerIdentity val = constructObjectPropertyObject "server-identity" val
+constructTlsClientConnectionServerIdentity val = constructObjectPropertyObject "server-identity" (Just val)
 
 data TlsClientConnectionServerIdentityPropertyInfo
 instance AttrInfo TlsClientConnectionServerIdentityPropertyInfo where
@@ -221,10 +228,12 @@
     attrGet _ = getTlsClientConnectionServerIdentity
     attrSet _ = setTlsClientConnectionServerIdentity
     attrConstruct _ = constructTlsClientConnectionServerIdentity
+    attrClear _ = undefined
 
 -- VVV Prop "use-ssl3"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsClientConnectionUseSsl3 :: (MonadIO m, TlsClientConnectionK o) => o -> m Bool
 getTlsClientConnectionUseSsl3 obj = liftIO $ getObjectPropertyBool obj "use-ssl3"
@@ -245,10 +254,12 @@
     attrGet _ = getTlsClientConnectionUseSsl3
     attrSet _ = setTlsClientConnectionUseSsl3
     attrConstruct _ = constructTlsClientConnectionUseSsl3
+    attrClear _ = undefined
 
 -- VVV Prop "validation-flags"
    -- Type: TInterface "Gio" "TlsCertificateFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsClientConnectionValidationFlags :: (MonadIO m, TlsClientConnectionK o) => o -> m [TlsCertificateFlags]
 getTlsClientConnectionValidationFlags obj = liftIO $ getObjectPropertyFlags obj "validation-flags"
@@ -269,10 +280,23 @@
     attrGet _ = getTlsClientConnectionValidationFlags
     attrSet _ = setTlsClientConnectionValidationFlags
     attrConstruct _ = constructTlsClientConnectionValidationFlags
+    attrClear _ = undefined
 
 type instance AttributeList TlsClientConnection = TlsClientConnectionAttributeList
 type TlsClientConnectionAttributeList = ('[ '("acceptedCas", TlsClientConnectionAcceptedCasPropertyInfo), '("baseIoStream", TlsConnectionBaseIoStreamPropertyInfo), '("certificate", TlsConnectionCertificatePropertyInfo), '("closed", IOStreamClosedPropertyInfo), '("database", TlsConnectionDatabasePropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("interaction", TlsConnectionInteractionPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("peerCertificate", TlsConnectionPeerCertificatePropertyInfo), '("peerCertificateErrors", TlsConnectionPeerCertificateErrorsPropertyInfo), '("rehandshakeMode", TlsConnectionRehandshakeModePropertyInfo), '("requireCloseNotify", TlsConnectionRequireCloseNotifyPropertyInfo), '("serverIdentity", TlsClientConnectionServerIdentityPropertyInfo), '("useSsl3", TlsClientConnectionUseSsl3PropertyInfo), '("useSystemCertdb", TlsConnectionUseSystemCertdbPropertyInfo), '("validationFlags", TlsClientConnectionValidationFlagsPropertyInfo)] :: [(Symbol, *)])
 
+tlsClientConnectionAcceptedCas :: AttrLabelProxy "acceptedCas"
+tlsClientConnectionAcceptedCas = AttrLabelProxy
+
+tlsClientConnectionServerIdentity :: AttrLabelProxy "serverIdentity"
+tlsClientConnectionServerIdentity = AttrLabelProxy
+
+tlsClientConnectionUseSsl3 :: AttrLabelProxy "useSsl3"
+tlsClientConnectionUseSsl3 = AttrLabelProxy
+
+tlsClientConnectionValidationFlags :: AttrLabelProxy "validationFlags"
+tlsClientConnectionValidationFlags = AttrLabelProxy
+
 type instance SignalList TlsClientConnection = TlsClientConnectionSignalList
 type TlsClientConnectionSignalList = ('[ '("acceptCertificate", TlsConnectionAcceptCertificateSignalInfo), '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -297,7 +321,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -328,7 +352,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList TByteArray
+-- returnType : Just (TGList TByteArray)
 -- throws : False
 -- Skip return : False
 
@@ -344,7 +368,6 @@
 tlsClientConnectionGetAcceptedCas _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_tls_client_connection_get_accepted_cas _obj'
-    checkUnexpectedReturnNULL "g_tls_client_connection_get_accepted_cas" result
     result' <- unpackGList result
     result'' <- mapM unpackGByteArray result'
     mapGList unrefGByteArray result
@@ -360,7 +383,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnectable"
+-- returnType : Just (TInterface "Gio" "SocketConnectable")
 -- throws : False
 -- Skip return : False
 
@@ -389,7 +412,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -417,7 +440,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : False
 -- Skip return : False
 
@@ -445,7 +468,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -476,7 +499,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "use_ssl3", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -506,7 +529,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsClientConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -536,7 +559,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "base_io_stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "server_identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsClientConnection"
+-- returnType : Just (TInterface "Gio" "TlsClientConnection")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/TlsClientConnection.hs-boot b/GI/Gio/Interfaces/TlsClientConnection.hs-boot
--- a/GI/Gio/Interfaces/TlsClientConnection.hs-boot
+++ b/GI/Gio/Interfaces/TlsClientConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.TlsClientConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/TlsFileDatabase.hs b/GI/Gio/Interfaces/TlsFileDatabase.hs
--- a/GI/Gio/Interfaces/TlsFileDatabase.hs
+++ b/GI/Gio/Interfaces/TlsFileDatabase.hs
@@ -26,18 +26,20 @@
  -- * Properties
 -- ** Anchors
     TlsFileDatabaseAnchorsPropertyInfo      ,
+    clearTlsFileDatabaseAnchors             ,
     constructTlsFileDatabaseAnchors         ,
     getTlsFileDatabaseAnchors               ,
     setTlsFileDatabaseAnchors               ,
+    tlsFileDatabaseAnchors                  ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -101,30 +103,38 @@
 -- VVV Prop "anchors"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getTlsFileDatabaseAnchors :: (MonadIO m, TlsFileDatabaseK o) => o -> m T.Text
+getTlsFileDatabaseAnchors :: (MonadIO m, TlsFileDatabaseK o) => o -> m (Maybe T.Text)
 getTlsFileDatabaseAnchors obj = liftIO $ getObjectPropertyString obj "anchors"
 
 setTlsFileDatabaseAnchors :: (MonadIO m, TlsFileDatabaseK o) => o -> T.Text -> m ()
-setTlsFileDatabaseAnchors obj val = liftIO $ setObjectPropertyString obj "anchors" val
+setTlsFileDatabaseAnchors obj val = liftIO $ setObjectPropertyString obj "anchors" (Just val)
 
 constructTlsFileDatabaseAnchors :: T.Text -> IO ([Char], GValue)
-constructTlsFileDatabaseAnchors val = constructObjectPropertyString "anchors" val
+constructTlsFileDatabaseAnchors val = constructObjectPropertyString "anchors" (Just val)
 
+clearTlsFileDatabaseAnchors :: (MonadIO m, TlsFileDatabaseK o) => o -> m ()
+clearTlsFileDatabaseAnchors obj = liftIO $ setObjectPropertyString obj "anchors" (Nothing :: Maybe T.Text)
+
 data TlsFileDatabaseAnchorsPropertyInfo
 instance AttrInfo TlsFileDatabaseAnchorsPropertyInfo where
-    type AttrAllowedOps TlsFileDatabaseAnchorsPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsFileDatabaseAnchorsPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsFileDatabaseAnchorsPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint TlsFileDatabaseAnchorsPropertyInfo = TlsFileDatabaseK
-    type AttrGetType TlsFileDatabaseAnchorsPropertyInfo = T.Text
+    type AttrGetType TlsFileDatabaseAnchorsPropertyInfo = (Maybe T.Text)
     type AttrLabel TlsFileDatabaseAnchorsPropertyInfo = "anchors"
     attrGet _ = getTlsFileDatabaseAnchors
     attrSet _ = setTlsFileDatabaseAnchors
     attrConstruct _ = constructTlsFileDatabaseAnchors
+    attrClear _ = clearTlsFileDatabaseAnchors
 
 type instance AttributeList TlsFileDatabase = TlsFileDatabaseAttributeList
 type TlsFileDatabaseAttributeList = ('[ '("anchors", TlsFileDatabaseAnchorsPropertyInfo)] :: [(Symbol, *)])
 
+tlsFileDatabaseAnchors :: AttrLabelProxy "anchors"
+tlsFileDatabaseAnchors = AttrLabelProxy
+
 type instance SignalList TlsFileDatabase = TlsFileDatabaseSignalList
 type TlsFileDatabaseSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -149,7 +159,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "anchors", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsFileDatabase"
+-- returnType : Just (TInterface "Gio" "TlsFileDatabase")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/TlsFileDatabase.hs-boot b/GI/Gio/Interfaces/TlsFileDatabase.hs-boot
--- a/GI/Gio/Interfaces/TlsFileDatabase.hs-boot
+++ b/GI/Gio/Interfaces/TlsFileDatabase.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.TlsFileDatabase where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/TlsServerConnection.hs b/GI/Gio/Interfaces/TlsServerConnection.hs
--- a/GI/Gio/Interfaces/TlsServerConnection.hs
+++ b/GI/Gio/Interfaces/TlsServerConnection.hs
@@ -29,15 +29,16 @@
     constructTlsServerConnectionAuthenticationMode,
     getTlsServerConnectionAuthenticationMode,
     setTlsServerConnectionAuthenticationMode,
+    tlsServerConnectionAuthenticationMode   ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -116,6 +117,7 @@
 -- VVV Prop "authentication-mode"
    -- Type: TInterface "Gio" "TlsAuthenticationMode"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
 getTlsServerConnectionAuthenticationMode :: (MonadIO m, TlsServerConnectionK o) => o -> m TlsAuthenticationMode
 getTlsServerConnectionAuthenticationMode obj = liftIO $ getObjectPropertyEnum obj "authentication-mode"
@@ -136,10 +138,14 @@
     attrGet _ = getTlsServerConnectionAuthenticationMode
     attrSet _ = setTlsServerConnectionAuthenticationMode
     attrConstruct _ = constructTlsServerConnectionAuthenticationMode
+    attrClear _ = undefined
 
 type instance AttributeList TlsServerConnection = TlsServerConnectionAttributeList
 type TlsServerConnectionAttributeList = ('[ '("authenticationMode", TlsServerConnectionAuthenticationModePropertyInfo), '("baseIoStream", TlsConnectionBaseIoStreamPropertyInfo), '("certificate", TlsConnectionCertificatePropertyInfo), '("closed", IOStreamClosedPropertyInfo), '("database", TlsConnectionDatabasePropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("interaction", TlsConnectionInteractionPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("peerCertificate", TlsConnectionPeerCertificatePropertyInfo), '("peerCertificateErrors", TlsConnectionPeerCertificateErrorsPropertyInfo), '("rehandshakeMode", TlsConnectionRehandshakeModePropertyInfo), '("requireCloseNotify", TlsConnectionRequireCloseNotifyPropertyInfo), '("useSystemCertdb", TlsConnectionUseSystemCertdbPropertyInfo)] :: [(Symbol, *)])
 
+tlsServerConnectionAuthenticationMode :: AttrLabelProxy "authenticationMode"
+tlsServerConnectionAuthenticationMode = AttrLabelProxy
+
 type instance SignalList TlsServerConnection = TlsServerConnectionSignalList
 type TlsServerConnectionSignalList = ('[ '("acceptCertificate", TlsConnectionAcceptCertificateSignalInfo), '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -164,7 +170,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "base_io_stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsServerConnection"
+-- returnType : Just (TInterface "Gio" "TlsServerConnection")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/TlsServerConnection.hs-boot b/GI/Gio/Interfaces/TlsServerConnection.hs-boot
--- a/GI/Gio/Interfaces/TlsServerConnection.hs-boot
+++ b/GI/Gio/Interfaces/TlsServerConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.TlsServerConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Interfaces/Volume.hs b/GI/Gio/Interfaces/Volume.hs
--- a/GI/Gio/Interfaces/Volume.hs
+++ b/GI/Gio/Interfaces/Volume.hs
@@ -143,9 +143,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -325,7 +325,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -353,7 +353,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -379,9 +379,9 @@
 
 -- method Volume::eject
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -390,7 +390,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "MountUnmountFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED volumeEject ["(Since version 2.22)","Use g_volume_eject_with_operation() instead."]#-}
@@ -430,7 +430,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -464,9 +464,9 @@
 
 -- method Volume::eject_with_operation
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountUnmountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -476,7 +476,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -523,7 +523,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -559,7 +559,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -590,7 +590,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -602,24 +602,25 @@
 volumeGetActivationRoot ::
     (MonadIO m, VolumeK a) =>
     a                                       -- _obj
-    -> m File                               -- result
+    -> m (Maybe File)                       -- result
 volumeGetActivationRoot _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_volume_get_activation_root _obj'
-    checkUnexpectedReturnNULL "g_volume_get_activation_root" result
-    result' <- (wrapObject File) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (wrapObject File) result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data VolumeGetActivationRootMethodInfo
-instance (signature ~ (m File), MonadIO m, VolumeK a) => MethodInfo VolumeGetActivationRootMethodInfo a signature where
+instance (signature ~ (m (Maybe File)), MonadIO m, VolumeK a) => MethodInfo VolumeGetActivationRootMethodInfo a signature where
     overloadedMethod _ = volumeGetActivationRoot
 
 -- method Volume::get_drive
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Drive"
+-- returnType : Just (TInterface "Gio" "Drive")
 -- throws : False
 -- Skip return : False
 
@@ -648,7 +649,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -677,7 +678,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "kind", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -711,7 +712,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Mount"
+-- returnType : Just (TInterface "Gio" "Mount")
 -- throws : False
 -- Skip return : False
 
@@ -740,7 +741,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -770,7 +771,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -799,7 +800,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -828,7 +829,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -856,9 +857,9 @@
 
 -- method Volume::mount
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "MountMountFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount_operation", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -868,7 +869,7 @@
     Ptr MountOperation ->                   -- mount_operation : TInterface "Gio" "MountOperation"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -915,7 +916,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -951,7 +952,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Volume", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Interfaces/Volume.hs-boot b/GI/Gio/Interfaces/Volume.hs-boot
--- a/GI/Gio/Interfaces/Volume.hs-boot
+++ b/GI/Gio/Interfaces/Volume.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Interfaces.Volume where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects.hs b/GI/Gio/Objects.hs
--- a/GI/Gio/Objects.hs
+++ b/GI/Gio/Objects.hs
@@ -220,9 +220,9 @@
 import GI.Gio.Objects.ZlibCompressor
 import GI.Gio.Objects.ZlibDecompressor
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/AppInfoMonitor.hs b/GI/Gio/Objects/AppInfoMonitor.hs
--- a/GI/Gio/Objects/AppInfoMonitor.hs
+++ b/GI/Gio/Objects/AppInfoMonitor.hs
@@ -40,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -158,7 +158,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "AppInfoMonitor"
+-- returnType : Just (TInterface "Gio" "AppInfoMonitor")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/AppInfoMonitor.hs-boot b/GI/Gio/Objects/AppInfoMonitor.hs-boot
--- a/GI/Gio/Objects/AppInfoMonitor.hs-boot
+++ b/GI/Gio/Objects/AppInfoMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.AppInfoMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/AppLaunchContext.hs b/GI/Gio/Objects/AppLaunchContext.hs
--- a/GI/Gio/Objects/AppLaunchContext.hs
+++ b/GI/Gio/Objects/AppLaunchContext.hs
@@ -82,9 +82,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -261,7 +261,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "AppLaunchContext"
+-- returnType : Just (TInterface "Gio" "AppLaunchContext")
 -- throws : False
 -- Skip return : False
 
@@ -282,7 +282,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "files", argType = TGList (TInterface "Gio" "File"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -322,7 +322,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -353,7 +353,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "AppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "files", argType = TGList (TInterface "Gio" "File"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -393,7 +393,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "startup_notify_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -424,7 +424,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "variable", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -459,7 +459,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "variable", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/AppLaunchContext.hs-boot b/GI/Gio/Objects/AppLaunchContext.hs-boot
--- a/GI/Gio/Objects/AppLaunchContext.hs-boot
+++ b/GI/Gio/Objects/AppLaunchContext.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.AppLaunchContext where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Application.hs b/GI/Gio/Objects/Application.hs
--- a/GI/Gio/Objects/Application.hs
+++ b/GI/Gio/Objects/Application.hs
@@ -189,12 +189,16 @@
  -- * Properties
 -- ** ActionGroup
     ApplicationActionGroupPropertyInfo      ,
+    applicationActionGroup                  ,
+    clearApplicationActionGroup             ,
     constructApplicationActionGroup         ,
     setApplicationActionGroup               ,
 
 
 -- ** ApplicationId
     ApplicationApplicationIdPropertyInfo    ,
+    applicationApplicationId                ,
+    clearApplicationApplicationId           ,
     constructApplicationApplicationId       ,
     getApplicationApplicationId             ,
     setApplicationApplicationId             ,
@@ -202,6 +206,7 @@
 
 -- ** Flags
     ApplicationFlagsPropertyInfo            ,
+    applicationFlags                        ,
     constructApplicationFlags               ,
     getApplicationFlags                     ,
     setApplicationFlags                     ,
@@ -209,6 +214,7 @@
 
 -- ** InactivityTimeout
     ApplicationInactivityTimeoutPropertyInfo,
+    applicationInactivityTimeout            ,
     constructApplicationInactivityTimeout   ,
     getApplicationInactivityTimeout         ,
     setApplicationInactivityTimeout         ,
@@ -216,21 +222,26 @@
 
 -- ** IsBusy
     ApplicationIsBusyPropertyInfo           ,
+    applicationIsBusy                       ,
     getApplicationIsBusy                    ,
 
 
 -- ** IsRegistered
     ApplicationIsRegisteredPropertyInfo     ,
+    applicationIsRegistered                 ,
     getApplicationIsRegistered              ,
 
 
 -- ** IsRemote
     ApplicationIsRemotePropertyInfo         ,
+    applicationIsRemote                     ,
     getApplicationIsRemote                  ,
 
 
 -- ** ResourceBasePath
     ApplicationResourceBasePathPropertyInfo ,
+    applicationResourceBasePath             ,
+    clearApplicationResourceBasePath        ,
     constructApplicationResourceBasePath    ,
     getApplicationResourceBasePath          ,
     setApplicationResourceBasePath          ,
@@ -315,9 +326,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -682,16 +693,20 @@
 -- VVV Prop "action-group"
    -- Type: TInterface "Gio" "ActionGroup"
    -- Flags: [PropertyWritable]
+   -- Nullable: (Nothing,Just True)
 
 setApplicationActionGroup :: (MonadIO m, ApplicationK o, ActionGroupK a) => o -> a -> m ()
-setApplicationActionGroup obj val = liftIO $ setObjectPropertyObject obj "action-group" val
+setApplicationActionGroup obj val = liftIO $ setObjectPropertyObject obj "action-group" (Just val)
 
 constructApplicationActionGroup :: (ActionGroupK a) => a -> IO ([Char], GValue)
-constructApplicationActionGroup val = constructObjectPropertyObject "action-group" val
+constructApplicationActionGroup val = constructObjectPropertyObject "action-group" (Just val)
 
+clearApplicationActionGroup :: (MonadIO m, ApplicationK o) => o -> m ()
+clearApplicationActionGroup obj = liftIO $ setObjectPropertyObject obj "action-group" (Nothing :: Maybe ActionGroup)
+
 data ApplicationActionGroupPropertyInfo
 instance AttrInfo ApplicationActionGroupPropertyInfo where
-    type AttrAllowedOps ApplicationActionGroupPropertyInfo = '[ 'AttrSet, 'AttrConstruct]
+    type AttrAllowedOps ApplicationActionGroupPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint ApplicationActionGroupPropertyInfo = ActionGroupK
     type AttrBaseTypeConstraint ApplicationActionGroupPropertyInfo = ApplicationK
     type AttrGetType ApplicationActionGroupPropertyInfo = ()
@@ -699,23 +714,28 @@
     attrGet _ = undefined
     attrSet _ = setApplicationActionGroup
     attrConstruct _ = constructApplicationActionGroup
+    attrClear _ = clearApplicationActionGroup
 
 -- VVV Prop "application-id"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just True)
 
 getApplicationApplicationId :: (MonadIO m, ApplicationK o) => o -> m T.Text
-getApplicationApplicationId obj = liftIO $ getObjectPropertyString obj "application-id"
+getApplicationApplicationId obj = liftIO $ checkUnexpectedNothing "getApplicationApplicationId" $ getObjectPropertyString obj "application-id"
 
 setApplicationApplicationId :: (MonadIO m, ApplicationK o) => o -> T.Text -> m ()
-setApplicationApplicationId obj val = liftIO $ setObjectPropertyString obj "application-id" val
+setApplicationApplicationId obj val = liftIO $ setObjectPropertyString obj "application-id" (Just val)
 
 constructApplicationApplicationId :: T.Text -> IO ([Char], GValue)
-constructApplicationApplicationId val = constructObjectPropertyString "application-id" val
+constructApplicationApplicationId val = constructObjectPropertyString "application-id" (Just val)
 
+clearApplicationApplicationId :: (MonadIO m, ApplicationK o) => o -> m ()
+clearApplicationApplicationId obj = liftIO $ setObjectPropertyString obj "application-id" (Nothing :: Maybe T.Text)
+
 data ApplicationApplicationIdPropertyInfo
 instance AttrInfo ApplicationApplicationIdPropertyInfo where
-    type AttrAllowedOps ApplicationApplicationIdPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ApplicationApplicationIdPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ApplicationApplicationIdPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ApplicationApplicationIdPropertyInfo = ApplicationK
     type AttrGetType ApplicationApplicationIdPropertyInfo = T.Text
@@ -723,10 +743,12 @@
     attrGet _ = getApplicationApplicationId
     attrSet _ = setApplicationApplicationId
     attrConstruct _ = constructApplicationApplicationId
+    attrClear _ = clearApplicationApplicationId
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "ApplicationFlags"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getApplicationFlags :: (MonadIO m, ApplicationK o) => o -> m [ApplicationFlags]
 getApplicationFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -747,19 +769,21 @@
     attrGet _ = getApplicationFlags
     attrSet _ = setApplicationFlags
     attrConstruct _ = constructApplicationFlags
+    attrClear _ = undefined
 
 -- VVV Prop "inactivity-timeout"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getApplicationInactivityTimeout :: (MonadIO m, ApplicationK o) => o -> m Word32
-getApplicationInactivityTimeout obj = liftIO $ getObjectPropertyCUInt obj "inactivity-timeout"
+getApplicationInactivityTimeout obj = liftIO $ getObjectPropertyUInt32 obj "inactivity-timeout"
 
 setApplicationInactivityTimeout :: (MonadIO m, ApplicationK o) => o -> Word32 -> m ()
-setApplicationInactivityTimeout obj val = liftIO $ setObjectPropertyCUInt obj "inactivity-timeout" val
+setApplicationInactivityTimeout obj val = liftIO $ setObjectPropertyUInt32 obj "inactivity-timeout" val
 
 constructApplicationInactivityTimeout :: Word32 -> IO ([Char], GValue)
-constructApplicationInactivityTimeout val = constructObjectPropertyCUInt "inactivity-timeout" val
+constructApplicationInactivityTimeout val = constructObjectPropertyUInt32 "inactivity-timeout" val
 
 data ApplicationInactivityTimeoutPropertyInfo
 instance AttrInfo ApplicationInactivityTimeoutPropertyInfo where
@@ -771,10 +795,12 @@
     attrGet _ = getApplicationInactivityTimeout
     attrSet _ = setApplicationInactivityTimeout
     attrConstruct _ = constructApplicationInactivityTimeout
+    attrClear _ = undefined
 
 -- VVV Prop "is-busy"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getApplicationIsBusy :: (MonadIO m, ApplicationK o) => o -> m Bool
 getApplicationIsBusy obj = liftIO $ getObjectPropertyBool obj "is-busy"
@@ -789,10 +815,12 @@
     attrGet _ = getApplicationIsBusy
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-registered"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getApplicationIsRegistered :: (MonadIO m, ApplicationK o) => o -> m Bool
 getApplicationIsRegistered obj = liftIO $ getObjectPropertyBool obj "is-registered"
@@ -807,10 +835,12 @@
     attrGet _ = getApplicationIsRegistered
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-remote"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getApplicationIsRemote :: (MonadIO m, ApplicationK o) => o -> m Bool
 getApplicationIsRemote obj = liftIO $ getObjectPropertyBool obj "is-remote"
@@ -825,34 +855,64 @@
     attrGet _ = getApplicationIsRemote
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "resource-base-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just True,Just True)
 
-getApplicationResourceBasePath :: (MonadIO m, ApplicationK o) => o -> m T.Text
+getApplicationResourceBasePath :: (MonadIO m, ApplicationK o) => o -> m (Maybe T.Text)
 getApplicationResourceBasePath obj = liftIO $ getObjectPropertyString obj "resource-base-path"
 
 setApplicationResourceBasePath :: (MonadIO m, ApplicationK o) => o -> T.Text -> m ()
-setApplicationResourceBasePath obj val = liftIO $ setObjectPropertyString obj "resource-base-path" val
+setApplicationResourceBasePath obj val = liftIO $ setObjectPropertyString obj "resource-base-path" (Just val)
 
 constructApplicationResourceBasePath :: T.Text -> IO ([Char], GValue)
-constructApplicationResourceBasePath val = constructObjectPropertyString "resource-base-path" val
+constructApplicationResourceBasePath val = constructObjectPropertyString "resource-base-path" (Just val)
 
+clearApplicationResourceBasePath :: (MonadIO m, ApplicationK o) => o -> m ()
+clearApplicationResourceBasePath obj = liftIO $ setObjectPropertyString obj "resource-base-path" (Nothing :: Maybe T.Text)
+
 data ApplicationResourceBasePathPropertyInfo
 instance AttrInfo ApplicationResourceBasePathPropertyInfo where
-    type AttrAllowedOps ApplicationResourceBasePathPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ApplicationResourceBasePathPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ApplicationResourceBasePathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ApplicationResourceBasePathPropertyInfo = ApplicationK
-    type AttrGetType ApplicationResourceBasePathPropertyInfo = T.Text
+    type AttrGetType ApplicationResourceBasePathPropertyInfo = (Maybe T.Text)
     type AttrLabel ApplicationResourceBasePathPropertyInfo = "resource-base-path"
     attrGet _ = getApplicationResourceBasePath
     attrSet _ = setApplicationResourceBasePath
     attrConstruct _ = constructApplicationResourceBasePath
+    attrClear _ = clearApplicationResourceBasePath
 
 type instance AttributeList Application = ApplicationAttributeList
 type ApplicationAttributeList = ('[ '("actionGroup", ApplicationActionGroupPropertyInfo), '("applicationId", ApplicationApplicationIdPropertyInfo), '("flags", ApplicationFlagsPropertyInfo), '("inactivityTimeout", ApplicationInactivityTimeoutPropertyInfo), '("isBusy", ApplicationIsBusyPropertyInfo), '("isRegistered", ApplicationIsRegisteredPropertyInfo), '("isRemote", ApplicationIsRemotePropertyInfo), '("resourceBasePath", ApplicationResourceBasePathPropertyInfo)] :: [(Symbol, *)])
 
+applicationActionGroup :: AttrLabelProxy "actionGroup"
+applicationActionGroup = AttrLabelProxy
+
+applicationApplicationId :: AttrLabelProxy "applicationId"
+applicationApplicationId = AttrLabelProxy
+
+applicationFlags :: AttrLabelProxy "flags"
+applicationFlags = AttrLabelProxy
+
+applicationInactivityTimeout :: AttrLabelProxy "inactivityTimeout"
+applicationInactivityTimeout = AttrLabelProxy
+
+applicationIsBusy :: AttrLabelProxy "isBusy"
+applicationIsBusy = AttrLabelProxy
+
+applicationIsRegistered :: AttrLabelProxy "isRegistered"
+applicationIsRegistered = AttrLabelProxy
+
+applicationIsRemote :: AttrLabelProxy "isRemote"
+applicationIsRemote = AttrLabelProxy
+
+applicationResourceBasePath :: AttrLabelProxy "resourceBasePath"
+applicationResourceBasePath = AttrLabelProxy
+
 data ApplicationActivateSignalInfo
 instance SignalInfo ApplicationActivateSignalInfo where
     type HaskellCallbackType ApplicationActivateSignalInfo = ApplicationActivateCallback
@@ -890,7 +950,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "application_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "ApplicationFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Application"
+-- returnType : Just (TInterface "Gio" "Application")
 -- throws : False
 -- Skip return : False
 
@@ -922,7 +982,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -949,7 +1009,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "long_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "short_name", argType = TBasicType TInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "GLib" "OptionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "arg", argType = TInterface "GLib" "OptionArg", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "description", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "arg_description", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1000,7 +1060,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "entries", argType = TCArray True (-1) (-1) (TInterface "GLib" "OptionEntry"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1033,7 +1093,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "group", argType = TInterface "GLib" "OptionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1064,7 +1124,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1099,7 +1159,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1128,7 +1188,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -1157,7 +1217,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1186,7 +1246,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ApplicationFlags"
+-- returnType : Just (TInterface "Gio" "ApplicationFlags")
 -- throws : False
 -- Skip return : False
 
@@ -1214,7 +1274,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1241,7 +1301,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1269,7 +1329,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1297,7 +1357,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1325,7 +1385,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1337,24 +1397,25 @@
 applicationGetResourceBasePath ::
     (MonadIO m, ApplicationK a) =>
     a                                       -- _obj
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 applicationGetResourceBasePath _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_application_get_resource_base_path _obj'
-    checkUnexpectedReturnNULL "g_application_get_resource_base_path" result
-    result' <- cstringToText result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data ApplicationGetResourceBasePathMethodInfo
-instance (signature ~ (m T.Text), MonadIO m, ApplicationK a) => MethodInfo ApplicationGetResourceBasePathMethodInfo a signature where
+instance (signature ~ (m (Maybe T.Text)), MonadIO m, ApplicationK a) => MethodInfo ApplicationGetResourceBasePathMethodInfo a signature where
     overloadedMethod _ = applicationGetResourceBasePath
 
 -- method Application::hold
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1381,7 +1442,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1406,16 +1467,16 @@
 
 -- method Application::open
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "files", argType = TCArray False (-1) 2 (TInterface "Gio" "File"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_files", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hint", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_files", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "files", argType = TCArray False (-1) 2 (TInterface "Gio" "File"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_files", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hint", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_files", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_application_open" g_application_open :: 
     Ptr Application ->                      -- _obj : TInterface "Gio" "Application"
     Ptr (Ptr File) ->                       -- files : TCArray False (-1) 2 (TInterface "Gio" "File")
-    Int32 ->                                -- n_files : TBasicType TInt32
+    Int32 ->                                -- n_files : TBasicType TInt
     CString ->                              -- hint : TBasicType TUTF8
     IO ()
 
@@ -1447,7 +1508,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1474,7 +1535,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1514,7 +1575,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1539,15 +1600,15 @@
 
 -- method Application::run
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argc", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argv", argType = TCArray False (-1) 1 (TBasicType TUTF8), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "argc", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt32
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argc", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argv", argType = TCArray False (-1) 1 (TBasicType TUTF8), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "argc", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_application_run" g_application_run :: 
     Ptr Application ->                      -- _obj : TInterface "Gio" "Application"
-    Int32 ->                                -- argc : TBasicType TInt32
+    Int32 ->                                -- argc : TBasicType TInt
     Ptr CString ->                          -- argv : TCArray False (-1) 1 (TBasicType TUTF8)
     IO Int32
 
@@ -1581,7 +1642,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notification", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1620,7 +1681,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_group", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1655,7 +1716,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "application_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1690,7 +1751,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1717,7 +1778,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "ApplicationFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1745,15 +1806,15 @@
 
 -- method Application::set_inactivity_timeout
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inactivity_timeout", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inactivity_timeout", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_application_set_inactivity_timeout" g_application_set_inactivity_timeout :: 
     Ptr Application ->                      -- _obj : TInterface "Gio" "Application"
-    Word32 ->                               -- inactivity_timeout : TBasicType TUInt32
+    Word32 ->                               -- inactivity_timeout : TBasicType TUInt
     IO ()
 
 
@@ -1776,7 +1837,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "resource_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1811,7 +1872,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1846,7 +1907,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1873,7 +1934,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Application", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1904,7 +1965,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Application"
+-- returnType : Just (TInterface "Gio" "Application")
 -- throws : False
 -- Skip return : False
 
@@ -1925,7 +1986,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "application_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Application.hs-boot b/GI/Gio/Objects/Application.hs-boot
--- a/GI/Gio/Objects/Application.hs-boot
+++ b/GI/Gio/Objects/Application.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Application where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ApplicationCommandLine.hs b/GI/Gio/Objects/ApplicationCommandLine.hs
--- a/GI/Gio/Objects/ApplicationCommandLine.hs
+++ b/GI/Gio/Objects/ApplicationCommandLine.hs
@@ -77,21 +77,25 @@
  -- * Properties
 -- ** Arguments
     ApplicationCommandLineArgumentsPropertyInfo,
+    applicationCommandLineArguments         ,
     constructApplicationCommandLineArguments,
 
 
 -- ** IsRemote
     ApplicationCommandLineIsRemotePropertyInfo,
+    applicationCommandLineIsRemote          ,
     getApplicationCommandLineIsRemote       ,
 
 
 -- ** Options
     ApplicationCommandLineOptionsPropertyInfo,
+    applicationCommandLineOptions           ,
     constructApplicationCommandLineOptions  ,
 
 
 -- ** PlatformData
     ApplicationCommandLinePlatformDataPropertyInfo,
+    applicationCommandLinePlatformData      ,
     constructApplicationCommandLinePlatformData,
 
 
@@ -99,9 +103,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -179,13 +183,14 @@
 -- VVV Prop "arguments"
    -- Type: TVariant
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructApplicationCommandLineArguments :: GVariant -> IO ([Char], GValue)
-constructApplicationCommandLineArguments val = constructObjectPropertyVariant "arguments" val
+constructApplicationCommandLineArguments val = constructObjectPropertyVariant "arguments" (Just val)
 
 data ApplicationCommandLineArgumentsPropertyInfo
 instance AttrInfo ApplicationCommandLineArgumentsPropertyInfo where
-    type AttrAllowedOps ApplicationCommandLineArgumentsPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps ApplicationCommandLineArgumentsPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint ApplicationCommandLineArgumentsPropertyInfo = (~) GVariant
     type AttrBaseTypeConstraint ApplicationCommandLineArgumentsPropertyInfo = ApplicationCommandLineK
     type AttrGetType ApplicationCommandLineArgumentsPropertyInfo = ()
@@ -193,10 +198,12 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructApplicationCommandLineArguments
+    attrClear _ = undefined
 
 -- VVV Prop "is-remote"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getApplicationCommandLineIsRemote :: (MonadIO m, ApplicationCommandLineK o) => o -> m Bool
 getApplicationCommandLineIsRemote obj = liftIO $ getObjectPropertyBool obj "is-remote"
@@ -211,17 +218,19 @@
     attrGet _ = getApplicationCommandLineIsRemote
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "options"
    -- Type: TVariant
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructApplicationCommandLineOptions :: GVariant -> IO ([Char], GValue)
-constructApplicationCommandLineOptions val = constructObjectPropertyVariant "options" val
+constructApplicationCommandLineOptions val = constructObjectPropertyVariant "options" (Just val)
 
 data ApplicationCommandLineOptionsPropertyInfo
 instance AttrInfo ApplicationCommandLineOptionsPropertyInfo where
-    type AttrAllowedOps ApplicationCommandLineOptionsPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps ApplicationCommandLineOptionsPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint ApplicationCommandLineOptionsPropertyInfo = (~) GVariant
     type AttrBaseTypeConstraint ApplicationCommandLineOptionsPropertyInfo = ApplicationCommandLineK
     type AttrGetType ApplicationCommandLineOptionsPropertyInfo = ()
@@ -229,17 +238,19 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructApplicationCommandLineOptions
+    attrClear _ = undefined
 
 -- VVV Prop "platform-data"
    -- Type: TVariant
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructApplicationCommandLinePlatformData :: GVariant -> IO ([Char], GValue)
-constructApplicationCommandLinePlatformData val = constructObjectPropertyVariant "platform-data" val
+constructApplicationCommandLinePlatformData val = constructObjectPropertyVariant "platform-data" (Just val)
 
 data ApplicationCommandLinePlatformDataPropertyInfo
 instance AttrInfo ApplicationCommandLinePlatformDataPropertyInfo where
-    type AttrAllowedOps ApplicationCommandLinePlatformDataPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps ApplicationCommandLinePlatformDataPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint ApplicationCommandLinePlatformDataPropertyInfo = (~) GVariant
     type AttrBaseTypeConstraint ApplicationCommandLinePlatformDataPropertyInfo = ApplicationCommandLineK
     type AttrGetType ApplicationCommandLinePlatformDataPropertyInfo = ()
@@ -247,10 +258,23 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructApplicationCommandLinePlatformData
+    attrClear _ = undefined
 
 type instance AttributeList ApplicationCommandLine = ApplicationCommandLineAttributeList
 type ApplicationCommandLineAttributeList = ('[ '("arguments", ApplicationCommandLineArgumentsPropertyInfo), '("isRemote", ApplicationCommandLineIsRemotePropertyInfo), '("options", ApplicationCommandLineOptionsPropertyInfo), '("platformData", ApplicationCommandLinePlatformDataPropertyInfo)] :: [(Symbol, *)])
 
+applicationCommandLineArguments :: AttrLabelProxy "arguments"
+applicationCommandLineArguments = AttrLabelProxy
+
+applicationCommandLineIsRemote :: AttrLabelProxy "isRemote"
+applicationCommandLineIsRemote = AttrLabelProxy
+
+applicationCommandLineOptions :: AttrLabelProxy "options"
+applicationCommandLineOptions = AttrLabelProxy
+
+applicationCommandLinePlatformData :: AttrLabelProxy "platformData"
+applicationCommandLinePlatformData = AttrLabelProxy
+
 type instance SignalList ApplicationCommandLine = ApplicationCommandLineSignalList
 type ApplicationCommandLineSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -258,7 +282,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "arg", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -289,15 +313,15 @@
 
 -- method ApplicationCommandLine::get_arguments
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argc", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- Lengths : [Arg {argCName = "argc", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TUTF8)
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argc", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Lengths : [Arg {argCName = "argc", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_application_command_line_get_arguments" g_application_command_line_get_arguments :: 
     Ptr ApplicationCommandLine ->           -- _obj : TInterface "Gio" "ApplicationCommandLine"
-    Ptr Int32 ->                            -- argc : TBasicType TInt32
+    Ptr Int32 ->                            -- argc : TBasicType TInt
     IO (Ptr CString)
 
 
@@ -326,7 +350,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -355,7 +379,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -384,7 +408,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -411,7 +435,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -439,7 +463,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantDict"
+-- returnType : Just (TInterface "GLib" "VariantDict")
 -- throws : False
 -- Skip return : False
 
@@ -468,7 +492,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -480,24 +504,25 @@
 applicationCommandLineGetPlatformData ::
     (MonadIO m, ApplicationCommandLineK a) =>
     a                                       -- _obj
-    -> m GVariant                           -- result
+    -> m (Maybe GVariant)                   -- result
 applicationCommandLineGetPlatformData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_application_command_line_get_platform_data _obj'
-    checkUnexpectedReturnNULL "g_application_command_line_get_platform_data" result
-    result' <- wrapGVariantPtr result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- wrapGVariantPtr result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data ApplicationCommandLineGetPlatformDataMethodInfo
-instance (signature ~ (m GVariant), MonadIO m, ApplicationCommandLineK a) => MethodInfo ApplicationCommandLineGetPlatformDataMethodInfo a signature where
+instance (signature ~ (m (Maybe GVariant)), MonadIO m, ApplicationCommandLineK a) => MethodInfo ApplicationCommandLineGetPlatformDataMethodInfo a signature where
     overloadedMethod _ = applicationCommandLineGetPlatformData
 
 -- method ApplicationCommandLine::get_stdin
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : False
 -- Skip return : False
 
@@ -526,7 +551,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -557,15 +582,15 @@
 
 -- method ApplicationCommandLine::set_exit_status
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "exit_status", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ApplicationCommandLine", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "exit_status", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_application_command_line_set_exit_status" g_application_command_line_set_exit_status :: 
     Ptr ApplicationCommandLine ->           -- _obj : TInterface "Gio" "ApplicationCommandLine"
-    Int32 ->                                -- exit_status : TBasicType TInt32
+    Int32 ->                                -- exit_status : TBasicType TInt
     IO ()
 
 
diff --git a/GI/Gio/Objects/ApplicationCommandLine.hs-boot b/GI/Gio/Objects/ApplicationCommandLine.hs-boot
--- a/GI/Gio/Objects/ApplicationCommandLine.hs-boot
+++ b/GI/Gio/Objects/ApplicationCommandLine.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ApplicationCommandLine where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/BufferedInputStream.hs b/GI/Gio/Objects/BufferedInputStream.hs
--- a/GI/Gio/Objects/BufferedInputStream.hs
+++ b/GI/Gio/Objects/BufferedInputStream.hs
@@ -75,6 +75,7 @@
  -- * Properties
 -- ** BufferSize
     BufferedInputStreamBufferSizePropertyInfo,
+    bufferedInputStreamBufferSize           ,
     constructBufferedInputStreamBufferSize  ,
     getBufferedInputStreamBufferSize        ,
     setBufferedInputStreamBufferSize        ,
@@ -84,9 +85,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -186,17 +187,18 @@
 #endif
 
 -- VVV Prop "buffer-size"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getBufferedInputStreamBufferSize :: (MonadIO m, BufferedInputStreamK o) => o -> m Word32
-getBufferedInputStreamBufferSize obj = liftIO $ getObjectPropertyCUInt obj "buffer-size"
+getBufferedInputStreamBufferSize obj = liftIO $ getObjectPropertyUInt32 obj "buffer-size"
 
 setBufferedInputStreamBufferSize :: (MonadIO m, BufferedInputStreamK o) => o -> Word32 -> m ()
-setBufferedInputStreamBufferSize obj val = liftIO $ setObjectPropertyCUInt obj "buffer-size" val
+setBufferedInputStreamBufferSize obj val = liftIO $ setObjectPropertyUInt32 obj "buffer-size" val
 
 constructBufferedInputStreamBufferSize :: Word32 -> IO ([Char], GValue)
-constructBufferedInputStreamBufferSize val = constructObjectPropertyCUInt "buffer-size" val
+constructBufferedInputStreamBufferSize val = constructObjectPropertyUInt32 "buffer-size" val
 
 data BufferedInputStreamBufferSizePropertyInfo
 instance AttrInfo BufferedInputStreamBufferSizePropertyInfo where
@@ -208,10 +210,14 @@
     attrGet _ = getBufferedInputStreamBufferSize
     attrSet _ = setBufferedInputStreamBufferSize
     attrConstruct _ = constructBufferedInputStreamBufferSize
+    attrClear _ = undefined
 
 type instance AttributeList BufferedInputStream = BufferedInputStreamAttributeList
 type BufferedInputStreamAttributeList = ('[ '("baseStream", FilterInputStreamBaseStreamPropertyInfo), '("bufferSize", BufferedInputStreamBufferSizePropertyInfo), '("closeBaseStream", FilterInputStreamCloseBaseStreamPropertyInfo)] :: [(Symbol, *)])
 
+bufferedInputStreamBufferSize :: AttrLabelProxy "bufferSize"
+bufferedInputStreamBufferSize = AttrLabelProxy
+
 type instance SignalList BufferedInputStream = BufferedInputStreamSignalList
 type BufferedInputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -219,7 +225,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "BufferedInputStream"
+-- returnType : Just (TInterface "Gio" "BufferedInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -244,7 +250,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "BufferedInputStream"
+-- returnType : Just (TInterface "Gio" "BufferedInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -271,7 +277,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -311,19 +317,19 @@
 
 -- method BufferedInputStream::fill_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_buffered_input_stream_fill_async" g_buffered_input_stream_fill_async :: 
     Ptr BufferedInputStream ->              -- _obj : TInterface "Gio" "BufferedInputStream"
     Int64 ->                                -- count : TBasicType TInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -363,7 +369,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -399,7 +405,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -426,7 +432,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -453,7 +459,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "offset", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -488,7 +494,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TUInt8)
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TUInt8))
 -- throws : False
 -- Skip return : False
 
@@ -521,7 +527,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
@@ -561,7 +567,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/BufferedInputStream.hs-boot b/GI/Gio/Objects/BufferedInputStream.hs-boot
--- a/GI/Gio/Objects/BufferedInputStream.hs-boot
+++ b/GI/Gio/Objects/BufferedInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.BufferedInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/BufferedOutputStream.hs b/GI/Gio/Objects/BufferedOutputStream.hs
--- a/GI/Gio/Objects/BufferedOutputStream.hs
+++ b/GI/Gio/Objects/BufferedOutputStream.hs
@@ -50,6 +50,7 @@
  -- * Properties
 -- ** AutoGrow
     BufferedOutputStreamAutoGrowPropertyInfo,
+    bufferedOutputStreamAutoGrow            ,
     constructBufferedOutputStreamAutoGrow   ,
     getBufferedOutputStreamAutoGrow         ,
     setBufferedOutputStreamAutoGrow         ,
@@ -57,6 +58,7 @@
 
 -- ** BufferSize
     BufferedOutputStreamBufferSizePropertyInfo,
+    bufferedOutputStreamBufferSize          ,
     constructBufferedOutputStreamBufferSize ,
     getBufferedOutputStreamBufferSize       ,
     setBufferedOutputStreamBufferSize       ,
@@ -66,9 +68,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -169,6 +171,7 @@
 -- VVV Prop "auto-grow"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getBufferedOutputStreamAutoGrow :: (MonadIO m, BufferedOutputStreamK o) => o -> m Bool
 getBufferedOutputStreamAutoGrow obj = liftIO $ getObjectPropertyBool obj "auto-grow"
@@ -189,19 +192,21 @@
     attrGet _ = getBufferedOutputStreamAutoGrow
     attrSet _ = setBufferedOutputStreamAutoGrow
     attrConstruct _ = constructBufferedOutputStreamAutoGrow
+    attrClear _ = undefined
 
 -- VVV Prop "buffer-size"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getBufferedOutputStreamBufferSize :: (MonadIO m, BufferedOutputStreamK o) => o -> m Word32
-getBufferedOutputStreamBufferSize obj = liftIO $ getObjectPropertyCUInt obj "buffer-size"
+getBufferedOutputStreamBufferSize obj = liftIO $ getObjectPropertyUInt32 obj "buffer-size"
 
 setBufferedOutputStreamBufferSize :: (MonadIO m, BufferedOutputStreamK o) => o -> Word32 -> m ()
-setBufferedOutputStreamBufferSize obj val = liftIO $ setObjectPropertyCUInt obj "buffer-size" val
+setBufferedOutputStreamBufferSize obj val = liftIO $ setObjectPropertyUInt32 obj "buffer-size" val
 
 constructBufferedOutputStreamBufferSize :: Word32 -> IO ([Char], GValue)
-constructBufferedOutputStreamBufferSize val = constructObjectPropertyCUInt "buffer-size" val
+constructBufferedOutputStreamBufferSize val = constructObjectPropertyUInt32 "buffer-size" val
 
 data BufferedOutputStreamBufferSizePropertyInfo
 instance AttrInfo BufferedOutputStreamBufferSizePropertyInfo where
@@ -213,10 +218,17 @@
     attrGet _ = getBufferedOutputStreamBufferSize
     attrSet _ = setBufferedOutputStreamBufferSize
     attrConstruct _ = constructBufferedOutputStreamBufferSize
+    attrClear _ = undefined
 
 type instance AttributeList BufferedOutputStream = BufferedOutputStreamAttributeList
 type BufferedOutputStreamAttributeList = ('[ '("autoGrow", BufferedOutputStreamAutoGrowPropertyInfo), '("baseStream", FilterOutputStreamBaseStreamPropertyInfo), '("bufferSize", BufferedOutputStreamBufferSizePropertyInfo), '("closeBaseStream", FilterOutputStreamCloseBaseStreamPropertyInfo)] :: [(Symbol, *)])
 
+bufferedOutputStreamAutoGrow :: AttrLabelProxy "autoGrow"
+bufferedOutputStreamAutoGrow = AttrLabelProxy
+
+bufferedOutputStreamBufferSize :: AttrLabelProxy "bufferSize"
+bufferedOutputStreamBufferSize = AttrLabelProxy
+
 type instance SignalList BufferedOutputStream = BufferedOutputStreamSignalList
 type BufferedOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -224,7 +236,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "BufferedOutputStream"
+-- returnType : Just (TInterface "Gio" "BufferedOutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -249,7 +261,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "BufferedOutputStream"
+-- returnType : Just (TInterface "Gio" "BufferedOutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -276,7 +288,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -304,7 +316,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -331,7 +343,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "auto_grow", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -361,7 +373,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BufferedOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/BufferedOutputStream.hs-boot b/GI/Gio/Objects/BufferedOutputStream.hs-boot
--- a/GI/Gio/Objects/BufferedOutputStream.hs-boot
+++ b/GI/Gio/Objects/BufferedOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.BufferedOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/BytesIcon.hs b/GI/Gio/Objects/BytesIcon.hs
--- a/GI/Gio/Objects/BytesIcon.hs
+++ b/GI/Gio/Objects/BytesIcon.hs
@@ -31,6 +31,7 @@
  -- * Properties
 -- ** Bytes
     BytesIconBytesPropertyInfo              ,
+    bytesIconBytes                          ,
     constructBytesIconBytes                 ,
     getBytesIconBytes                       ,
 
@@ -39,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -115,16 +116,17 @@
 -- VVV Prop "bytes"
    -- Type: TInterface "GLib" "Bytes"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getBytesIconBytes :: (MonadIO m, BytesIconK o) => o -> m GLib.Bytes
-getBytesIconBytes obj = liftIO $ getObjectPropertyBoxed obj "bytes" GLib.Bytes
+getBytesIconBytes obj = liftIO $ checkUnexpectedNothing "getBytesIconBytes" $ getObjectPropertyBoxed obj "bytes" GLib.Bytes
 
 constructBytesIconBytes :: GLib.Bytes -> IO ([Char], GValue)
-constructBytesIconBytes val = constructObjectPropertyBoxed "bytes" val
+constructBytesIconBytes val = constructObjectPropertyBoxed "bytes" (Just val)
 
 data BytesIconBytesPropertyInfo
 instance AttrInfo BytesIconBytesPropertyInfo where
-    type AttrAllowedOps BytesIconBytesPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps BytesIconBytesPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint BytesIconBytesPropertyInfo = (~) GLib.Bytes
     type AttrBaseTypeConstraint BytesIconBytesPropertyInfo = BytesIconK
     type AttrGetType BytesIconBytesPropertyInfo = GLib.Bytes
@@ -132,10 +134,14 @@
     attrGet _ = getBytesIconBytes
     attrSet _ = undefined
     attrConstruct _ = constructBytesIconBytes
+    attrClear _ = undefined
 
 type instance AttributeList BytesIcon = BytesIconAttributeList
 type BytesIconAttributeList = ('[ '("bytes", BytesIconBytesPropertyInfo)] :: [(Symbol, *)])
 
+bytesIconBytes :: AttrLabelProxy "bytes"
+bytesIconBytes = AttrLabelProxy
+
 type instance SignalList BytesIcon = BytesIconSignalList
 type BytesIconSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -143,7 +149,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "BytesIcon"
+-- returnType : Just (TInterface "Gio" "BytesIcon")
 -- throws : False
 -- Skip return : False
 
@@ -168,7 +174,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "BytesIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/BytesIcon.hs-boot b/GI/Gio/Objects/BytesIcon.hs-boot
--- a/GI/Gio/Objects/BytesIcon.hs-boot
+++ b/GI/Gio/Objects/BytesIcon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.BytesIcon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Cancellable.hs b/GI/Gio/Objects/Cancellable.hs
--- a/GI/Gio/Objects/Cancellable.hs
+++ b/GI/Gio/Objects/Cancellable.hs
@@ -99,9 +99,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -229,7 +229,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Cancellable"
+-- returnType : Just (TInterface "Gio" "Cancellable")
 -- throws : False
 -- Skip return : False
 
@@ -250,7 +250,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -275,25 +275,25 @@
 
 -- method Cancellable::connect
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "GObject" "Callback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data_destroy_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "GObject" "Callback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data_destroy_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TULong)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_cancellable_connect" g_cancellable_connect :: 
     Ptr Cancellable ->                      -- _obj : TInterface "Gio" "Cancellable"
     FunPtr GObject.CallbackC ->             -- callback : TInterface "GObject" "Callback"
-    Ptr () ->                               -- data : TBasicType TVoid
+    Ptr () ->                               -- data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- data_destroy_func : TInterface "GLib" "DestroyNotify"
-    IO Word64
+    IO CULong
 
 
 cancellableConnect ::
     (MonadIO m, CancellableK a) =>
     a                                       -- _obj
     -> GObject.Callback                     -- callback
-    -> m Word64                             -- result
+    -> m CULong                             -- result
 cancellableConnect _obj callback = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     callback' <- GObject.mkCallback (GObject.callbackWrapper Nothing callback)
@@ -304,27 +304,27 @@
     return result
 
 data CancellableConnectMethodInfo
-instance (signature ~ (GObject.Callback -> m Word64), MonadIO m, CancellableK a) => MethodInfo CancellableConnectMethodInfo a signature where
+instance (signature ~ (GObject.Callback -> m CULong), MonadIO m, CancellableK a) => MethodInfo CancellableConnectMethodInfo a signature where
     overloadedMethod _ = cancellableConnect
 
 -- method Cancellable::disconnect
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handler_id", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handler_id", argType = TBasicType TULong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_cancellable_disconnect" g_cancellable_disconnect :: 
     Ptr Cancellable ->                      -- _obj : TInterface "Gio" "Cancellable"
-    Word64 ->                               -- handler_id : TBasicType TUInt64
+    CULong ->                               -- handler_id : TBasicType TULong
     IO ()
 
 
 cancellableDisconnect ::
     (MonadIO m, CancellableK a) =>
     a                                       -- _obj
-    -> Word64                               -- handlerId
+    -> CULong                               -- handlerId
     -> m ()                                 -- result
 cancellableDisconnect _obj handlerId = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
@@ -333,14 +333,14 @@
     return ()
 
 data CancellableDisconnectMethodInfo
-instance (signature ~ (Word64 -> m ()), MonadIO m, CancellableK a) => MethodInfo CancellableDisconnectMethodInfo a signature where
+instance (signature ~ (CULong -> m ()), MonadIO m, CancellableK a) => MethodInfo CancellableDisconnectMethodInfo a signature where
     overloadedMethod _ = cancellableDisconnect
 
 -- method Cancellable::get_fd
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -367,7 +367,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -395,7 +395,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pollfd", argType = TInterface "GLib" "PollFD", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -427,7 +427,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -454,7 +454,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -481,7 +481,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -508,7 +508,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -535,7 +535,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -567,7 +567,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Cancellable"
+-- returnType : Just (TInterface "Gio" "Cancellable")
 -- throws : False
 -- Skip return : False
 
@@ -577,11 +577,12 @@
 
 cancellableGetCurrent ::
     (MonadIO m) =>
-    m Cancellable                           -- result
+    m (Maybe Cancellable)                   -- result
 cancellableGetCurrent  = liftIO $ do
     result <- g_cancellable_get_current
-    checkUnexpectedReturnNULL "g_cancellable_get_current" result
-    result' <- (newObject Cancellable) result
-    return result'
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (newObject Cancellable) result'
+        return result''
+    return maybeResult
 
 
diff --git a/GI/Gio/Objects/Cancellable.hs-boot b/GI/Gio/Objects/Cancellable.hs-boot
--- a/GI/Gio/Objects/Cancellable.hs-boot
+++ b/GI/Gio/Objects/Cancellable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Cancellable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/CharsetConverter.hs b/GI/Gio/Objects/CharsetConverter.hs
--- a/GI/Gio/Objects/CharsetConverter.hs
+++ b/GI/Gio/Objects/CharsetConverter.hs
@@ -41,18 +41,21 @@
  -- * Properties
 -- ** FromCharset
     CharsetConverterFromCharsetPropertyInfo ,
+    charsetConverterFromCharset             ,
     constructCharsetConverterFromCharset    ,
     getCharsetConverterFromCharset          ,
 
 
 -- ** ToCharset
     CharsetConverterToCharsetPropertyInfo   ,
+    charsetConverterToCharset               ,
     constructCharsetConverterToCharset      ,
     getCharsetConverterToCharset            ,
 
 
 -- ** UseFallback
     CharsetConverterUseFallbackPropertyInfo ,
+    charsetConverterUseFallback             ,
     constructCharsetConverterUseFallback    ,
     getCharsetConverterUseFallback          ,
     setCharsetConverterUseFallback          ,
@@ -62,9 +65,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -136,48 +139,53 @@
 -- VVV Prop "from-charset"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getCharsetConverterFromCharset :: (MonadIO m, CharsetConverterK o) => o -> m T.Text
+getCharsetConverterFromCharset :: (MonadIO m, CharsetConverterK o) => o -> m (Maybe T.Text)
 getCharsetConverterFromCharset obj = liftIO $ getObjectPropertyString obj "from-charset"
 
 constructCharsetConverterFromCharset :: T.Text -> IO ([Char], GValue)
-constructCharsetConverterFromCharset val = constructObjectPropertyString "from-charset" val
+constructCharsetConverterFromCharset val = constructObjectPropertyString "from-charset" (Just val)
 
 data CharsetConverterFromCharsetPropertyInfo
 instance AttrInfo CharsetConverterFromCharsetPropertyInfo where
-    type AttrAllowedOps CharsetConverterFromCharsetPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps CharsetConverterFromCharsetPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint CharsetConverterFromCharsetPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint CharsetConverterFromCharsetPropertyInfo = CharsetConverterK
-    type AttrGetType CharsetConverterFromCharsetPropertyInfo = T.Text
+    type AttrGetType CharsetConverterFromCharsetPropertyInfo = (Maybe T.Text)
     type AttrLabel CharsetConverterFromCharsetPropertyInfo = "from-charset"
     attrGet _ = getCharsetConverterFromCharset
     attrSet _ = undefined
     attrConstruct _ = constructCharsetConverterFromCharset
+    attrClear _ = undefined
 
 -- VVV Prop "to-charset"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getCharsetConverterToCharset :: (MonadIO m, CharsetConverterK o) => o -> m T.Text
+getCharsetConverterToCharset :: (MonadIO m, CharsetConverterK o) => o -> m (Maybe T.Text)
 getCharsetConverterToCharset obj = liftIO $ getObjectPropertyString obj "to-charset"
 
 constructCharsetConverterToCharset :: T.Text -> IO ([Char], GValue)
-constructCharsetConverterToCharset val = constructObjectPropertyString "to-charset" val
+constructCharsetConverterToCharset val = constructObjectPropertyString "to-charset" (Just val)
 
 data CharsetConverterToCharsetPropertyInfo
 instance AttrInfo CharsetConverterToCharsetPropertyInfo where
-    type AttrAllowedOps CharsetConverterToCharsetPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps CharsetConverterToCharsetPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint CharsetConverterToCharsetPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint CharsetConverterToCharsetPropertyInfo = CharsetConverterK
-    type AttrGetType CharsetConverterToCharsetPropertyInfo = T.Text
+    type AttrGetType CharsetConverterToCharsetPropertyInfo = (Maybe T.Text)
     type AttrLabel CharsetConverterToCharsetPropertyInfo = "to-charset"
     attrGet _ = getCharsetConverterToCharset
     attrSet _ = undefined
     attrConstruct _ = constructCharsetConverterToCharset
+    attrClear _ = undefined
 
 -- VVV Prop "use-fallback"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getCharsetConverterUseFallback :: (MonadIO m, CharsetConverterK o) => o -> m Bool
 getCharsetConverterUseFallback obj = liftIO $ getObjectPropertyBool obj "use-fallback"
@@ -198,10 +206,20 @@
     attrGet _ = getCharsetConverterUseFallback
     attrSet _ = setCharsetConverterUseFallback
     attrConstruct _ = constructCharsetConverterUseFallback
+    attrClear _ = undefined
 
 type instance AttributeList CharsetConverter = CharsetConverterAttributeList
 type CharsetConverterAttributeList = ('[ '("fromCharset", CharsetConverterFromCharsetPropertyInfo), '("toCharset", CharsetConverterToCharsetPropertyInfo), '("useFallback", CharsetConverterUseFallbackPropertyInfo)] :: [(Symbol, *)])
 
+charsetConverterFromCharset :: AttrLabelProxy "fromCharset"
+charsetConverterFromCharset = AttrLabelProxy
+
+charsetConverterToCharset :: AttrLabelProxy "toCharset"
+charsetConverterToCharset = AttrLabelProxy
+
+charsetConverterUseFallback :: AttrLabelProxy "useFallback"
+charsetConverterUseFallback = AttrLabelProxy
+
 type instance SignalList CharsetConverter = CharsetConverterSignalList
 type CharsetConverterSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -209,7 +227,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "to_charset", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "from_charset", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "CharsetConverter"
+-- returnType : Just (TInterface "Gio" "CharsetConverter")
 -- throws : True
 -- Skip return : False
 
@@ -244,7 +262,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "CharsetConverter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -271,7 +289,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "CharsetConverter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -299,7 +317,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "CharsetConverter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "use_fallback", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/CharsetConverter.hs-boot b/GI/Gio/Objects/CharsetConverter.hs-boot
--- a/GI/Gio/Objects/CharsetConverter.hs-boot
+++ b/GI/Gio/Objects/CharsetConverter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.CharsetConverter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ConverterInputStream.hs b/GI/Gio/Objects/ConverterInputStream.hs
--- a/GI/Gio/Objects/ConverterInputStream.hs
+++ b/GI/Gio/Objects/ConverterInputStream.hs
@@ -32,6 +32,7 @@
 -- ** Converter
     ConverterInputStreamConverterPropertyInfo,
     constructConverterInputStreamConverter  ,
+    converterInputStreamConverter           ,
     getConverterInputStreamConverter        ,
 
 
@@ -39,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -134,16 +135,17 @@
 -- VVV Prop "converter"
    -- Type: TInterface "Gio" "Converter"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getConverterInputStreamConverter :: (MonadIO m, ConverterInputStreamK o) => o -> m Converter
-getConverterInputStreamConverter obj = liftIO $ getObjectPropertyObject obj "converter" Converter
+getConverterInputStreamConverter obj = liftIO $ checkUnexpectedNothing "getConverterInputStreamConverter" $ getObjectPropertyObject obj "converter" Converter
 
 constructConverterInputStreamConverter :: (ConverterK a) => a -> IO ([Char], GValue)
-constructConverterInputStreamConverter val = constructObjectPropertyObject "converter" val
+constructConverterInputStreamConverter val = constructObjectPropertyObject "converter" (Just val)
 
 data ConverterInputStreamConverterPropertyInfo
 instance AttrInfo ConverterInputStreamConverterPropertyInfo where
-    type AttrAllowedOps ConverterInputStreamConverterPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ConverterInputStreamConverterPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ConverterInputStreamConverterPropertyInfo = ConverterK
     type AttrBaseTypeConstraint ConverterInputStreamConverterPropertyInfo = ConverterInputStreamK
     type AttrGetType ConverterInputStreamConverterPropertyInfo = Converter
@@ -151,10 +153,14 @@
     attrGet _ = getConverterInputStreamConverter
     attrSet _ = undefined
     attrConstruct _ = constructConverterInputStreamConverter
+    attrClear _ = undefined
 
 type instance AttributeList ConverterInputStream = ConverterInputStreamAttributeList
 type ConverterInputStreamAttributeList = ('[ '("baseStream", FilterInputStreamBaseStreamPropertyInfo), '("closeBaseStream", FilterInputStreamCloseBaseStreamPropertyInfo), '("converter", ConverterInputStreamConverterPropertyInfo)] :: [(Symbol, *)])
 
+converterInputStreamConverter :: AttrLabelProxy "converter"
+converterInputStreamConverter = AttrLabelProxy
+
 type instance SignalList ConverterInputStream = ConverterInputStreamSignalList
 type ConverterInputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -162,7 +168,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "converter", argType = TInterface "Gio" "Converter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ConverterInputStream"
+-- returnType : Just (TInterface "Gio" "ConverterInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -191,7 +197,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ConverterInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Converter"
+-- returnType : Just (TInterface "Gio" "Converter")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ConverterInputStream.hs-boot b/GI/Gio/Objects/ConverterInputStream.hs-boot
--- a/GI/Gio/Objects/ConverterInputStream.hs-boot
+++ b/GI/Gio/Objects/ConverterInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ConverterInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ConverterOutputStream.hs b/GI/Gio/Objects/ConverterOutputStream.hs
--- a/GI/Gio/Objects/ConverterOutputStream.hs
+++ b/GI/Gio/Objects/ConverterOutputStream.hs
@@ -32,6 +32,7 @@
 -- ** Converter
     ConverterOutputStreamConverterPropertyInfo,
     constructConverterOutputStreamConverter ,
+    converterOutputStreamConverter          ,
     getConverterOutputStreamConverter       ,
 
 
@@ -39,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -138,16 +139,17 @@
 -- VVV Prop "converter"
    -- Type: TInterface "Gio" "Converter"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getConverterOutputStreamConverter :: (MonadIO m, ConverterOutputStreamK o) => o -> m Converter
-getConverterOutputStreamConverter obj = liftIO $ getObjectPropertyObject obj "converter" Converter
+getConverterOutputStreamConverter obj = liftIO $ checkUnexpectedNothing "getConverterOutputStreamConverter" $ getObjectPropertyObject obj "converter" Converter
 
 constructConverterOutputStreamConverter :: (ConverterK a) => a -> IO ([Char], GValue)
-constructConverterOutputStreamConverter val = constructObjectPropertyObject "converter" val
+constructConverterOutputStreamConverter val = constructObjectPropertyObject "converter" (Just val)
 
 data ConverterOutputStreamConverterPropertyInfo
 instance AttrInfo ConverterOutputStreamConverterPropertyInfo where
-    type AttrAllowedOps ConverterOutputStreamConverterPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ConverterOutputStreamConverterPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ConverterOutputStreamConverterPropertyInfo = ConverterK
     type AttrBaseTypeConstraint ConverterOutputStreamConverterPropertyInfo = ConverterOutputStreamK
     type AttrGetType ConverterOutputStreamConverterPropertyInfo = Converter
@@ -155,10 +157,14 @@
     attrGet _ = getConverterOutputStreamConverter
     attrSet _ = undefined
     attrConstruct _ = constructConverterOutputStreamConverter
+    attrClear _ = undefined
 
 type instance AttributeList ConverterOutputStream = ConverterOutputStreamAttributeList
 type ConverterOutputStreamAttributeList = ('[ '("baseStream", FilterOutputStreamBaseStreamPropertyInfo), '("closeBaseStream", FilterOutputStreamCloseBaseStreamPropertyInfo), '("converter", ConverterOutputStreamConverterPropertyInfo)] :: [(Symbol, *)])
 
+converterOutputStreamConverter :: AttrLabelProxy "converter"
+converterOutputStreamConverter = AttrLabelProxy
+
 type instance SignalList ConverterOutputStream = ConverterOutputStreamSignalList
 type ConverterOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -166,7 +172,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "converter", argType = TInterface "Gio" "Converter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ConverterOutputStream"
+-- returnType : Just (TInterface "Gio" "ConverterOutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -195,7 +201,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ConverterOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Converter"
+-- returnType : Just (TInterface "Gio" "Converter")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ConverterOutputStream.hs-boot b/GI/Gio/Objects/ConverterOutputStream.hs-boot
--- a/GI/Gio/Objects/ConverterOutputStream.hs-boot
+++ b/GI/Gio/Objects/ConverterOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ConverterOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Credentials.hs b/GI/Gio/Objects/Credentials.hs
--- a/GI/Gio/Objects/Credentials.hs
+++ b/GI/Gio/Objects/Credentials.hs
@@ -55,9 +55,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -136,7 +136,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : False
 -- Skip return : False
 
@@ -157,7 +157,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
@@ -189,7 +189,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : True
 -- Skip return : False
 
@@ -221,7 +221,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "other_credentials", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -255,16 +255,16 @@
 
 -- method Credentials::set_native
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "native_type", argType = TInterface "Gio" "CredentialsType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "native", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "native_type", argType = TInterface "Gio" "CredentialsType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "native", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_credentials_set_native" g_credentials_set_native :: 
     Ptr Credentials ->                      -- _obj : TInterface "Gio" "Credentials"
     CUInt ->                                -- native_type : TInterface "Gio" "CredentialsType"
-    Ptr () ->                               -- native : TBasicType TVoid
+    Ptr () ->                               -- native : TBasicType TPtr
     IO ()
 
 
@@ -287,15 +287,15 @@
 
 -- method Credentials::set_unix_user
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uid", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uid", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_credentials_set_unix_user" g_credentials_set_unix_user :: 
     Ptr Credentials ->                      -- _obj : TInterface "Gio" "Credentials"
-    Word32 ->                               -- uid : TBasicType TUInt32
+    Word32 ->                               -- uid : TBasicType TUInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -323,7 +323,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Credentials.hs-boot b/GI/Gio/Objects/Credentials.hs-boot
--- a/GI/Gio/Objects/Credentials.hs-boot
+++ b/GI/Gio/Objects/Credentials.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Credentials where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusActionGroup.hs b/GI/Gio/Objects/DBusActionGroup.hs
--- a/GI/Gio/Objects/DBusActionGroup.hs
+++ b/GI/Gio/Objects/DBusActionGroup.hs
@@ -25,9 +25,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -116,7 +116,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusActionGroup"
+-- returnType : Just (TInterface "Gio" "DBusActionGroup")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusActionGroup.hs-boot b/GI/Gio/Objects/DBusActionGroup.hs-boot
--- a/GI/Gio/Objects/DBusActionGroup.hs-boot
+++ b/GI/Gio/Objects/DBusActionGroup.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusActionGroup where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusAuthObserver.hs b/GI/Gio/Objects/DBusAuthObserver.hs
--- a/GI/Gio/Objects/DBusAuthObserver.hs
+++ b/GI/Gio/Objects/DBusAuthObserver.hs
@@ -62,9 +62,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -246,7 +246,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusAuthObserver"
+-- returnType : Just (TInterface "Gio" "DBusAuthObserver")
 -- throws : False
 -- Skip return : False
 
@@ -267,7 +267,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mechanism", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -299,7 +299,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "credentials", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusAuthObserver.hs-boot b/GI/Gio/Objects/DBusAuthObserver.hs-boot
--- a/GI/Gio/Objects/DBusAuthObserver.hs-boot
+++ b/GI/Gio/Objects/DBusAuthObserver.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusAuthObserver where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusConnection.hs b/GI/Gio/Objects/DBusConnection.hs
--- a/GI/Gio/Objects/DBusConnection.hs
+++ b/GI/Gio/Objects/DBusConnection.hs
@@ -242,26 +242,31 @@
 -- ** Address
     DBusConnectionAddressPropertyInfo       ,
     constructDBusConnectionAddress          ,
+    dBusConnectionAddress                   ,
 
 
 -- ** AuthenticationObserver
     DBusConnectionAuthenticationObserverPropertyInfo,
     constructDBusConnectionAuthenticationObserver,
+    dBusConnectionAuthenticationObserver    ,
 
 
 -- ** Capabilities
     DBusConnectionCapabilitiesPropertyInfo  ,
+    dBusConnectionCapabilities              ,
     getDBusConnectionCapabilities           ,
 
 
 -- ** Closed
     DBusConnectionClosedPropertyInfo        ,
+    dBusConnectionClosed                    ,
     getDBusConnectionClosed                 ,
 
 
 -- ** ExitOnClose
     DBusConnectionExitOnClosePropertyInfo   ,
     constructDBusConnectionExitOnClose      ,
+    dBusConnectionExitOnClose               ,
     getDBusConnectionExitOnClose            ,
     setDBusConnectionExitOnClose            ,
 
@@ -269,22 +274,26 @@
 -- ** Flags
     DBusConnectionFlagsPropertyInfo         ,
     constructDBusConnectionFlags            ,
+    dBusConnectionFlags                     ,
 
 
 -- ** Guid
     DBusConnectionGuidPropertyInfo          ,
     constructDBusConnectionGuid             ,
+    dBusConnectionGuid                      ,
     getDBusConnectionGuid                   ,
 
 
 -- ** Stream
     DBusConnectionStreamPropertyInfo        ,
     constructDBusConnectionStream           ,
+    dBusConnectionStream                    ,
     getDBusConnectionStream                 ,
 
 
 -- ** UniqueName
     DBusConnectionUniqueNamePropertyInfo    ,
+    dBusConnectionUniqueName                ,
     getDBusConnectionUniqueName             ,
 
 
@@ -307,9 +316,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -469,13 +478,14 @@
 -- VVV Prop "address"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructDBusConnectionAddress :: T.Text -> IO ([Char], GValue)
-constructDBusConnectionAddress val = constructObjectPropertyString "address" val
+constructDBusConnectionAddress val = constructObjectPropertyString "address" (Just val)
 
 data DBusConnectionAddressPropertyInfo
 instance AttrInfo DBusConnectionAddressPropertyInfo where
-    type AttrAllowedOps DBusConnectionAddressPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps DBusConnectionAddressPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint DBusConnectionAddressPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusConnectionAddressPropertyInfo = DBusConnectionK
     type AttrGetType DBusConnectionAddressPropertyInfo = ()
@@ -483,17 +493,19 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructDBusConnectionAddress
+    attrClear _ = undefined
 
 -- VVV Prop "authentication-observer"
    -- Type: TInterface "Gio" "DBusAuthObserver"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructDBusConnectionAuthenticationObserver :: (DBusAuthObserverK a) => a -> IO ([Char], GValue)
-constructDBusConnectionAuthenticationObserver val = constructObjectPropertyObject "authentication-observer" val
+constructDBusConnectionAuthenticationObserver val = constructObjectPropertyObject "authentication-observer" (Just val)
 
 data DBusConnectionAuthenticationObserverPropertyInfo
 instance AttrInfo DBusConnectionAuthenticationObserverPropertyInfo where
-    type AttrAllowedOps DBusConnectionAuthenticationObserverPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps DBusConnectionAuthenticationObserverPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint DBusConnectionAuthenticationObserverPropertyInfo = DBusAuthObserverK
     type AttrBaseTypeConstraint DBusConnectionAuthenticationObserverPropertyInfo = DBusConnectionK
     type AttrGetType DBusConnectionAuthenticationObserverPropertyInfo = ()
@@ -501,10 +513,12 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructDBusConnectionAuthenticationObserver
+    attrClear _ = undefined
 
 -- VVV Prop "capabilities"
    -- Type: TInterface "Gio" "DBusCapabilityFlags"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getDBusConnectionCapabilities :: (MonadIO m, DBusConnectionK o) => o -> m [DBusCapabilityFlags]
 getDBusConnectionCapabilities obj = liftIO $ getObjectPropertyFlags obj "capabilities"
@@ -519,10 +533,12 @@
     attrGet _ = getDBusConnectionCapabilities
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "closed"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusConnectionClosed :: (MonadIO m, DBusConnectionK o) => o -> m Bool
 getDBusConnectionClosed obj = liftIO $ getObjectPropertyBool obj "closed"
@@ -537,10 +553,12 @@
     attrGet _ = getDBusConnectionClosed
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "exit-on-close"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getDBusConnectionExitOnClose :: (MonadIO m, DBusConnectionK o) => o -> m Bool
 getDBusConnectionExitOnClose obj = liftIO $ getObjectPropertyBool obj "exit-on-close"
@@ -561,10 +579,12 @@
     attrGet _ = getDBusConnectionExitOnClose
     attrSet _ = setDBusConnectionExitOnClose
     attrConstruct _ = constructDBusConnectionExitOnClose
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "DBusConnectionFlags"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructDBusConnectionFlags :: [DBusConnectionFlags] -> IO ([Char], GValue)
 constructDBusConnectionFlags val = constructObjectPropertyFlags "flags" val
@@ -579,20 +599,22 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructDBusConnectionFlags
+    attrClear _ = undefined
 
 -- VVV Prop "guid"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusConnectionGuid :: (MonadIO m, DBusConnectionK o) => o -> m T.Text
-getDBusConnectionGuid obj = liftIO $ getObjectPropertyString obj "guid"
+getDBusConnectionGuid obj = liftIO $ checkUnexpectedNothing "getDBusConnectionGuid" $ getObjectPropertyString obj "guid"
 
 constructDBusConnectionGuid :: T.Text -> IO ([Char], GValue)
-constructDBusConnectionGuid val = constructObjectPropertyString "guid" val
+constructDBusConnectionGuid val = constructObjectPropertyString "guid" (Just val)
 
 data DBusConnectionGuidPropertyInfo
 instance AttrInfo DBusConnectionGuidPropertyInfo where
-    type AttrAllowedOps DBusConnectionGuidPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusConnectionGuidPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusConnectionGuidPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusConnectionGuidPropertyInfo = DBusConnectionK
     type AttrGetType DBusConnectionGuidPropertyInfo = T.Text
@@ -600,20 +622,22 @@
     attrGet _ = getDBusConnectionGuid
     attrSet _ = undefined
     attrConstruct _ = constructDBusConnectionGuid
+    attrClear _ = undefined
 
 -- VVV Prop "stream"
    -- Type: TInterface "Gio" "IOStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusConnectionStream :: (MonadIO m, DBusConnectionK o) => o -> m IOStream
-getDBusConnectionStream obj = liftIO $ getObjectPropertyObject obj "stream" IOStream
+getDBusConnectionStream obj = liftIO $ checkUnexpectedNothing "getDBusConnectionStream" $ getObjectPropertyObject obj "stream" IOStream
 
 constructDBusConnectionStream :: (IOStreamK a) => a -> IO ([Char], GValue)
-constructDBusConnectionStream val = constructObjectPropertyObject "stream" val
+constructDBusConnectionStream val = constructObjectPropertyObject "stream" (Just val)
 
 data DBusConnectionStreamPropertyInfo
 instance AttrInfo DBusConnectionStreamPropertyInfo where
-    type AttrAllowedOps DBusConnectionStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusConnectionStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusConnectionStreamPropertyInfo = IOStreamK
     type AttrBaseTypeConstraint DBusConnectionStreamPropertyInfo = DBusConnectionK
     type AttrGetType DBusConnectionStreamPropertyInfo = IOStream
@@ -621,17 +645,19 @@
     attrGet _ = getDBusConnectionStream
     attrSet _ = undefined
     attrConstruct _ = constructDBusConnectionStream
+    attrClear _ = undefined
 
 -- VVV Prop "unique-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getDBusConnectionUniqueName :: (MonadIO m, DBusConnectionK o) => o -> m T.Text
-getDBusConnectionUniqueName obj = liftIO $ getObjectPropertyString obj "unique-name"
+getDBusConnectionUniqueName obj = liftIO $ checkUnexpectedNothing "getDBusConnectionUniqueName" $ getObjectPropertyString obj "unique-name"
 
 data DBusConnectionUniqueNamePropertyInfo
 instance AttrInfo DBusConnectionUniqueNamePropertyInfo where
-    type AttrAllowedOps DBusConnectionUniqueNamePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps DBusConnectionUniqueNamePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusConnectionUniqueNamePropertyInfo = (~) ()
     type AttrBaseTypeConstraint DBusConnectionUniqueNamePropertyInfo = DBusConnectionK
     type AttrGetType DBusConnectionUniqueNamePropertyInfo = T.Text
@@ -639,10 +665,38 @@
     attrGet _ = getDBusConnectionUniqueName
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList DBusConnection = DBusConnectionAttributeList
 type DBusConnectionAttributeList = ('[ '("address", DBusConnectionAddressPropertyInfo), '("authenticationObserver", DBusConnectionAuthenticationObserverPropertyInfo), '("capabilities", DBusConnectionCapabilitiesPropertyInfo), '("closed", DBusConnectionClosedPropertyInfo), '("exitOnClose", DBusConnectionExitOnClosePropertyInfo), '("flags", DBusConnectionFlagsPropertyInfo), '("guid", DBusConnectionGuidPropertyInfo), '("stream", DBusConnectionStreamPropertyInfo), '("uniqueName", DBusConnectionUniqueNamePropertyInfo)] :: [(Symbol, *)])
 
+dBusConnectionAddress :: AttrLabelProxy "address"
+dBusConnectionAddress = AttrLabelProxy
+
+dBusConnectionAuthenticationObserver :: AttrLabelProxy "authenticationObserver"
+dBusConnectionAuthenticationObserver = AttrLabelProxy
+
+dBusConnectionCapabilities :: AttrLabelProxy "capabilities"
+dBusConnectionCapabilities = AttrLabelProxy
+
+dBusConnectionClosed :: AttrLabelProxy "closed"
+dBusConnectionClosed = AttrLabelProxy
+
+dBusConnectionExitOnClose :: AttrLabelProxy "exitOnClose"
+dBusConnectionExitOnClose = AttrLabelProxy
+
+dBusConnectionFlags :: AttrLabelProxy "flags"
+dBusConnectionFlags = AttrLabelProxy
+
+dBusConnectionGuid :: AttrLabelProxy "guid"
+dBusConnectionGuid = AttrLabelProxy
+
+dBusConnectionStream :: AttrLabelProxy "stream"
+dBusConnectionStream = AttrLabelProxy
+
+dBusConnectionUniqueName :: AttrLabelProxy "uniqueName"
+dBusConnectionUniqueName = AttrLabelProxy
+
 data DBusConnectionClosedSignalInfo
 instance SignalInfo DBusConnectionClosedSignalInfo where
     type HaskellCallbackType DBusConnectionClosedSignalInfo = DBusConnectionClosedCallback
@@ -655,7 +709,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -685,7 +739,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -715,7 +769,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -764,7 +818,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : True
 -- Skip return : False
 
@@ -819,16 +873,16 @@
 
 -- method DBusConnection::add_filter
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "filter_function", argType = TInterface "Gio" "DBusMessageFilterFunction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "filter_function", argType = TInterface "Gio" "DBusMessageFilterFunction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_add_filter" g_dbus_connection_add_filter :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
     FunPtr DBusMessageFilterFunctionC ->    -- filter_function : TInterface "Gio" "DBusMessageFilterFunction"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- user_data_free_func : TInterface "GLib" "DestroyNotify"
     IO Word32
 
@@ -853,9 +907,9 @@
 
 -- method DBusConnection::call
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 11, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 11, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -868,10 +922,10 @@
     Ptr GVariant ->                         -- parameters : TVariant
     Ptr GLib.VariantType ->                 -- reply_type : TInterface "GLib" "VariantType"
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -941,7 +995,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -977,9 +1031,9 @@
 
 -- method DBusConnection::call_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -992,7 +1046,7 @@
     Ptr GVariant ->                         -- parameters : TVariant
     Ptr GLib.VariantType ->                 -- reply_type : TInterface "GLib" "VariantType"
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO (Ptr GVariant)
@@ -1062,9 +1116,9 @@
 
 -- method DBusConnection::call_with_unix_fd_list
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 12, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 12, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1077,11 +1131,11 @@
     Ptr GVariant ->                         -- parameters : TVariant
     Ptr GLib.VariantType ->                 -- reply_type : TInterface "GLib" "VariantType"
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr UnixFDList ->                       -- fd_list : TInterface "Gio" "UnixFDList"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1158,7 +1212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -1199,9 +1253,9 @@
 
 -- method DBusConnection::call_with_unix_fd_list_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "reply_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -1214,7 +1268,7 @@
     Ptr GVariant ->                         -- parameters : TVariant
     Ptr GLib.VariantType ->                 -- reply_type : TInterface "GLib" "VariantType"
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr UnixFDList ->                       -- fd_list : TInterface "Gio" "UnixFDList"
     Ptr (Ptr UnixFDList) ->                 -- out_fd_list : TInterface "Gio" "UnixFDList"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
@@ -1298,9 +1352,9 @@
 
 -- method DBusConnection::close
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1308,7 +1362,7 @@
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1346,7 +1400,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1382,7 +1436,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1422,7 +1476,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destination_bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "signal_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1484,7 +1538,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_group", argType = TInterface "Gio" "ActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : True
 -- Skip return : False
 
@@ -1524,7 +1578,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "menu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : True
 -- Skip return : False
 
@@ -1562,9 +1616,9 @@
 
 -- method DBusConnection::flush
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1572,7 +1626,7 @@
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1610,7 +1664,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1646,7 +1700,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1686,7 +1740,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusCapabilityFlags"
+-- returnType : Just (TInterface "Gio" "DBusCapabilityFlags")
 -- throws : False
 -- Skip return : False
 
@@ -1714,7 +1768,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1742,7 +1796,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1771,7 +1825,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -1798,7 +1852,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : False
 -- Skip return : False
 
@@ -1827,7 +1881,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : False
 -- Skip return : False
 
@@ -1856,7 +1910,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1885,7 +1939,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1913,7 +1967,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_call_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_property_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "set_property_closure", argType = TInterface "GObject" "Closure", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : True
 -- Skip return : False
 
@@ -1975,9 +2029,9 @@
 
 -- method DBusConnection::register_subtree
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "vtable", argType = TInterface "Gio" "DBusSubtreeVTable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSubtreeFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "vtable", argType = TInterface "Gio" "DBusSubtreeVTable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSubtreeFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : True
 -- Skip return : False
 
@@ -1986,7 +2040,7 @@
     CString ->                              -- object_path : TBasicType TUTF8
     Ptr DBusSubtreeVTable ->                -- vtable : TInterface "Gio" "DBusSubtreeVTable"
     CUInt ->                                -- flags : TInterface "Gio" "DBusSubtreeFlags"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- user_data_free_func : TInterface "GLib" "DestroyNotify"
     Ptr (Ptr GError) ->                     -- error
     IO Word32
@@ -2025,15 +2079,15 @@
 
 -- method DBusConnection::remove_filter
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "filter_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "filter_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_remove_filter" g_dbus_connection_remove_filter :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- filter_id : TBasicType TUInt32
+    Word32 ->                               -- filter_id : TBasicType TUInt
     IO ()
 
 
@@ -2056,7 +2110,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSendMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_serial", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2097,9 +2151,9 @@
 
 -- method DBusConnection::send_message_with_reply
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSendMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_serial", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSendMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_serial", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2107,11 +2161,11 @@
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
     Ptr DBusMessage ->                      -- message : TInterface "Gio" "DBusMessage"
     CUInt ->                                -- flags : TInterface "Gio" "DBusSendMessageFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Word32 ->                           -- out_serial : TBasicType TUInt32
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -2158,7 +2212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : True
 -- Skip return : False
 
@@ -2194,9 +2248,9 @@
 
 -- method DBusConnection::send_message_with_reply_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSendMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_serial", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSendMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_serial", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : True
 -- Skip return : False
 
@@ -2204,7 +2258,7 @@
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
     Ptr DBusMessage ->                      -- message : TInterface "Gio" "DBusMessage"
     CUInt ->                                -- flags : TInterface "Gio" "DBusSendMessageFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Word32 ->                           -- out_serial : TBasicType TUInt32
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
@@ -2251,7 +2305,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "exit_on_close", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2279,9 +2333,9 @@
 
 -- method DBusConnection::signal_subscribe
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "sender", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "member", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "arg0", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSignalFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "DBusSignalCallback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 8, argDestroy = 9, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "sender", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "member", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "arg0", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusSignalFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "DBusSignalCallback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 8, argDestroy = 9, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data_free_func", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -2294,7 +2348,7 @@
     CString ->                              -- arg0 : TBasicType TUTF8
     CUInt ->                                -- flags : TInterface "Gio" "DBusSignalFlags"
     FunPtr DBusSignalCallbackC ->           -- callback : TInterface "Gio" "DBusSignalCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- user_data_free_func : TInterface "GLib" "DestroyNotify"
     IO Word32
 
@@ -2356,15 +2410,15 @@
 
 -- method DBusConnection::signal_unsubscribe
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "subscription_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "subscription_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_signal_unsubscribe" g_dbus_connection_signal_unsubscribe :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- subscription_id : TBasicType TUInt32
+    Word32 ->                               -- subscription_id : TBasicType TUInt
     IO ()
 
 
@@ -2387,7 +2441,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2412,15 +2466,15 @@
 
 -- method DBusConnection::unexport_action_group
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "export_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "export_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_unexport_action_group" g_dbus_connection_unexport_action_group :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- export_id : TBasicType TUInt32
+    Word32 ->                               -- export_id : TBasicType TUInt
     IO ()
 
 
@@ -2441,15 +2495,15 @@
 
 -- method DBusConnection::unexport_menu_model
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "export_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "export_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_unexport_menu_model" g_dbus_connection_unexport_menu_model :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- export_id : TBasicType TUInt32
+    Word32 ->                               -- export_id : TBasicType TUInt
     IO ()
 
 
@@ -2470,15 +2524,15 @@
 
 -- method DBusConnection::unregister_object
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "registration_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "registration_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_unregister_object" g_dbus_connection_unregister_object :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- registration_id : TBasicType TUInt32
+    Word32 ->                               -- registration_id : TBasicType TUInt
     IO CInt
 
 
@@ -2500,15 +2554,15 @@
 
 -- method DBusConnection::unregister_subtree
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "registration_id", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "registration_id", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_connection_unregister_subtree" g_dbus_connection_unregister_subtree :: 
     Ptr DBusConnection ->                   -- _obj : TInterface "Gio" "DBusConnection"
-    Word32 ->                               -- registration_id : TBasicType TUInt32
+    Word32 ->                               -- registration_id : TBasicType TUInt
     IO CInt
 
 
@@ -2530,9 +2584,9 @@
 
 -- method DBusConnection::new
 -- method type : MemberFunction
--- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2543,7 +2597,7 @@
     Ptr DBusAuthObserver ->                 -- observer : TInterface "Gio" "DBusAuthObserver"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -2591,9 +2645,9 @@
 
 -- method DBusConnection::new_for_address
 -- method type : MemberFunction
--- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusConnectionFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2603,7 +2657,7 @@
     Ptr DBusAuthObserver ->                 -- observer : TInterface "Gio" "DBusAuthObserver"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
diff --git a/GI/Gio/Objects/DBusConnection.hs-boot b/GI/Gio/Objects/DBusConnection.hs-boot
--- a/GI/Gio/Objects/DBusConnection.hs-boot
+++ b/GI/Gio/Objects/DBusConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusInterfaceSkeleton.hs b/GI/Gio/Objects/DBusInterfaceSkeleton.hs
--- a/GI/Gio/Objects/DBusInterfaceSkeleton.hs
+++ b/GI/Gio/Objects/DBusInterfaceSkeleton.hs
@@ -83,6 +83,7 @@
 -- ** GFlags
     DBusInterfaceSkeletonGFlagsPropertyInfo ,
     constructDBusInterfaceSkeletonGFlags    ,
+    dBusInterfaceSkeletonGFlags             ,
     getDBusInterfaceSkeletonGFlags          ,
     setDBusInterfaceSkeletonGFlags          ,
 
@@ -106,9 +107,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -231,6 +232,7 @@
 -- VVV Prop "g-flags"
    -- Type: TInterface "Gio" "DBusInterfaceSkeletonFlags"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusInterfaceSkeletonGFlags :: (MonadIO m, DBusInterfaceSkeletonK o) => o -> m [DBusInterfaceSkeletonFlags]
 getDBusInterfaceSkeletonGFlags obj = liftIO $ getObjectPropertyFlags obj "g-flags"
@@ -251,10 +253,14 @@
     attrGet _ = getDBusInterfaceSkeletonGFlags
     attrSet _ = setDBusInterfaceSkeletonGFlags
     attrConstruct _ = constructDBusInterfaceSkeletonGFlags
+    attrClear _ = undefined
 
 type instance AttributeList DBusInterfaceSkeleton = DBusInterfaceSkeletonAttributeList
 type DBusInterfaceSkeletonAttributeList = ('[ '("gFlags", DBusInterfaceSkeletonGFlagsPropertyInfo)] :: [(Symbol, *)])
 
+dBusInterfaceSkeletonGFlags :: AttrLabelProxy "gFlags"
+dBusInterfaceSkeletonGFlags = AttrLabelProxy
+
 data DBusInterfaceSkeletonGAuthorizeMethodSignalInfo
 instance SignalInfo DBusInterfaceSkeletonGAuthorizeMethodSignalInfo where
     type HaskellCallbackType DBusInterfaceSkeletonGAuthorizeMethodSignalInfo = DBusInterfaceSkeletonGAuthorizeMethodCallback
@@ -267,7 +273,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -307,7 +313,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -334,7 +340,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -363,7 +369,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "DBusConnection")
+-- returnType : Just (TGList (TInterface "Gio" "DBusConnection"))
 -- throws : False
 -- Skip return : False
 
@@ -379,7 +385,6 @@
 dBusInterfaceSkeletonGetConnections _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_dbus_interface_skeleton_get_connections _obj'
-    checkUnexpectedReturnNULL "g_dbus_interface_skeleton_get_connections" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject DBusConnection) result'
     g_list_free result
@@ -394,7 +399,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceSkeletonFlags"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceSkeletonFlags")
 -- throws : False
 -- Skip return : False
 
@@ -422,7 +427,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceInfo"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceInfo")
 -- throws : False
 -- Skip return : False
 
@@ -451,7 +456,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -480,7 +485,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -509,7 +514,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -541,7 +546,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusInterfaceSkeletonFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -571,7 +576,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -598,7 +603,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusInterfaceSkeleton.hs-boot b/GI/Gio/Objects/DBusInterfaceSkeleton.hs-boot
--- a/GI/Gio/Objects/DBusInterfaceSkeleton.hs-boot
+++ b/GI/Gio/Objects/DBusInterfaceSkeleton.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusInterfaceSkeleton where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusMenuModel.hs b/GI/Gio/Objects/DBusMenuModel.hs
--- a/GI/Gio/Objects/DBusMenuModel.hs
+++ b/GI/Gio/Objects/DBusMenuModel.hs
@@ -25,9 +25,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -107,7 +107,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bus_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMenuModel"
+-- returnType : Just (TInterface "Gio" "DBusMenuModel")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusMenuModel.hs-boot b/GI/Gio/Objects/DBusMenuModel.hs-boot
--- a/GI/Gio/Objects/DBusMenuModel.hs-boot
+++ b/GI/Gio/Objects/DBusMenuModel.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusMenuModel where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusMessage.hs b/GI/Gio/Objects/DBusMessage.hs
--- a/GI/Gio/Objects/DBusMessage.hs
+++ b/GI/Gio/Objects/DBusMessage.hs
@@ -252,6 +252,7 @@
  -- * Properties
 -- ** Locked
     DBusMessageLockedPropertyInfo           ,
+    dBusMessageLocked                       ,
     getDBusMessageLocked                    ,
 
 
@@ -259,9 +260,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -369,6 +370,7 @@
 -- VVV Prop "locked"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getDBusMessageLocked :: (MonadIO m, DBusMessageK o) => o -> m Bool
 getDBusMessageLocked obj = liftIO $ getObjectPropertyBool obj "locked"
@@ -383,10 +385,14 @@
     attrGet _ = getDBusMessageLocked
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList DBusMessage = DBusMessageAttributeList
 type DBusMessageAttributeList = ('[ '("locked", DBusMessageLockedPropertyInfo)] :: [(Symbol, *)])
 
+dBusMessageLocked :: AttrLabelProxy "locked"
+dBusMessageLocked = AttrLabelProxy
+
 type instance SignalList DBusMessage = DBusMessageSignalList
 type DBusMessageSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -394,7 +400,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -415,7 +421,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "blob", argType = TCArray False (-1) 1 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blob_len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "capabilities", argType = TInterface "Gio" "DBusCapabilityFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "blob_len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : True
 -- Skip return : False
 
@@ -450,7 +456,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -466,28 +472,28 @@
     (MonadIO m) =>
     Maybe (T.Text)                          -- name
     -> T.Text                               -- path
-    -> Maybe (T.Text)                       -- interface
+    -> Maybe (T.Text)                       -- interface_
     -> T.Text                               -- method
     -> m DBusMessage                        -- result
-dBusMessageNewMethodCall name path interface method = liftIO $ do
+dBusMessageNewMethodCall name path interface_ method = liftIO $ do
     maybeName <- case name of
         Nothing -> return nullPtr
         Just jName -> do
             jName' <- textToCString jName
             return jName'
     path' <- textToCString path
-    maybeInterface <- case interface of
+    maybeInterface_ <- case interface_ of
         Nothing -> return nullPtr
-        Just jInterface -> do
-            jInterface' <- textToCString jInterface
-            return jInterface'
+        Just jInterface_ -> do
+            jInterface_' <- textToCString jInterface_
+            return jInterface_'
     method' <- textToCString method
-    result <- g_dbus_message_new_method_call maybeName path' maybeInterface method'
+    result <- g_dbus_message_new_method_call maybeName path' maybeInterface_ method'
     checkUnexpectedReturnNULL "g_dbus_message_new_method_call" result
     result' <- (wrapObject DBusMessage) result
     freeMem maybeName
     freeMem path'
-    freeMem maybeInterface
+    freeMem maybeInterface_
     freeMem method'
     return result'
 
@@ -495,7 +501,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "signal", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -509,18 +515,18 @@
 dBusMessageNewSignal ::
     (MonadIO m) =>
     T.Text                                  -- path
-    -> T.Text                               -- interface
+    -> T.Text                               -- interface_
     -> T.Text                               -- signal
     -> m DBusMessage                        -- result
-dBusMessageNewSignal path interface signal = liftIO $ do
+dBusMessageNewSignal path interface_ signal = liftIO $ do
     path' <- textToCString path
-    interface' <- textToCString interface
+    interface_' <- textToCString interface_
     signal' <- textToCString signal
-    result <- g_dbus_message_new_signal path' interface' signal'
+    result <- g_dbus_message_new_signal path' interface_' signal'
     checkUnexpectedReturnNULL "g_dbus_message_new_signal" result
     result' <- (wrapObject DBusMessage) result
     freeMem path'
-    freeMem interface'
+    freeMem interface_'
     freeMem signal'
     return result'
 
@@ -528,7 +534,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : True
 -- Skip return : False
 
@@ -562,7 +568,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -591,7 +597,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -620,7 +626,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessageByteOrder"
+-- returnType : Just (TInterface "Gio" "DBusMessageByteOrder")
 -- throws : False
 -- Skip return : False
 
@@ -648,7 +654,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -677,7 +683,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -706,7 +712,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessageFlags"
+-- returnType : Just (TInterface "Gio" "DBusMessageFlags")
 -- throws : False
 -- Skip return : False
 
@@ -734,7 +740,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "header_field", argType = TInterface "Gio" "DBusMessageHeaderField", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -766,7 +772,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUInt8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUInt8))
 -- throws : False
 -- Skip return : False
 
@@ -795,7 +801,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -824,7 +830,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -852,7 +858,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -881,7 +887,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessageType"
+-- returnType : Just (TInterface "Gio" "DBusMessageType")
 -- throws : False
 -- Skip return : False
 
@@ -909,7 +915,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -936,7 +942,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -965,7 +971,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -992,7 +998,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1021,7 +1027,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -1048,7 +1054,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1077,7 +1083,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixFDList"
+-- returnType : Just (TInterface "Gio" "UnixFDList")
 -- throws : False
 -- Skip return : False
 
@@ -1106,7 +1112,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1133,7 +1139,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error_message", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -1170,7 +1176,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -1197,15 +1203,15 @@
 
 -- method DBusMessage::print
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_message_print" g_dbus_message_print :: 
     Ptr DBusMessage ->                      -- _obj : TInterface "Gio" "DBusMessage"
-    Word32 ->                               -- indent : TBasicType TUInt32
+    Word32 ->                               -- indent : TBasicType TUInt
     IO CString
 
 
@@ -1231,7 +1237,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "body", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1261,7 +1267,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "byte_order", argType = TInterface "Gio" "DBusMessageByteOrder", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1291,7 +1297,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1322,7 +1328,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1353,7 +1359,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusMessageFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1383,7 +1389,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "header_field", argType = TInterface "Gio" "DBusMessageHeaderField", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1420,7 +1426,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1451,7 +1457,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1482,7 +1488,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "DBusMessageType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1512,7 +1518,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1541,7 +1547,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1572,7 +1578,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1601,7 +1607,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1632,7 +1638,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "serial", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1661,7 +1667,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1692,7 +1698,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1727,7 +1733,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_size", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "capabilities", argType = TInterface "Gio" "DBusCapabilityFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "out_size", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TUInt8)
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TUInt8))
 -- throws : True
 -- Skip return : False
 
@@ -1769,7 +1775,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1801,7 +1807,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "blob", argType = TCArray False (-1) 1 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blob_len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "blob_len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusMessage.hs-boot b/GI/Gio/Objects/DBusMessage.hs-boot
--- a/GI/Gio/Objects/DBusMessage.hs-boot
+++ b/GI/Gio/Objects/DBusMessage.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusMessage where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusMethodInvocation.hs b/GI/Gio/Objects/DBusMethodInvocation.hs
--- a/GI/Gio/Objects/DBusMethodInvocation.hs
+++ b/GI/Gio/Objects/DBusMethodInvocation.hs
@@ -91,9 +91,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -180,7 +180,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -209,7 +209,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -238,7 +238,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMessage"
+-- returnType : Just (TInterface "Gio" "DBusMessage")
 -- throws : False
 -- Skip return : False
 
@@ -267,7 +267,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMethodInfo"
+-- returnType : Just (TInterface "Gio" "DBusMethodInfo")
 -- throws : False
 -- Skip return : False
 
@@ -296,7 +296,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -325,7 +325,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -354,7 +354,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -383,7 +383,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusPropertyInfo"
+-- returnType : Just (TInterface "Gio" "DBusPropertyInfo")
 -- throws : False
 -- Skip return : False
 
@@ -412,7 +412,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -441,7 +441,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error_message", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -474,16 +474,16 @@
 
 -- method DBusMethodInvocation::return_error_literal
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "code", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "code", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "message", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_method_invocation_return_error_literal" g_dbus_method_invocation_return_error_literal :: 
     Ptr DBusMethodInvocation ->             -- _obj : TInterface "Gio" "DBusMethodInvocation"
     Word32 ->                               -- domain : TBasicType TUInt32
-    Int32 ->                                -- code : TBasicType TInt32
+    Int32 ->                                -- code : TBasicType TInt
     CString ->                              -- message : TBasicType TUTF8
     IO ()
 
@@ -511,7 +511,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -542,7 +542,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -576,7 +576,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInvocation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusMethodInvocation.hs-boot b/GI/Gio/Objects/DBusMethodInvocation.hs-boot
--- a/GI/Gio/Objects/DBusMethodInvocation.hs-boot
+++ b/GI/Gio/Objects/DBusMethodInvocation.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusMethodInvocation where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusObjectManagerClient.hs b/GI/Gio/Objects/DBusObjectManagerClient.hs
--- a/GI/Gio/Objects/DBusObjectManagerClient.hs
+++ b/GI/Gio/Objects/DBusObjectManagerClient.hs
@@ -67,52 +67,61 @@
 -- ** BusType
     DBusObjectManagerClientBusTypePropertyInfo,
     constructDBusObjectManagerClientBusType ,
+    dBusObjectManagerClientBusType          ,
 
 
 -- ** Connection
     DBusObjectManagerClientConnectionPropertyInfo,
     constructDBusObjectManagerClientConnection,
+    dBusObjectManagerClientConnection       ,
     getDBusObjectManagerClientConnection    ,
 
 
 -- ** Flags
     DBusObjectManagerClientFlagsPropertyInfo,
     constructDBusObjectManagerClientFlags   ,
+    dBusObjectManagerClientFlags            ,
     getDBusObjectManagerClientFlags         ,
 
 
 -- ** GetProxyTypeDestroyNotify
     DBusObjectManagerClientGetProxyTypeDestroyNotifyPropertyInfo,
     constructDBusObjectManagerClientGetProxyTypeDestroyNotify,
+    dBusObjectManagerClientGetProxyTypeDestroyNotify,
     getDBusObjectManagerClientGetProxyTypeDestroyNotify,
 
 
 -- ** GetProxyTypeFunc
     DBusObjectManagerClientGetProxyTypeFuncPropertyInfo,
     constructDBusObjectManagerClientGetProxyTypeFunc,
+    dBusObjectManagerClientGetProxyTypeFunc ,
     getDBusObjectManagerClientGetProxyTypeFunc,
 
 
 -- ** GetProxyTypeUserData
     DBusObjectManagerClientGetProxyTypeUserDataPropertyInfo,
     constructDBusObjectManagerClientGetProxyTypeUserData,
+    dBusObjectManagerClientGetProxyTypeUserData,
     getDBusObjectManagerClientGetProxyTypeUserData,
 
 
 -- ** Name
     DBusObjectManagerClientNamePropertyInfo ,
     constructDBusObjectManagerClientName    ,
+    dBusObjectManagerClientName             ,
     getDBusObjectManagerClientName          ,
 
 
 -- ** NameOwner
     DBusObjectManagerClientNameOwnerPropertyInfo,
+    dBusObjectManagerClientNameOwner        ,
     getDBusObjectManagerClientNameOwner     ,
 
 
 -- ** ObjectPath
     DBusObjectManagerClientObjectPathPropertyInfo,
     constructDBusObjectManagerClientObjectPath,
+    dBusObjectManagerClientObjectPath       ,
     getDBusObjectManagerClientObjectPath    ,
 
 
@@ -147,9 +156,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -339,6 +348,7 @@
 -- VVV Prop "bus-type"
    -- Type: TInterface "Gio" "BusType"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructDBusObjectManagerClientBusType :: BusType -> IO ([Char], GValue)
 constructDBusObjectManagerClientBusType val = constructObjectPropertyEnum "bus-type" val
@@ -353,20 +363,22 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientBusType
+    attrClear _ = undefined
 
 -- VVV Prop "connection"
    -- Type: TInterface "Gio" "DBusConnection"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusObjectManagerClientConnection :: (MonadIO m, DBusObjectManagerClientK o) => o -> m DBusConnection
-getDBusObjectManagerClientConnection obj = liftIO $ getObjectPropertyObject obj "connection" DBusConnection
+getDBusObjectManagerClientConnection obj = liftIO $ checkUnexpectedNothing "getDBusObjectManagerClientConnection" $ getObjectPropertyObject obj "connection" DBusConnection
 
 constructDBusObjectManagerClientConnection :: (DBusConnectionK a) => a -> IO ([Char], GValue)
-constructDBusObjectManagerClientConnection val = constructObjectPropertyObject "connection" val
+constructDBusObjectManagerClientConnection val = constructObjectPropertyObject "connection" (Just val)
 
 data DBusObjectManagerClientConnectionPropertyInfo
 instance AttrInfo DBusObjectManagerClientConnectionPropertyInfo where
-    type AttrAllowedOps DBusObjectManagerClientConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerClientConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerClientConnectionPropertyInfo = DBusConnectionK
     type AttrBaseTypeConstraint DBusObjectManagerClientConnectionPropertyInfo = DBusObjectManagerClientK
     type AttrGetType DBusObjectManagerClientConnectionPropertyInfo = DBusConnection
@@ -374,10 +386,12 @@
     attrGet _ = getDBusObjectManagerClientConnection
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientConnection
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "DBusObjectManagerClientFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusObjectManagerClientFlags :: (MonadIO m, DBusObjectManagerClientK o) => o -> m [DBusObjectManagerClientFlags]
 getDBusObjectManagerClientFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -395,15 +409,17 @@
     attrGet _ = getDBusObjectManagerClientFlags
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientFlags
+    attrClear _ = undefined
 
 -- VVV Prop "get-proxy-type-destroy-notify"
-   -- Type: TBasicType TVoid
+   -- Type: TBasicType TPtr
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusObjectManagerClientGetProxyTypeDestroyNotify :: (MonadIO m, DBusObjectManagerClientK o) => o -> m (Ptr ())
 getDBusObjectManagerClientGetProxyTypeDestroyNotify obj = liftIO $ getObjectPropertyPtr obj "get-proxy-type-destroy-notify"
 
-constructDBusObjectManagerClientGetProxyTypeDestroyNotify :: (Ptr ()) -> IO ([Char], GValue)
+constructDBusObjectManagerClientGetProxyTypeDestroyNotify :: Ptr () -> IO ([Char], GValue)
 constructDBusObjectManagerClientGetProxyTypeDestroyNotify val = constructObjectPropertyPtr "get-proxy-type-destroy-notify" val
 
 data DBusObjectManagerClientGetProxyTypeDestroyNotifyPropertyInfo
@@ -416,15 +432,17 @@
     attrGet _ = getDBusObjectManagerClientGetProxyTypeDestroyNotify
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientGetProxyTypeDestroyNotify
+    attrClear _ = undefined
 
 -- VVV Prop "get-proxy-type-func"
-   -- Type: TBasicType TVoid
+   -- Type: TBasicType TPtr
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusObjectManagerClientGetProxyTypeFunc :: (MonadIO m, DBusObjectManagerClientK o) => o -> m (Ptr ())
 getDBusObjectManagerClientGetProxyTypeFunc obj = liftIO $ getObjectPropertyPtr obj "get-proxy-type-func"
 
-constructDBusObjectManagerClientGetProxyTypeFunc :: (Ptr ()) -> IO ([Char], GValue)
+constructDBusObjectManagerClientGetProxyTypeFunc :: Ptr () -> IO ([Char], GValue)
 constructDBusObjectManagerClientGetProxyTypeFunc val = constructObjectPropertyPtr "get-proxy-type-func" val
 
 data DBusObjectManagerClientGetProxyTypeFuncPropertyInfo
@@ -437,15 +455,17 @@
     attrGet _ = getDBusObjectManagerClientGetProxyTypeFunc
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientGetProxyTypeFunc
+    attrClear _ = undefined
 
 -- VVV Prop "get-proxy-type-user-data"
-   -- Type: TBasicType TVoid
+   -- Type: TBasicType TPtr
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusObjectManagerClientGetProxyTypeUserData :: (MonadIO m, DBusObjectManagerClientK o) => o -> m (Ptr ())
 getDBusObjectManagerClientGetProxyTypeUserData obj = liftIO $ getObjectPropertyPtr obj "get-proxy-type-user-data"
 
-constructDBusObjectManagerClientGetProxyTypeUserData :: (Ptr ()) -> IO ([Char], GValue)
+constructDBusObjectManagerClientGetProxyTypeUserData :: Ptr () -> IO ([Char], GValue)
 constructDBusObjectManagerClientGetProxyTypeUserData val = constructObjectPropertyPtr "get-proxy-type-user-data" val
 
 data DBusObjectManagerClientGetProxyTypeUserDataPropertyInfo
@@ -458,20 +478,22 @@
     attrGet _ = getDBusObjectManagerClientGetProxyTypeUserData
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientGetProxyTypeUserData
+    attrClear _ = undefined
 
 -- VVV Prop "name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusObjectManagerClientName :: (MonadIO m, DBusObjectManagerClientK o) => o -> m T.Text
-getDBusObjectManagerClientName obj = liftIO $ getObjectPropertyString obj "name"
+getDBusObjectManagerClientName obj = liftIO $ checkUnexpectedNothing "getDBusObjectManagerClientName" $ getObjectPropertyString obj "name"
 
 constructDBusObjectManagerClientName :: T.Text -> IO ([Char], GValue)
-constructDBusObjectManagerClientName val = constructObjectPropertyString "name" val
+constructDBusObjectManagerClientName val = constructObjectPropertyString "name" (Just val)
 
 data DBusObjectManagerClientNamePropertyInfo
 instance AttrInfo DBusObjectManagerClientNamePropertyInfo where
-    type AttrAllowedOps DBusObjectManagerClientNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerClientNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerClientNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusObjectManagerClientNamePropertyInfo = DBusObjectManagerClientK
     type AttrGetType DBusObjectManagerClientNamePropertyInfo = T.Text
@@ -479,49 +501,81 @@
     attrGet _ = getDBusObjectManagerClientName
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientName
+    attrClear _ = undefined
 
 -- VVV Prop "name-owner"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectManagerClientNameOwner :: (MonadIO m, DBusObjectManagerClientK o) => o -> m T.Text
+getDBusObjectManagerClientNameOwner :: (MonadIO m, DBusObjectManagerClientK o) => o -> m (Maybe T.Text)
 getDBusObjectManagerClientNameOwner obj = liftIO $ getObjectPropertyString obj "name-owner"
 
 data DBusObjectManagerClientNameOwnerPropertyInfo
 instance AttrInfo DBusObjectManagerClientNameOwnerPropertyInfo where
-    type AttrAllowedOps DBusObjectManagerClientNameOwnerPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerClientNameOwnerPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerClientNameOwnerPropertyInfo = (~) ()
     type AttrBaseTypeConstraint DBusObjectManagerClientNameOwnerPropertyInfo = DBusObjectManagerClientK
-    type AttrGetType DBusObjectManagerClientNameOwnerPropertyInfo = T.Text
+    type AttrGetType DBusObjectManagerClientNameOwnerPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusObjectManagerClientNameOwnerPropertyInfo = "name-owner"
     attrGet _ = getDBusObjectManagerClientNameOwner
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "object-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectManagerClientObjectPath :: (MonadIO m, DBusObjectManagerClientK o) => o -> m T.Text
+getDBusObjectManagerClientObjectPath :: (MonadIO m, DBusObjectManagerClientK o) => o -> m (Maybe T.Text)
 getDBusObjectManagerClientObjectPath obj = liftIO $ getObjectPropertyString obj "object-path"
 
 constructDBusObjectManagerClientObjectPath :: T.Text -> IO ([Char], GValue)
-constructDBusObjectManagerClientObjectPath val = constructObjectPropertyString "object-path" val
+constructDBusObjectManagerClientObjectPath val = constructObjectPropertyString "object-path" (Just val)
 
 data DBusObjectManagerClientObjectPathPropertyInfo
 instance AttrInfo DBusObjectManagerClientObjectPathPropertyInfo where
-    type AttrAllowedOps DBusObjectManagerClientObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerClientObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerClientObjectPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusObjectManagerClientObjectPathPropertyInfo = DBusObjectManagerClientK
-    type AttrGetType DBusObjectManagerClientObjectPathPropertyInfo = T.Text
+    type AttrGetType DBusObjectManagerClientObjectPathPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusObjectManagerClientObjectPathPropertyInfo = "object-path"
     attrGet _ = getDBusObjectManagerClientObjectPath
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerClientObjectPath
+    attrClear _ = undefined
 
 type instance AttributeList DBusObjectManagerClient = DBusObjectManagerClientAttributeList
 type DBusObjectManagerClientAttributeList = ('[ '("busType", DBusObjectManagerClientBusTypePropertyInfo), '("connection", DBusObjectManagerClientConnectionPropertyInfo), '("flags", DBusObjectManagerClientFlagsPropertyInfo), '("getProxyTypeDestroyNotify", DBusObjectManagerClientGetProxyTypeDestroyNotifyPropertyInfo), '("getProxyTypeFunc", DBusObjectManagerClientGetProxyTypeFuncPropertyInfo), '("getProxyTypeUserData", DBusObjectManagerClientGetProxyTypeUserDataPropertyInfo), '("name", DBusObjectManagerClientNamePropertyInfo), '("nameOwner", DBusObjectManagerClientNameOwnerPropertyInfo), '("objectPath", DBusObjectManagerClientObjectPathPropertyInfo)] :: [(Symbol, *)])
 
+dBusObjectManagerClientBusType :: AttrLabelProxy "busType"
+dBusObjectManagerClientBusType = AttrLabelProxy
+
+dBusObjectManagerClientConnection :: AttrLabelProxy "connection"
+dBusObjectManagerClientConnection = AttrLabelProxy
+
+dBusObjectManagerClientFlags :: AttrLabelProxy "flags"
+dBusObjectManagerClientFlags = AttrLabelProxy
+
+dBusObjectManagerClientGetProxyTypeDestroyNotify :: AttrLabelProxy "getProxyTypeDestroyNotify"
+dBusObjectManagerClientGetProxyTypeDestroyNotify = AttrLabelProxy
+
+dBusObjectManagerClientGetProxyTypeFunc :: AttrLabelProxy "getProxyTypeFunc"
+dBusObjectManagerClientGetProxyTypeFunc = AttrLabelProxy
+
+dBusObjectManagerClientGetProxyTypeUserData :: AttrLabelProxy "getProxyTypeUserData"
+dBusObjectManagerClientGetProxyTypeUserData = AttrLabelProxy
+
+dBusObjectManagerClientName :: AttrLabelProxy "name"
+dBusObjectManagerClientName = AttrLabelProxy
+
+dBusObjectManagerClientNameOwner :: AttrLabelProxy "nameOwner"
+dBusObjectManagerClientNameOwner = AttrLabelProxy
+
+dBusObjectManagerClientObjectPath :: AttrLabelProxy "objectPath"
+dBusObjectManagerClientObjectPath = AttrLabelProxy
+
 data DBusObjectManagerClientInterfaceProxyPropertiesChangedSignalInfo
 instance SignalInfo DBusObjectManagerClientInterfaceProxyPropertiesChangedSignalInfo where
     type HaskellCallbackType DBusObjectManagerClientInterfaceProxyPropertiesChangedSignalInfo = DBusObjectManagerClientInterfaceProxyPropertiesChangedCallback
@@ -539,7 +593,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerClient"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerClient")
 -- throws : True
 -- Skip return : False
 
@@ -569,7 +623,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerClient"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerClient")
 -- throws : True
 -- Skip return : False
 
@@ -597,9 +651,9 @@
 
 -- method DBusObjectManagerClient::new_for_bus_sync
 -- method type : Constructor
--- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerClient"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerClient")
 -- throws : True
 -- Skip return : False
 
@@ -609,7 +663,7 @@
     CString ->                              -- name : TBasicType TUTF8
     CString ->                              -- object_path : TBasicType TUTF8
     FunPtr DBusProxyTypeFuncC ->            -- get_proxy_type_func : TInterface "Gio" "DBusProxyTypeFunc"
-    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TVoid
+    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- get_proxy_type_destroy_notify : TInterface "GLib" "DestroyNotify"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
@@ -657,9 +711,9 @@
 
 -- method DBusObjectManagerClient::new_sync
 -- method type : Constructor
--- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerClient"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerClient")
 -- throws : True
 -- Skip return : False
 
@@ -669,7 +723,7 @@
     CString ->                              -- name : TBasicType TUTF8
     CString ->                              -- object_path : TBasicType TUTF8
     FunPtr DBusProxyTypeFuncC ->            -- get_proxy_type_func : TInterface "Gio" "DBusProxyTypeFunc"
-    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TVoid
+    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- get_proxy_type_destroy_notify : TInterface "GLib" "DestroyNotify"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
@@ -724,7 +778,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -753,7 +807,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerClientFlags"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerClientFlags")
 -- throws : False
 -- Skip return : False
 
@@ -781,7 +835,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -810,7 +864,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -822,25 +876,26 @@
 dBusObjectManagerClientGetNameOwner ::
     (MonadIO m, DBusObjectManagerClientK a) =>
     a                                       -- _obj
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 dBusObjectManagerClientGetNameOwner _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_dbus_object_manager_client_get_name_owner _obj'
-    checkUnexpectedReturnNULL "g_dbus_object_manager_client_get_name_owner" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
-    return result'
+    return maybeResult
 
 data DBusObjectManagerClientGetNameOwnerMethodInfo
-instance (signature ~ (m T.Text), MonadIO m, DBusObjectManagerClientK a) => MethodInfo DBusObjectManagerClientGetNameOwnerMethodInfo a signature where
+instance (signature ~ (m (Maybe T.Text)), MonadIO m, DBusObjectManagerClientK a) => MethodInfo DBusObjectManagerClientGetNameOwnerMethodInfo a signature where
     overloadedMethod _ = dBusObjectManagerClientGetNameOwner
 
 -- method DBusObjectManagerClient::new
 -- method type : MemberFunction
--- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 9, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 9, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -850,11 +905,11 @@
     CString ->                              -- name : TBasicType TUTF8
     CString ->                              -- object_path : TBasicType TUTF8
     FunPtr DBusProxyTypeFuncC ->            -- get_proxy_type_func : TInterface "Gio" "DBusProxyTypeFunc"
-    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TVoid
+    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- get_proxy_type_destroy_notify : TInterface "GLib" "DestroyNotify"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -902,9 +957,9 @@
 
 -- method DBusObjectManagerClient::new_for_bus
 -- method type : MemberFunction
--- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 9, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusObjectManagerClientFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_func", argType = TInterface "Gio" "DBusProxyTypeFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeNotified, argClosure = 5, argDestroy = 6, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "get_proxy_type_destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 9, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -914,11 +969,11 @@
     CString ->                              -- name : TBasicType TUTF8
     CString ->                              -- object_path : TBasicType TUTF8
     FunPtr DBusProxyTypeFuncC ->            -- get_proxy_type_func : TInterface "Gio" "DBusProxyTypeFunc"
-    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TVoid
+    Ptr () ->                               -- get_proxy_type_user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- get_proxy_type_destroy_notify : TInterface "GLib" "DestroyNotify"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
diff --git a/GI/Gio/Objects/DBusObjectManagerClient.hs-boot b/GI/Gio/Objects/DBusObjectManagerClient.hs-boot
--- a/GI/Gio/Objects/DBusObjectManagerClient.hs-boot
+++ b/GI/Gio/Objects/DBusObjectManagerClient.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusObjectManagerClient where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusObjectManagerServer.hs b/GI/Gio/Objects/DBusObjectManagerServer.hs
--- a/GI/Gio/Objects/DBusObjectManagerServer.hs
+++ b/GI/Gio/Objects/DBusObjectManagerServer.hs
@@ -56,7 +56,9 @@
  -- * Properties
 -- ** Connection
     DBusObjectManagerServerConnectionPropertyInfo,
+    clearDBusObjectManagerServerConnection  ,
     constructDBusObjectManagerServerConnection,
+    dBusObjectManagerServerConnection       ,
     getDBusObjectManagerServerConnection    ,
     setDBusObjectManagerServerConnection    ,
 
@@ -64,6 +66,7 @@
 -- ** ObjectPath
     DBusObjectManagerServerObjectPathPropertyInfo,
     constructDBusObjectManagerServerObjectPath,
+    dBusObjectManagerServerObjectPath       ,
     getDBusObjectManagerServerObjectPath    ,
 
 
@@ -71,9 +74,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -149,51 +152,64 @@
 -- VVV Prop "connection"
    -- Type: TInterface "Gio" "DBusConnection"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just True)
 
-getDBusObjectManagerServerConnection :: (MonadIO m, DBusObjectManagerServerK o) => o -> m DBusConnection
+getDBusObjectManagerServerConnection :: (MonadIO m, DBusObjectManagerServerK o) => o -> m (Maybe DBusConnection)
 getDBusObjectManagerServerConnection obj = liftIO $ getObjectPropertyObject obj "connection" DBusConnection
 
 setDBusObjectManagerServerConnection :: (MonadIO m, DBusObjectManagerServerK o, DBusConnectionK a) => o -> a -> m ()
-setDBusObjectManagerServerConnection obj val = liftIO $ setObjectPropertyObject obj "connection" val
+setDBusObjectManagerServerConnection obj val = liftIO $ setObjectPropertyObject obj "connection" (Just val)
 
 constructDBusObjectManagerServerConnection :: (DBusConnectionK a) => a -> IO ([Char], GValue)
-constructDBusObjectManagerServerConnection val = constructObjectPropertyObject "connection" val
+constructDBusObjectManagerServerConnection val = constructObjectPropertyObject "connection" (Just val)
 
+clearDBusObjectManagerServerConnection :: (MonadIO m, DBusObjectManagerServerK o) => o -> m ()
+clearDBusObjectManagerServerConnection obj = liftIO $ setObjectPropertyObject obj "connection" (Nothing :: Maybe DBusConnection)
+
 data DBusObjectManagerServerConnectionPropertyInfo
 instance AttrInfo DBusObjectManagerServerConnectionPropertyInfo where
-    type AttrAllowedOps DBusObjectManagerServerConnectionPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerServerConnectionPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerServerConnectionPropertyInfo = DBusConnectionK
     type AttrBaseTypeConstraint DBusObjectManagerServerConnectionPropertyInfo = DBusObjectManagerServerK
-    type AttrGetType DBusObjectManagerServerConnectionPropertyInfo = DBusConnection
+    type AttrGetType DBusObjectManagerServerConnectionPropertyInfo = (Maybe DBusConnection)
     type AttrLabel DBusObjectManagerServerConnectionPropertyInfo = "connection"
     attrGet _ = getDBusObjectManagerServerConnection
     attrSet _ = setDBusObjectManagerServerConnection
     attrConstruct _ = constructDBusObjectManagerServerConnection
+    attrClear _ = clearDBusObjectManagerServerConnection
 
 -- VVV Prop "object-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectManagerServerObjectPath :: (MonadIO m, DBusObjectManagerServerK o) => o -> m T.Text
+getDBusObjectManagerServerObjectPath :: (MonadIO m, DBusObjectManagerServerK o) => o -> m (Maybe T.Text)
 getDBusObjectManagerServerObjectPath obj = liftIO $ getObjectPropertyString obj "object-path"
 
 constructDBusObjectManagerServerObjectPath :: T.Text -> IO ([Char], GValue)
-constructDBusObjectManagerServerObjectPath val = constructObjectPropertyString "object-path" val
+constructDBusObjectManagerServerObjectPath val = constructObjectPropertyString "object-path" (Just val)
 
 data DBusObjectManagerServerObjectPathPropertyInfo
 instance AttrInfo DBusObjectManagerServerObjectPathPropertyInfo where
-    type AttrAllowedOps DBusObjectManagerServerObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectManagerServerObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectManagerServerObjectPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusObjectManagerServerObjectPathPropertyInfo = DBusObjectManagerServerK
-    type AttrGetType DBusObjectManagerServerObjectPathPropertyInfo = T.Text
+    type AttrGetType DBusObjectManagerServerObjectPathPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusObjectManagerServerObjectPathPropertyInfo = "object-path"
     attrGet _ = getDBusObjectManagerServerObjectPath
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectManagerServerObjectPath
+    attrClear _ = undefined
 
 type instance AttributeList DBusObjectManagerServer = DBusObjectManagerServerAttributeList
 type DBusObjectManagerServerAttributeList = ('[ '("connection", DBusObjectManagerServerConnectionPropertyInfo), '("objectPath", DBusObjectManagerServerObjectPathPropertyInfo)] :: [(Symbol, *)])
 
+dBusObjectManagerServerConnection :: AttrLabelProxy "connection"
+dBusObjectManagerServerConnection = AttrLabelProxy
+
+dBusObjectManagerServerObjectPath :: AttrLabelProxy "objectPath"
+dBusObjectManagerServerObjectPath = AttrLabelProxy
+
 type instance SignalList DBusObjectManagerServer = DBusObjectManagerServerSignalList
 type DBusObjectManagerServerSignalList = ('[ '("interfaceAdded", DBusObjectManagerInterfaceAddedSignalInfo), '("interfaceRemoved", DBusObjectManagerInterfaceRemovedSignalInfo), '("notify", GObject.ObjectNotifySignalInfo), '("objectAdded", DBusObjectManagerObjectAddedSignalInfo), '("objectRemoved", DBusObjectManagerObjectRemovedSignalInfo)] :: [(Symbol, *)])
 
@@ -201,7 +217,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectManagerServer"
+-- returnType : Just (TInterface "Gio" "DBusObjectManagerServer")
 -- throws : False
 -- Skip return : False
 
@@ -226,7 +242,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -257,7 +273,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -288,7 +304,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -317,7 +333,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -349,7 +365,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -384,7 +400,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectManagerServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusObjectManagerServer.hs-boot b/GI/Gio/Objects/DBusObjectManagerServer.hs-boot
--- a/GI/Gio/Objects/DBusObjectManagerServer.hs-boot
+++ b/GI/Gio/Objects/DBusObjectManagerServer.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusObjectManagerServer where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusObjectProxy.hs b/GI/Gio/Objects/DBusObjectProxy.hs
--- a/GI/Gio/Objects/DBusObjectProxy.hs
+++ b/GI/Gio/Objects/DBusObjectProxy.hs
@@ -32,12 +32,14 @@
 -- ** GConnection
     DBusObjectProxyGConnectionPropertyInfo  ,
     constructDBusObjectProxyGConnection     ,
+    dBusObjectProxyGConnection              ,
     getDBusObjectProxyGConnection           ,
 
 
 -- ** GObjectPath
     DBusObjectProxyGObjectPathPropertyInfo  ,
     constructDBusObjectProxyGObjectPath     ,
+    dBusObjectProxyGObjectPath              ,
     getDBusObjectProxyGObjectPath           ,
 
 
@@ -45,9 +47,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -117,48 +119,58 @@
 -- VVV Prop "g-connection"
    -- Type: TInterface "Gio" "DBusConnection"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectProxyGConnection :: (MonadIO m, DBusObjectProxyK o) => o -> m DBusConnection
+getDBusObjectProxyGConnection :: (MonadIO m, DBusObjectProxyK o) => o -> m (Maybe DBusConnection)
 getDBusObjectProxyGConnection obj = liftIO $ getObjectPropertyObject obj "g-connection" DBusConnection
 
 constructDBusObjectProxyGConnection :: (DBusConnectionK a) => a -> IO ([Char], GValue)
-constructDBusObjectProxyGConnection val = constructObjectPropertyObject "g-connection" val
+constructDBusObjectProxyGConnection val = constructObjectPropertyObject "g-connection" (Just val)
 
 data DBusObjectProxyGConnectionPropertyInfo
 instance AttrInfo DBusObjectProxyGConnectionPropertyInfo where
-    type AttrAllowedOps DBusObjectProxyGConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectProxyGConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectProxyGConnectionPropertyInfo = DBusConnectionK
     type AttrBaseTypeConstraint DBusObjectProxyGConnectionPropertyInfo = DBusObjectProxyK
-    type AttrGetType DBusObjectProxyGConnectionPropertyInfo = DBusConnection
+    type AttrGetType DBusObjectProxyGConnectionPropertyInfo = (Maybe DBusConnection)
     type AttrLabel DBusObjectProxyGConnectionPropertyInfo = "g-connection"
     attrGet _ = getDBusObjectProxyGConnection
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectProxyGConnection
+    attrClear _ = undefined
 
 -- VVV Prop "g-object-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectProxyGObjectPath :: (MonadIO m, DBusObjectProxyK o) => o -> m T.Text
+getDBusObjectProxyGObjectPath :: (MonadIO m, DBusObjectProxyK o) => o -> m (Maybe T.Text)
 getDBusObjectProxyGObjectPath obj = liftIO $ getObjectPropertyString obj "g-object-path"
 
 constructDBusObjectProxyGObjectPath :: T.Text -> IO ([Char], GValue)
-constructDBusObjectProxyGObjectPath val = constructObjectPropertyString "g-object-path" val
+constructDBusObjectProxyGObjectPath val = constructObjectPropertyString "g-object-path" (Just val)
 
 data DBusObjectProxyGObjectPathPropertyInfo
 instance AttrInfo DBusObjectProxyGObjectPathPropertyInfo where
-    type AttrAllowedOps DBusObjectProxyGObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectProxyGObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectProxyGObjectPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusObjectProxyGObjectPathPropertyInfo = DBusObjectProxyK
-    type AttrGetType DBusObjectProxyGObjectPathPropertyInfo = T.Text
+    type AttrGetType DBusObjectProxyGObjectPathPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusObjectProxyGObjectPathPropertyInfo = "g-object-path"
     attrGet _ = getDBusObjectProxyGObjectPath
     attrSet _ = undefined
     attrConstruct _ = constructDBusObjectProxyGObjectPath
+    attrClear _ = undefined
 
 type instance AttributeList DBusObjectProxy = DBusObjectProxyAttributeList
 type DBusObjectProxyAttributeList = ('[ '("gConnection", DBusObjectProxyGConnectionPropertyInfo), '("gObjectPath", DBusObjectProxyGObjectPathPropertyInfo)] :: [(Symbol, *)])
 
+dBusObjectProxyGConnection :: AttrLabelProxy "gConnection"
+dBusObjectProxyGConnection = AttrLabelProxy
+
+dBusObjectProxyGObjectPath :: AttrLabelProxy "gObjectPath"
+dBusObjectProxyGObjectPath = AttrLabelProxy
+
 type instance SignalList DBusObjectProxy = DBusObjectProxySignalList
 type DBusObjectProxySignalList = ('[ '("interfaceAdded", DBusObjectInterfaceAddedSignalInfo), '("interfaceRemoved", DBusObjectInterfaceRemovedSignalInfo), '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -166,7 +178,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectProxy"
+-- returnType : Just (TInterface "Gio" "DBusObjectProxy")
 -- throws : False
 -- Skip return : False
 
@@ -195,7 +207,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusObjectProxy.hs-boot b/GI/Gio/Objects/DBusObjectProxy.hs-boot
--- a/GI/Gio/Objects/DBusObjectProxy.hs-boot
+++ b/GI/Gio/Objects/DBusObjectProxy.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusObjectProxy where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusObjectSkeleton.hs b/GI/Gio/Objects/DBusObjectSkeleton.hs
--- a/GI/Gio/Objects/DBusObjectSkeleton.hs
+++ b/GI/Gio/Objects/DBusObjectSkeleton.hs
@@ -51,7 +51,9 @@
  -- * Properties
 -- ** GObjectPath
     DBusObjectSkeletonGObjectPathPropertyInfo,
+    clearDBusObjectSkeletonGObjectPath      ,
     constructDBusObjectSkeletonGObjectPath  ,
+    dBusObjectSkeletonGObjectPath           ,
     getDBusObjectSkeletonGObjectPath        ,
     setDBusObjectSkeletonGObjectPath        ,
 
@@ -75,9 +77,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -199,30 +201,38 @@
 -- VVV Prop "g-object-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusObjectSkeletonGObjectPath :: (MonadIO m, DBusObjectSkeletonK o) => o -> m T.Text
+getDBusObjectSkeletonGObjectPath :: (MonadIO m, DBusObjectSkeletonK o) => o -> m (Maybe T.Text)
 getDBusObjectSkeletonGObjectPath obj = liftIO $ getObjectPropertyString obj "g-object-path"
 
 setDBusObjectSkeletonGObjectPath :: (MonadIO m, DBusObjectSkeletonK o) => o -> T.Text -> m ()
-setDBusObjectSkeletonGObjectPath obj val = liftIO $ setObjectPropertyString obj "g-object-path" val
+setDBusObjectSkeletonGObjectPath obj val = liftIO $ setObjectPropertyString obj "g-object-path" (Just val)
 
 constructDBusObjectSkeletonGObjectPath :: T.Text -> IO ([Char], GValue)
-constructDBusObjectSkeletonGObjectPath val = constructObjectPropertyString "g-object-path" val
+constructDBusObjectSkeletonGObjectPath val = constructObjectPropertyString "g-object-path" (Just val)
 
+clearDBusObjectSkeletonGObjectPath :: (MonadIO m, DBusObjectSkeletonK o) => o -> m ()
+clearDBusObjectSkeletonGObjectPath obj = liftIO $ setObjectPropertyString obj "g-object-path" (Nothing :: Maybe T.Text)
+
 data DBusObjectSkeletonGObjectPathPropertyInfo
 instance AttrInfo DBusObjectSkeletonGObjectPathPropertyInfo where
-    type AttrAllowedOps DBusObjectSkeletonGObjectPathPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusObjectSkeletonGObjectPathPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusObjectSkeletonGObjectPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusObjectSkeletonGObjectPathPropertyInfo = DBusObjectSkeletonK
-    type AttrGetType DBusObjectSkeletonGObjectPathPropertyInfo = T.Text
+    type AttrGetType DBusObjectSkeletonGObjectPathPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusObjectSkeletonGObjectPathPropertyInfo = "g-object-path"
     attrGet _ = getDBusObjectSkeletonGObjectPath
     attrSet _ = setDBusObjectSkeletonGObjectPath
     attrConstruct _ = constructDBusObjectSkeletonGObjectPath
+    attrClear _ = clearDBusObjectSkeletonGObjectPath
 
 type instance AttributeList DBusObjectSkeleton = DBusObjectSkeletonAttributeList
 type DBusObjectSkeletonAttributeList = ('[ '("gObjectPath", DBusObjectSkeletonGObjectPathPropertyInfo)] :: [(Symbol, *)])
 
+dBusObjectSkeletonGObjectPath :: AttrLabelProxy "gObjectPath"
+dBusObjectSkeletonGObjectPath = AttrLabelProxy
+
 data DBusObjectSkeletonAuthorizeMethodSignalInfo
 instance SignalInfo DBusObjectSkeletonAuthorizeMethodSignalInfo where
     type HaskellCallbackType DBusObjectSkeletonAuthorizeMethodSignalInfo = DBusObjectSkeletonAuthorizeMethodCallback
@@ -235,7 +245,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusObjectSkeleton"
+-- returnType : Just (TInterface "Gio" "DBusObjectSkeleton")
 -- throws : False
 -- Skip return : False
 
@@ -260,7 +270,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -273,14 +283,14 @@
 dBusObjectSkeletonAddInterface ::
     (MonadIO m, DBusObjectSkeletonK a, DBusInterfaceSkeletonK b) =>
     a                                       -- _obj
-    -> b                                    -- interface
+    -> b                                    -- interface_
     -> m ()                                 -- result
-dBusObjectSkeletonAddInterface _obj interface = liftIO $ do
+dBusObjectSkeletonAddInterface _obj interface_ = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    let interface' = unsafeManagedPtrCastPtr interface
-    g_dbus_object_skeleton_add_interface _obj' interface'
+    let interface_' = unsafeManagedPtrCastPtr interface_
+    g_dbus_object_skeleton_add_interface _obj' interface_'
     touchManagedPtr _obj
-    touchManagedPtr interface
+    touchManagedPtr interface_
     return ()
 
 data DBusObjectSkeletonAddInterfaceMethodInfo
@@ -291,7 +301,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -318,7 +328,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_", argType = TInterface "Gio" "DBusInterfaceSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -331,14 +341,14 @@
 dBusObjectSkeletonRemoveInterface ::
     (MonadIO m, DBusObjectSkeletonK a, DBusInterfaceSkeletonK b) =>
     a                                       -- _obj
-    -> b                                    -- interface
+    -> b                                    -- interface_
     -> m ()                                 -- result
-dBusObjectSkeletonRemoveInterface _obj interface = liftIO $ do
+dBusObjectSkeletonRemoveInterface _obj interface_ = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    let interface' = unsafeManagedPtrCastPtr interface
-    g_dbus_object_skeleton_remove_interface _obj' interface'
+    let interface_' = unsafeManagedPtrCastPtr interface_
+    g_dbus_object_skeleton_remove_interface _obj' interface_'
     touchManagedPtr _obj
-    touchManagedPtr interface
+    touchManagedPtr interface_
     return ()
 
 data DBusObjectSkeletonRemoveInterfaceMethodInfo
@@ -349,7 +359,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -380,7 +390,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusObjectSkeleton", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusObjectSkeleton.hs-boot b/GI/Gio/Objects/DBusObjectSkeleton.hs-boot
--- a/GI/Gio/Objects/DBusObjectSkeleton.hs-boot
+++ b/GI/Gio/Objects/DBusObjectSkeleton.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusObjectSkeleton where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusProxy.hs b/GI/Gio/Objects/DBusProxy.hs
--- a/GI/Gio/Objects/DBusProxy.hs
+++ b/GI/Gio/Objects/DBusProxy.hs
@@ -142,17 +142,20 @@
 -- ** GBusType
     DBusProxyGBusTypePropertyInfo           ,
     constructDBusProxyGBusType              ,
+    dBusProxyGBusType                       ,
 
 
 -- ** GConnection
     DBusProxyGConnectionPropertyInfo        ,
     constructDBusProxyGConnection           ,
+    dBusProxyGConnection                    ,
     getDBusProxyGConnection                 ,
 
 
 -- ** GDefaultTimeout
     DBusProxyGDefaultTimeoutPropertyInfo    ,
     constructDBusProxyGDefaultTimeout       ,
+    dBusProxyGDefaultTimeout                ,
     getDBusProxyGDefaultTimeout             ,
     setDBusProxyGDefaultTimeout             ,
 
@@ -160,12 +163,15 @@
 -- ** GFlags
     DBusProxyGFlagsPropertyInfo             ,
     constructDBusProxyGFlags                ,
+    dBusProxyGFlags                         ,
     getDBusProxyGFlags                      ,
 
 
 -- ** GInterfaceInfo
     DBusProxyGInterfaceInfoPropertyInfo     ,
+    clearDBusProxyGInterfaceInfo            ,
     constructDBusProxyGInterfaceInfo        ,
+    dBusProxyGInterfaceInfo                 ,
     getDBusProxyGInterfaceInfo              ,
     setDBusProxyGInterfaceInfo              ,
 
@@ -173,23 +179,27 @@
 -- ** GInterfaceName
     DBusProxyGInterfaceNamePropertyInfo     ,
     constructDBusProxyGInterfaceName        ,
+    dBusProxyGInterfaceName                 ,
     getDBusProxyGInterfaceName              ,
 
 
 -- ** GName
     DBusProxyGNamePropertyInfo              ,
     constructDBusProxyGName                 ,
+    dBusProxyGName                          ,
     getDBusProxyGName                       ,
 
 
 -- ** GNameOwner
     DBusProxyGNameOwnerPropertyInfo         ,
+    dBusProxyGNameOwner                     ,
     getDBusProxyGNameOwner                  ,
 
 
 -- ** GObjectPath
     DBusProxyGObjectPathPropertyInfo        ,
     constructDBusProxyGObjectPath           ,
+    dBusProxyGObjectPath                    ,
     getDBusProxyGObjectPath                 ,
 
 
@@ -224,9 +234,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -418,6 +428,7 @@
 -- VVV Prop "g-bus-type"
    -- Type: TInterface "Gio" "BusType"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructDBusProxyGBusType :: BusType -> IO ([Char], GValue)
 constructDBusProxyGBusType val = constructObjectPropertyEnum "g-bus-type" val
@@ -432,40 +443,44 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGBusType
+    attrClear _ = undefined
 
 -- VVV Prop "g-connection"
    -- Type: TInterface "Gio" "DBusConnection"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGConnection :: (MonadIO m, DBusProxyK o) => o -> m DBusConnection
+getDBusProxyGConnection :: (MonadIO m, DBusProxyK o) => o -> m (Maybe DBusConnection)
 getDBusProxyGConnection obj = liftIO $ getObjectPropertyObject obj "g-connection" DBusConnection
 
 constructDBusProxyGConnection :: (DBusConnectionK a) => a -> IO ([Char], GValue)
-constructDBusProxyGConnection val = constructObjectPropertyObject "g-connection" val
+constructDBusProxyGConnection val = constructObjectPropertyObject "g-connection" (Just val)
 
 data DBusProxyGConnectionPropertyInfo
 instance AttrInfo DBusProxyGConnectionPropertyInfo where
-    type AttrAllowedOps DBusProxyGConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusProxyGConnectionPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGConnectionPropertyInfo = DBusConnectionK
     type AttrBaseTypeConstraint DBusProxyGConnectionPropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGConnectionPropertyInfo = DBusConnection
+    type AttrGetType DBusProxyGConnectionPropertyInfo = (Maybe DBusConnection)
     type AttrLabel DBusProxyGConnectionPropertyInfo = "g-connection"
     attrGet _ = getDBusProxyGConnection
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGConnection
+    attrClear _ = undefined
 
 -- VVV Prop "g-default-timeout"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusProxyGDefaultTimeout :: (MonadIO m, DBusProxyK o) => o -> m Int32
-getDBusProxyGDefaultTimeout obj = liftIO $ getObjectPropertyCInt obj "g-default-timeout"
+getDBusProxyGDefaultTimeout obj = liftIO $ getObjectPropertyInt32 obj "g-default-timeout"
 
 setDBusProxyGDefaultTimeout :: (MonadIO m, DBusProxyK o) => o -> Int32 -> m ()
-setDBusProxyGDefaultTimeout obj val = liftIO $ setObjectPropertyCInt obj "g-default-timeout" val
+setDBusProxyGDefaultTimeout obj val = liftIO $ setObjectPropertyInt32 obj "g-default-timeout" val
 
 constructDBusProxyGDefaultTimeout :: Int32 -> IO ([Char], GValue)
-constructDBusProxyGDefaultTimeout val = constructObjectPropertyCInt "g-default-timeout" val
+constructDBusProxyGDefaultTimeout val = constructObjectPropertyInt32 "g-default-timeout" val
 
 data DBusProxyGDefaultTimeoutPropertyInfo
 instance AttrInfo DBusProxyGDefaultTimeoutPropertyInfo where
@@ -477,10 +492,12 @@
     attrGet _ = getDBusProxyGDefaultTimeout
     attrSet _ = setDBusProxyGDefaultTimeout
     attrConstruct _ = constructDBusProxyGDefaultTimeout
+    attrClear _ = undefined
 
 -- VVV Prop "g-flags"
    -- Type: TInterface "Gio" "DBusProxyFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusProxyGFlags :: (MonadIO m, DBusProxyK o) => o -> m [DBusProxyFlags]
 getDBusProxyGFlags obj = liftIO $ getObjectPropertyFlags obj "g-flags"
@@ -498,115 +515,156 @@
     attrGet _ = getDBusProxyGFlags
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGFlags
+    attrClear _ = undefined
 
 -- VVV Prop "g-interface-info"
    -- Type: TInterface "Gio" "DBusInterfaceInfo"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGInterfaceInfo :: (MonadIO m, DBusProxyK o) => o -> m DBusInterfaceInfo
+getDBusProxyGInterfaceInfo :: (MonadIO m, DBusProxyK o) => o -> m (Maybe DBusInterfaceInfo)
 getDBusProxyGInterfaceInfo obj = liftIO $ getObjectPropertyBoxed obj "g-interface-info" DBusInterfaceInfo
 
 setDBusProxyGInterfaceInfo :: (MonadIO m, DBusProxyK o) => o -> DBusInterfaceInfo -> m ()
-setDBusProxyGInterfaceInfo obj val = liftIO $ setObjectPropertyBoxed obj "g-interface-info" val
+setDBusProxyGInterfaceInfo obj val = liftIO $ setObjectPropertyBoxed obj "g-interface-info" (Just val)
 
 constructDBusProxyGInterfaceInfo :: DBusInterfaceInfo -> IO ([Char], GValue)
-constructDBusProxyGInterfaceInfo val = constructObjectPropertyBoxed "g-interface-info" val
+constructDBusProxyGInterfaceInfo val = constructObjectPropertyBoxed "g-interface-info" (Just val)
 
+clearDBusProxyGInterfaceInfo :: (MonadIO m, DBusProxyK o) => o -> m ()
+clearDBusProxyGInterfaceInfo obj = liftIO $ setObjectPropertyBoxed obj "g-interface-info" (Nothing :: Maybe DBusInterfaceInfo)
+
 data DBusProxyGInterfaceInfoPropertyInfo
 instance AttrInfo DBusProxyGInterfaceInfoPropertyInfo where
-    type AttrAllowedOps DBusProxyGInterfaceInfoPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusProxyGInterfaceInfoPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGInterfaceInfoPropertyInfo = (~) DBusInterfaceInfo
     type AttrBaseTypeConstraint DBusProxyGInterfaceInfoPropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGInterfaceInfoPropertyInfo = DBusInterfaceInfo
+    type AttrGetType DBusProxyGInterfaceInfoPropertyInfo = (Maybe DBusInterfaceInfo)
     type AttrLabel DBusProxyGInterfaceInfoPropertyInfo = "g-interface-info"
     attrGet _ = getDBusProxyGInterfaceInfo
     attrSet _ = setDBusProxyGInterfaceInfo
     attrConstruct _ = constructDBusProxyGInterfaceInfo
+    attrClear _ = clearDBusProxyGInterfaceInfo
 
 -- VVV Prop "g-interface-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGInterfaceName :: (MonadIO m, DBusProxyK o) => o -> m T.Text
+getDBusProxyGInterfaceName :: (MonadIO m, DBusProxyK o) => o -> m (Maybe T.Text)
 getDBusProxyGInterfaceName obj = liftIO $ getObjectPropertyString obj "g-interface-name"
 
 constructDBusProxyGInterfaceName :: T.Text -> IO ([Char], GValue)
-constructDBusProxyGInterfaceName val = constructObjectPropertyString "g-interface-name" val
+constructDBusProxyGInterfaceName val = constructObjectPropertyString "g-interface-name" (Just val)
 
 data DBusProxyGInterfaceNamePropertyInfo
 instance AttrInfo DBusProxyGInterfaceNamePropertyInfo where
-    type AttrAllowedOps DBusProxyGInterfaceNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusProxyGInterfaceNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGInterfaceNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusProxyGInterfaceNamePropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGInterfaceNamePropertyInfo = T.Text
+    type AttrGetType DBusProxyGInterfaceNamePropertyInfo = (Maybe T.Text)
     type AttrLabel DBusProxyGInterfaceNamePropertyInfo = "g-interface-name"
     attrGet _ = getDBusProxyGInterfaceName
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGInterfaceName
+    attrClear _ = undefined
 
 -- VVV Prop "g-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGName :: (MonadIO m, DBusProxyK o) => o -> m T.Text
+getDBusProxyGName :: (MonadIO m, DBusProxyK o) => o -> m (Maybe T.Text)
 getDBusProxyGName obj = liftIO $ getObjectPropertyString obj "g-name"
 
 constructDBusProxyGName :: T.Text -> IO ([Char], GValue)
-constructDBusProxyGName val = constructObjectPropertyString "g-name" val
+constructDBusProxyGName val = constructObjectPropertyString "g-name" (Just val)
 
 data DBusProxyGNamePropertyInfo
 instance AttrInfo DBusProxyGNamePropertyInfo where
-    type AttrAllowedOps DBusProxyGNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusProxyGNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusProxyGNamePropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGNamePropertyInfo = T.Text
+    type AttrGetType DBusProxyGNamePropertyInfo = (Maybe T.Text)
     type AttrLabel DBusProxyGNamePropertyInfo = "g-name"
     attrGet _ = getDBusProxyGName
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGName
+    attrClear _ = undefined
 
 -- VVV Prop "g-name-owner"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGNameOwner :: (MonadIO m, DBusProxyK o) => o -> m T.Text
+getDBusProxyGNameOwner :: (MonadIO m, DBusProxyK o) => o -> m (Maybe T.Text)
 getDBusProxyGNameOwner obj = liftIO $ getObjectPropertyString obj "g-name-owner"
 
 data DBusProxyGNameOwnerPropertyInfo
 instance AttrInfo DBusProxyGNameOwnerPropertyInfo where
-    type AttrAllowedOps DBusProxyGNameOwnerPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps DBusProxyGNameOwnerPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGNameOwnerPropertyInfo = (~) ()
     type AttrBaseTypeConstraint DBusProxyGNameOwnerPropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGNameOwnerPropertyInfo = T.Text
+    type AttrGetType DBusProxyGNameOwnerPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusProxyGNameOwnerPropertyInfo = "g-name-owner"
     attrGet _ = getDBusProxyGNameOwner
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "g-object-path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusProxyGObjectPath :: (MonadIO m, DBusProxyK o) => o -> m T.Text
+getDBusProxyGObjectPath :: (MonadIO m, DBusProxyK o) => o -> m (Maybe T.Text)
 getDBusProxyGObjectPath obj = liftIO $ getObjectPropertyString obj "g-object-path"
 
 constructDBusProxyGObjectPath :: T.Text -> IO ([Char], GValue)
-constructDBusProxyGObjectPath val = constructObjectPropertyString "g-object-path" val
+constructDBusProxyGObjectPath val = constructObjectPropertyString "g-object-path" (Just val)
 
 data DBusProxyGObjectPathPropertyInfo
 instance AttrInfo DBusProxyGObjectPathPropertyInfo where
-    type AttrAllowedOps DBusProxyGObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusProxyGObjectPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusProxyGObjectPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusProxyGObjectPathPropertyInfo = DBusProxyK
-    type AttrGetType DBusProxyGObjectPathPropertyInfo = T.Text
+    type AttrGetType DBusProxyGObjectPathPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusProxyGObjectPathPropertyInfo = "g-object-path"
     attrGet _ = getDBusProxyGObjectPath
     attrSet _ = undefined
     attrConstruct _ = constructDBusProxyGObjectPath
+    attrClear _ = undefined
 
 type instance AttributeList DBusProxy = DBusProxyAttributeList
 type DBusProxyAttributeList = ('[ '("gBusType", DBusProxyGBusTypePropertyInfo), '("gConnection", DBusProxyGConnectionPropertyInfo), '("gDefaultTimeout", DBusProxyGDefaultTimeoutPropertyInfo), '("gFlags", DBusProxyGFlagsPropertyInfo), '("gInterfaceInfo", DBusProxyGInterfaceInfoPropertyInfo), '("gInterfaceName", DBusProxyGInterfaceNamePropertyInfo), '("gName", DBusProxyGNamePropertyInfo), '("gNameOwner", DBusProxyGNameOwnerPropertyInfo), '("gObjectPath", DBusProxyGObjectPathPropertyInfo)] :: [(Symbol, *)])
 
+dBusProxyGBusType :: AttrLabelProxy "gBusType"
+dBusProxyGBusType = AttrLabelProxy
+
+dBusProxyGConnection :: AttrLabelProxy "gConnection"
+dBusProxyGConnection = AttrLabelProxy
+
+dBusProxyGDefaultTimeout :: AttrLabelProxy "gDefaultTimeout"
+dBusProxyGDefaultTimeout = AttrLabelProxy
+
+dBusProxyGFlags :: AttrLabelProxy "gFlags"
+dBusProxyGFlags = AttrLabelProxy
+
+dBusProxyGInterfaceInfo :: AttrLabelProxy "gInterfaceInfo"
+dBusProxyGInterfaceInfo = AttrLabelProxy
+
+dBusProxyGInterfaceName :: AttrLabelProxy "gInterfaceName"
+dBusProxyGInterfaceName = AttrLabelProxy
+
+dBusProxyGName :: AttrLabelProxy "gName"
+dBusProxyGName = AttrLabelProxy
+
+dBusProxyGNameOwner :: AttrLabelProxy "gNameOwner"
+dBusProxyGNameOwner = AttrLabelProxy
+
+dBusProxyGObjectPath :: AttrLabelProxy "gObjectPath"
+dBusProxyGObjectPath = AttrLabelProxy
+
 data DBusProxyGPropertiesChangedSignalInfo
 instance SignalInfo DBusProxyGPropertiesChangedSignalInfo where
     type HaskellCallbackType DBusProxyGPropertiesChangedSignalInfo = DBusProxyGPropertiesChangedCallback
@@ -624,7 +682,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusProxy"
+-- returnType : Just (TInterface "Gio" "DBusProxy")
 -- throws : True
 -- Skip return : False
 
@@ -654,7 +712,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusProxy"
+-- returnType : Just (TInterface "Gio" "DBusProxy")
 -- throws : True
 -- Skip return : False
 
@@ -684,7 +742,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusProxy"
+-- returnType : Just (TInterface "Gio" "DBusProxy")
 -- throws : True
 -- Skip return : False
 
@@ -746,7 +804,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusProxy"
+-- returnType : Just (TInterface "Gio" "DBusProxy")
 -- throws : True
 -- Skip return : False
 
@@ -811,9 +869,9 @@
 
 -- method DBusProxy::call
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -822,10 +880,10 @@
     CString ->                              -- method_name : TBasicType TUTF8
     Ptr GVariant ->                         -- parameters : TVariant
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -875,7 +933,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -911,9 +969,9 @@
 
 -- method DBusProxy::call_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -922,7 +980,7 @@
     CString ->                              -- method_name : TBasicType TUTF8
     Ptr GVariant ->                         -- parameters : TVariant
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO (Ptr GVariant)
@@ -969,9 +1027,9 @@
 
 -- method DBusProxy::call_with_unix_fd_list
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -980,11 +1038,11 @@
     CString ->                              -- method_name : TBasicType TUTF8
     Ptr GVariant ->                         -- parameters : TVariant
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr UnixFDList ->                       -- fd_list : TInterface "Gio" "UnixFDList"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1041,7 +1099,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "res", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -1082,9 +1140,9 @@
 
 -- method DBusProxy::call_with_unix_fd_list_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "method_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameters", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusCallFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : True
 -- Skip return : False
 
@@ -1093,7 +1151,7 @@
     CString ->                              -- method_name : TBasicType TUTF8
     Ptr GVariant ->                         -- parameters : TVariant
     CUInt ->                                -- flags : TInterface "Gio" "DBusCallFlags"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     Ptr UnixFDList ->                       -- fd_list : TInterface "Gio" "UnixFDList"
     Ptr (Ptr UnixFDList) ->                 -- out_fd_list : TInterface "Gio" "UnixFDList"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
@@ -1156,7 +1214,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1189,7 +1247,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1220,7 +1278,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusConnection"
+-- returnType : Just (TInterface "Gio" "DBusConnection")
 -- throws : False
 -- Skip return : False
 
@@ -1249,7 +1307,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -1276,7 +1334,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusProxyFlags"
+-- returnType : Just (TInterface "Gio" "DBusProxyFlags")
 -- throws : False
 -- Skip return : False
 
@@ -1304,7 +1362,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceInfo"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceInfo")
 -- throws : False
 -- Skip return : False
 
@@ -1333,7 +1391,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1362,7 +1420,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1391,7 +1449,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1421,7 +1479,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1450,7 +1508,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1486,15 +1544,15 @@
 
 -- method DBusProxy::set_default_timeout
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_proxy_set_default_timeout" g_dbus_proxy_set_default_timeout :: 
     Ptr DBusProxy ->                        -- _obj : TInterface "Gio" "DBusProxy"
-    Int32 ->                                -- timeout_msec : TBasicType TInt32
+    Int32 ->                                -- timeout_msec : TBasicType TInt
     IO ()
 
 
@@ -1517,7 +1575,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusProxy", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1550,9 +1608,9 @@
 
 -- method DBusProxy::new
 -- method type : MemberFunction
--- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "connection", argType = TInterface "Gio" "DBusConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1565,7 +1623,7 @@
     CString ->                              -- interface_name : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1619,9 +1677,9 @@
 
 -- method DBusProxy::new_for_bus
 -- method type : MemberFunction
--- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "bus_type", argType = TInterface "Gio" "BusType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusProxyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object_path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interface_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1634,7 +1692,7 @@
     CString ->                              -- interface_name : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
diff --git a/GI/Gio/Objects/DBusProxy.hs-boot b/GI/Gio/Objects/DBusProxy.hs-boot
--- a/GI/Gio/Objects/DBusProxy.hs-boot
+++ b/GI/Gio/Objects/DBusProxy.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusProxy where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DBusServer.hs b/GI/Gio/Objects/DBusServer.hs
--- a/GI/Gio/Objects/DBusServer.hs
+++ b/GI/Gio/Objects/DBusServer.hs
@@ -56,35 +56,41 @@
  -- * Properties
 -- ** Active
     DBusServerActivePropertyInfo            ,
+    dBusServerActive                        ,
     getDBusServerActive                     ,
 
 
 -- ** Address
     DBusServerAddressPropertyInfo           ,
     constructDBusServerAddress              ,
+    dBusServerAddress                       ,
     getDBusServerAddress                    ,
 
 
 -- ** AuthenticationObserver
     DBusServerAuthenticationObserverPropertyInfo,
     constructDBusServerAuthenticationObserver,
+    dBusServerAuthenticationObserver        ,
     getDBusServerAuthenticationObserver     ,
 
 
 -- ** ClientAddress
     DBusServerClientAddressPropertyInfo     ,
+    dBusServerClientAddress                 ,
     getDBusServerClientAddress              ,
 
 
 -- ** Flags
     DBusServerFlagsPropertyInfo             ,
     constructDBusServerFlags                ,
+    dBusServerFlags                         ,
     getDBusServerFlags                      ,
 
 
 -- ** Guid
     DBusServerGuidPropertyInfo              ,
     constructDBusServerGuid                 ,
+    dBusServerGuid                          ,
     getDBusServerGuid                       ,
 
 
@@ -107,9 +113,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -226,6 +232,7 @@
 -- VVV Prop "active"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getDBusServerActive :: (MonadIO m, DBusServerK o) => o -> m Bool
 getDBusServerActive obj = liftIO $ getObjectPropertyBool obj "active"
@@ -240,59 +247,65 @@
     attrGet _ = getDBusServerActive
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "address"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusServerAddress :: (MonadIO m, DBusServerK o) => o -> m T.Text
+getDBusServerAddress :: (MonadIO m, DBusServerK o) => o -> m (Maybe T.Text)
 getDBusServerAddress obj = liftIO $ getObjectPropertyString obj "address"
 
 constructDBusServerAddress :: T.Text -> IO ([Char], GValue)
-constructDBusServerAddress val = constructObjectPropertyString "address" val
+constructDBusServerAddress val = constructObjectPropertyString "address" (Just val)
 
 data DBusServerAddressPropertyInfo
 instance AttrInfo DBusServerAddressPropertyInfo where
-    type AttrAllowedOps DBusServerAddressPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusServerAddressPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusServerAddressPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusServerAddressPropertyInfo = DBusServerK
-    type AttrGetType DBusServerAddressPropertyInfo = T.Text
+    type AttrGetType DBusServerAddressPropertyInfo = (Maybe T.Text)
     type AttrLabel DBusServerAddressPropertyInfo = "address"
     attrGet _ = getDBusServerAddress
     attrSet _ = undefined
     attrConstruct _ = constructDBusServerAddress
+    attrClear _ = undefined
 
 -- VVV Prop "authentication-observer"
    -- Type: TInterface "Gio" "DBusAuthObserver"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getDBusServerAuthenticationObserver :: (MonadIO m, DBusServerK o) => o -> m DBusAuthObserver
+getDBusServerAuthenticationObserver :: (MonadIO m, DBusServerK o) => o -> m (Maybe DBusAuthObserver)
 getDBusServerAuthenticationObserver obj = liftIO $ getObjectPropertyObject obj "authentication-observer" DBusAuthObserver
 
 constructDBusServerAuthenticationObserver :: (DBusAuthObserverK a) => a -> IO ([Char], GValue)
-constructDBusServerAuthenticationObserver val = constructObjectPropertyObject "authentication-observer" val
+constructDBusServerAuthenticationObserver val = constructObjectPropertyObject "authentication-observer" (Just val)
 
 data DBusServerAuthenticationObserverPropertyInfo
 instance AttrInfo DBusServerAuthenticationObserverPropertyInfo where
-    type AttrAllowedOps DBusServerAuthenticationObserverPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusServerAuthenticationObserverPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusServerAuthenticationObserverPropertyInfo = DBusAuthObserverK
     type AttrBaseTypeConstraint DBusServerAuthenticationObserverPropertyInfo = DBusServerK
-    type AttrGetType DBusServerAuthenticationObserverPropertyInfo = DBusAuthObserver
+    type AttrGetType DBusServerAuthenticationObserverPropertyInfo = (Maybe DBusAuthObserver)
     type AttrLabel DBusServerAuthenticationObserverPropertyInfo = "authentication-observer"
     attrGet _ = getDBusServerAuthenticationObserver
     attrSet _ = undefined
     attrConstruct _ = constructDBusServerAuthenticationObserver
+    attrClear _ = undefined
 
 -- VVV Prop "client-address"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getDBusServerClientAddress :: (MonadIO m, DBusServerK o) => o -> m T.Text
-getDBusServerClientAddress obj = liftIO $ getObjectPropertyString obj "client-address"
+getDBusServerClientAddress obj = liftIO $ checkUnexpectedNothing "getDBusServerClientAddress" $ getObjectPropertyString obj "client-address"
 
 data DBusServerClientAddressPropertyInfo
 instance AttrInfo DBusServerClientAddressPropertyInfo where
-    type AttrAllowedOps DBusServerClientAddressPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps DBusServerClientAddressPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusServerClientAddressPropertyInfo = (~) ()
     type AttrBaseTypeConstraint DBusServerClientAddressPropertyInfo = DBusServerK
     type AttrGetType DBusServerClientAddressPropertyInfo = T.Text
@@ -300,10 +313,12 @@
     attrGet _ = getDBusServerClientAddress
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "DBusServerFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusServerFlags :: (MonadIO m, DBusServerK o) => o -> m [DBusServerFlags]
 getDBusServerFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -321,20 +336,22 @@
     attrGet _ = getDBusServerFlags
     attrSet _ = undefined
     attrConstruct _ = constructDBusServerFlags
+    attrClear _ = undefined
 
 -- VVV Prop "guid"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDBusServerGuid :: (MonadIO m, DBusServerK o) => o -> m T.Text
-getDBusServerGuid obj = liftIO $ getObjectPropertyString obj "guid"
+getDBusServerGuid obj = liftIO $ checkUnexpectedNothing "getDBusServerGuid" $ getObjectPropertyString obj "guid"
 
 constructDBusServerGuid :: T.Text -> IO ([Char], GValue)
-constructDBusServerGuid val = constructObjectPropertyString "guid" val
+constructDBusServerGuid val = constructObjectPropertyString "guid" (Just val)
 
 data DBusServerGuidPropertyInfo
 instance AttrInfo DBusServerGuidPropertyInfo where
-    type AttrAllowedOps DBusServerGuidPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DBusServerGuidPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DBusServerGuidPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DBusServerGuidPropertyInfo = DBusServerK
     type AttrGetType DBusServerGuidPropertyInfo = T.Text
@@ -342,10 +359,29 @@
     attrGet _ = getDBusServerGuid
     attrSet _ = undefined
     attrConstruct _ = constructDBusServerGuid
+    attrClear _ = undefined
 
 type instance AttributeList DBusServer = DBusServerAttributeList
 type DBusServerAttributeList = ('[ '("active", DBusServerActivePropertyInfo), '("address", DBusServerAddressPropertyInfo), '("authenticationObserver", DBusServerAuthenticationObserverPropertyInfo), '("clientAddress", DBusServerClientAddressPropertyInfo), '("flags", DBusServerFlagsPropertyInfo), '("guid", DBusServerGuidPropertyInfo)] :: [(Symbol, *)])
 
+dBusServerActive :: AttrLabelProxy "active"
+dBusServerActive = AttrLabelProxy
+
+dBusServerAddress :: AttrLabelProxy "address"
+dBusServerAddress = AttrLabelProxy
+
+dBusServerAuthenticationObserver :: AttrLabelProxy "authenticationObserver"
+dBusServerAuthenticationObserver = AttrLabelProxy
+
+dBusServerClientAddress :: AttrLabelProxy "clientAddress"
+dBusServerClientAddress = AttrLabelProxy
+
+dBusServerFlags :: AttrLabelProxy "flags"
+dBusServerFlags = AttrLabelProxy
+
+dBusServerGuid :: AttrLabelProxy "guid"
+dBusServerGuid = AttrLabelProxy
+
 data DBusServerNewConnectionSignalInfo
 instance SignalInfo DBusServerNewConnectionSignalInfo where
     type HaskellCallbackType DBusServerNewConnectionSignalInfo = DBusServerNewConnectionCallback
@@ -358,7 +394,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "DBusServerFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "guid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "observer", argType = TInterface "Gio" "DBusAuthObserver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusServer"
+-- returnType : Just (TInterface "Gio" "DBusServer")
 -- throws : True
 -- Skip return : False
 
@@ -412,7 +448,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -441,7 +477,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusServerFlags"
+-- returnType : Just (TInterface "Gio" "DBusServerFlags")
 -- throws : False
 -- Skip return : False
 
@@ -469,7 +505,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -498,7 +534,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -526,7 +562,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -553,7 +589,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusServer", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DBusServer.hs-boot b/GI/Gio/Objects/DBusServer.hs-boot
--- a/GI/Gio/Objects/DBusServer.hs-boot
+++ b/GI/Gio/Objects/DBusServer.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DBusServer where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DataInputStream.hs b/GI/Gio/Objects/DataInputStream.hs
--- a/GI/Gio/Objects/DataInputStream.hs
+++ b/GI/Gio/Objects/DataInputStream.hs
@@ -137,6 +137,7 @@
 -- ** ByteOrder
     DataInputStreamByteOrderPropertyInfo    ,
     constructDataInputStreamByteOrder       ,
+    dataInputStreamByteOrder                ,
     getDataInputStreamByteOrder             ,
     setDataInputStreamByteOrder             ,
 
@@ -144,6 +145,7 @@
 -- ** NewlineType
     DataInputStreamNewlineTypePropertyInfo  ,
     constructDataInputStreamNewlineType     ,
+    dataInputStreamNewlineType              ,
     getDataInputStreamNewlineType           ,
     setDataInputStreamNewlineType           ,
 
@@ -152,9 +154,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -276,6 +278,7 @@
 -- VVV Prop "byte-order"
    -- Type: TInterface "Gio" "DataStreamByteOrder"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getDataInputStreamByteOrder :: (MonadIO m, DataInputStreamK o) => o -> m DataStreamByteOrder
 getDataInputStreamByteOrder obj = liftIO $ getObjectPropertyEnum obj "byte-order"
@@ -296,10 +299,12 @@
     attrGet _ = getDataInputStreamByteOrder
     attrSet _ = setDataInputStreamByteOrder
     attrConstruct _ = constructDataInputStreamByteOrder
+    attrClear _ = undefined
 
 -- VVV Prop "newline-type"
    -- Type: TInterface "Gio" "DataStreamNewlineType"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getDataInputStreamNewlineType :: (MonadIO m, DataInputStreamK o) => o -> m DataStreamNewlineType
 getDataInputStreamNewlineType obj = liftIO $ getObjectPropertyEnum obj "newline-type"
@@ -320,10 +325,17 @@
     attrGet _ = getDataInputStreamNewlineType
     attrSet _ = setDataInputStreamNewlineType
     attrConstruct _ = constructDataInputStreamNewlineType
+    attrClear _ = undefined
 
 type instance AttributeList DataInputStream = DataInputStreamAttributeList
 type DataInputStreamAttributeList = ('[ '("baseStream", FilterInputStreamBaseStreamPropertyInfo), '("bufferSize", BufferedInputStreamBufferSizePropertyInfo), '("byteOrder", DataInputStreamByteOrderPropertyInfo), '("closeBaseStream", FilterInputStreamCloseBaseStreamPropertyInfo), '("newlineType", DataInputStreamNewlineTypePropertyInfo)] :: [(Symbol, *)])
 
+dataInputStreamByteOrder :: AttrLabelProxy "byteOrder"
+dataInputStreamByteOrder = AttrLabelProxy
+
+dataInputStreamNewlineType :: AttrLabelProxy "newlineType"
+dataInputStreamNewlineType = AttrLabelProxy
+
 type instance SignalList DataInputStream = DataInputStreamSignalList
 type DataInputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -331,7 +343,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DataInputStream"
+-- returnType : Just (TInterface "Gio" "DataInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -356,7 +368,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DataStreamByteOrder"
+-- returnType : Just (TInterface "Gio" "DataStreamByteOrder")
 -- throws : False
 -- Skip return : False
 
@@ -384,7 +396,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DataStreamNewlineType"
+-- returnType : Just (TInterface "Gio" "DataStreamNewlineType")
 -- throws : False
 -- Skip return : False
 
@@ -412,7 +424,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt8
+-- returnType : Just (TBasicType TUInt8)
 -- throws : True
 -- Skip return : False
 
@@ -452,7 +464,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt16
+-- returnType : Just (TBasicType TInt16)
 -- throws : True
 -- Skip return : False
 
@@ -492,7 +504,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt32)
 -- throws : True
 -- Skip return : False
 
@@ -532,7 +544,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -572,7 +584,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUInt8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUInt8))
 -- throws : True
 -- Skip return : False
 
@@ -588,7 +600,7 @@
     (MonadIO m, DataInputStreamK a, CancellableK b) =>
     a                                       -- _obj
     -> Maybe (b)                            -- cancellable
-    -> m (ByteString,Word64)                -- result
+    -> m ((Maybe ByteString),Word64)        -- result
 dataInputStreamReadLine _obj cancellable = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     length_ <- allocMem :: IO (Ptr Word64)
@@ -599,36 +611,37 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_data_input_stream_read_line _obj' length_ maybeCancellable
-        checkUnexpectedReturnNULL "g_data_input_stream_read_line" result
-        result' <- unpackZeroTerminatedByteString result
-        freeMem result
+        maybeResult <- convertIfNonNull result $ \result' -> do
+            result'' <- unpackZeroTerminatedByteString result'
+            freeMem result'
+            return result''
         length_' <- peek length_
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
         freeMem length_
-        return (result', length_')
+        return (maybeResult, length_')
      ) (do
         freeMem length_
      )
 
 data DataInputStreamReadLineMethodInfo
-instance (signature ~ (Maybe (b) -> m (ByteString,Word64)), MonadIO m, DataInputStreamK a, CancellableK b) => MethodInfo DataInputStreamReadLineMethodInfo a signature where
+instance (signature ~ (Maybe (b) -> m ((Maybe ByteString),Word64)), MonadIO m, DataInputStreamK a, CancellableK b) => MethodInfo DataInputStreamReadLineMethodInfo a signature where
     overloadedMethod _ = dataInputStreamReadLine
 
 -- method DataInputStream::read_line_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_data_input_stream_read_line_async" g_data_input_stream_read_line_async :: 
     Ptr DataInputStream ->                  -- _obj : TInterface "Gio" "DataInputStream"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -667,7 +680,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUInt8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUInt8))
 -- throws : True
 -- Skip return : False
 
@@ -683,34 +696,35 @@
     (MonadIO m, DataInputStreamK a, AsyncResultK b) =>
     a                                       -- _obj
     -> b                                    -- result_
-    -> m (ByteString,Word64)                -- result
+    -> m ((Maybe ByteString),Word64)        -- result
 dataInputStreamReadLineFinish _obj result_ = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     let result_' = unsafeManagedPtrCastPtr result_
     length_ <- allocMem :: IO (Ptr Word64)
     onException (do
         result <- propagateGError $ g_data_input_stream_read_line_finish _obj' result_' length_
-        checkUnexpectedReturnNULL "g_data_input_stream_read_line_finish" result
-        result' <- unpackZeroTerminatedByteString result
-        freeMem result
+        maybeResult <- convertIfNonNull result $ \result' -> do
+            result'' <- unpackZeroTerminatedByteString result'
+            freeMem result'
+            return result''
         length_' <- peek length_
         touchManagedPtr _obj
         touchManagedPtr result_
         freeMem length_
-        return (result', length_')
+        return (maybeResult, length_')
      ) (do
         freeMem length_
      )
 
 data DataInputStreamReadLineFinishMethodInfo
-instance (signature ~ (b -> m (ByteString,Word64)), MonadIO m, DataInputStreamK a, AsyncResultK b) => MethodInfo DataInputStreamReadLineFinishMethodInfo a signature where
+instance (signature ~ (b -> m ((Maybe ByteString),Word64)), MonadIO m, DataInputStreamK a, AsyncResultK b) => MethodInfo DataInputStreamReadLineFinishMethodInfo a signature where
     overloadedMethod _ = dataInputStreamReadLineFinish
 
 -- method DataInputStream::read_line_finish_utf8
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -726,34 +740,35 @@
     (MonadIO m, DataInputStreamK a, AsyncResultK b) =>
     a                                       -- _obj
     -> b                                    -- result_
-    -> m (T.Text,Word64)                    -- result
+    -> m ((Maybe T.Text),Word64)            -- result
 dataInputStreamReadLineFinishUtf8 _obj result_ = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     let result_' = unsafeManagedPtrCastPtr result_
     length_ <- allocMem :: IO (Ptr Word64)
     onException (do
         result <- propagateGError $ g_data_input_stream_read_line_finish_utf8 _obj' result_' length_
-        checkUnexpectedReturnNULL "g_data_input_stream_read_line_finish_utf8" result
-        result' <- cstringToText result
-        freeMem result
+        maybeResult <- convertIfNonNull result $ \result' -> do
+            result'' <- cstringToText result'
+            freeMem result'
+            return result''
         length_' <- peek length_
         touchManagedPtr _obj
         touchManagedPtr result_
         freeMem length_
-        return (result', length_')
+        return (maybeResult, length_')
      ) (do
         freeMem length_
      )
 
 data DataInputStreamReadLineFinishUtf8MethodInfo
-instance (signature ~ (b -> m (T.Text,Word64)), MonadIO m, DataInputStreamK a, AsyncResultK b) => MethodInfo DataInputStreamReadLineFinishUtf8MethodInfo a signature where
+instance (signature ~ (b -> m ((Maybe T.Text),Word64)), MonadIO m, DataInputStreamK a, AsyncResultK b) => MethodInfo DataInputStreamReadLineFinishUtf8MethodInfo a signature where
     overloadedMethod _ = dataInputStreamReadLineFinishUtf8
 
 -- method DataInputStream::read_line_utf8
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -769,7 +784,7 @@
     (MonadIO m, DataInputStreamK a, CancellableK b) =>
     a                                       -- _obj
     -> Maybe (b)                            -- cancellable
-    -> m (T.Text,Word64)                    -- result
+    -> m ((Maybe T.Text),Word64)            -- result
 dataInputStreamReadLineUtf8 _obj cancellable = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     length_ <- allocMem :: IO (Ptr Word64)
@@ -780,27 +795,28 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_data_input_stream_read_line_utf8 _obj' length_ maybeCancellable
-        checkUnexpectedReturnNULL "g_data_input_stream_read_line_utf8" result
-        result' <- cstringToText result
-        freeMem result
+        maybeResult <- convertIfNonNull result $ \result' -> do
+            result'' <- cstringToText result'
+            freeMem result'
+            return result''
         length_' <- peek length_
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
         freeMem length_
-        return (result', length_')
+        return (maybeResult, length_')
      ) (do
         freeMem length_
      )
 
 data DataInputStreamReadLineUtf8MethodInfo
-instance (signature ~ (Maybe (b) -> m (T.Text,Word64)), MonadIO m, DataInputStreamK a, CancellableK b) => MethodInfo DataInputStreamReadLineUtf8MethodInfo a signature where
+instance (signature ~ (Maybe (b) -> m ((Maybe T.Text),Word64)), MonadIO m, DataInputStreamK a, CancellableK b) => MethodInfo DataInputStreamReadLineUtf8MethodInfo a signature where
     overloadedMethod _ = dataInputStreamReadLineUtf8
 
 -- method DataInputStream::read_uint16
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : True
 -- Skip return : False
 
@@ -840,7 +856,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : True
 -- Skip return : False
 
@@ -880,7 +896,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : True
 -- Skip return : False
 
@@ -920,7 +936,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -970,19 +986,19 @@
 
 -- method DataInputStream::read_until_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_data_input_stream_read_until_async" g_data_input_stream_read_until_async :: 
     Ptr DataInputStream ->                  -- _obj : TInterface "Gio" "DataInputStream"
     CString ->                              -- stop_chars : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1024,7 +1040,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -1067,7 +1083,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars_len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -1119,9 +1135,9 @@
 
 -- method DataInputStream::read_upto_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars_len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stop_chars_len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1129,10 +1145,10 @@
     Ptr DataInputStream ->                  -- _obj : TInterface "Gio" "DataInputStream"
     CString ->                              -- stop_chars : TBasicType TUTF8
     Int64 ->                                -- stop_chars_len : TBasicType TInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1175,7 +1191,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -1218,7 +1234,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "order", argType = TInterface "Gio" "DataStreamByteOrder", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1248,7 +1264,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "DataStreamNewlineType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DataInputStream.hs-boot b/GI/Gio/Objects/DataInputStream.hs-boot
--- a/GI/Gio/Objects/DataInputStream.hs-boot
+++ b/GI/Gio/Objects/DataInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DataInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DataOutputStream.hs b/GI/Gio/Objects/DataOutputStream.hs
--- a/GI/Gio/Objects/DataOutputStream.hs
+++ b/GI/Gio/Objects/DataOutputStream.hs
@@ -77,6 +77,7 @@
 -- ** ByteOrder
     DataOutputStreamByteOrderPropertyInfo   ,
     constructDataOutputStreamByteOrder      ,
+    dataOutputStreamByteOrder               ,
     getDataOutputStreamByteOrder            ,
     setDataOutputStreamByteOrder            ,
 
@@ -85,9 +86,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -194,6 +195,7 @@
 -- VVV Prop "byte-order"
    -- Type: TInterface "Gio" "DataStreamByteOrder"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getDataOutputStreamByteOrder :: (MonadIO m, DataOutputStreamK o) => o -> m DataStreamByteOrder
 getDataOutputStreamByteOrder obj = liftIO $ getObjectPropertyEnum obj "byte-order"
@@ -214,10 +216,14 @@
     attrGet _ = getDataOutputStreamByteOrder
     attrSet _ = setDataOutputStreamByteOrder
     attrConstruct _ = constructDataOutputStreamByteOrder
+    attrClear _ = undefined
 
 type instance AttributeList DataOutputStream = DataOutputStreamAttributeList
 type DataOutputStreamAttributeList = ('[ '("baseStream", FilterOutputStreamBaseStreamPropertyInfo), '("byteOrder", DataOutputStreamByteOrderPropertyInfo), '("closeBaseStream", FilterOutputStreamCloseBaseStreamPropertyInfo)] :: [(Symbol, *)])
 
+dataOutputStreamByteOrder :: AttrLabelProxy "byteOrder"
+dataOutputStreamByteOrder = AttrLabelProxy
+
 type instance SignalList DataOutputStream = DataOutputStreamSignalList
 type DataOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -225,7 +231,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DataOutputStream"
+-- returnType : Just (TInterface "Gio" "DataOutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -250,7 +256,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DataStreamByteOrder"
+-- returnType : Just (TInterface "Gio" "DataStreamByteOrder")
 -- throws : False
 -- Skip return : False
 
@@ -278,7 +284,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TUInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -320,7 +326,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -362,7 +368,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -404,7 +410,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -446,7 +452,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "str", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -490,7 +496,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -532,7 +538,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -574,7 +580,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -616,7 +622,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DataOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "order", argType = TInterface "Gio" "DataStreamByteOrder", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DataOutputStream.hs-boot b/GI/Gio/Objects/DataOutputStream.hs-boot
--- a/GI/Gio/Objects/DataOutputStream.hs-boot
+++ b/GI/Gio/Objects/DataOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DataOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/DesktopAppInfo.hs b/GI/Gio/Objects/DesktopAppInfo.hs
--- a/GI/Gio/Objects/DesktopAppInfo.hs
+++ b/GI/Gio/Objects/DesktopAppInfo.hs
@@ -121,6 +121,7 @@
 -- ** Filename
     DesktopAppInfoFilenamePropertyInfo      ,
     constructDesktopAppInfoFilename         ,
+    desktopAppInfoFilename                  ,
     getDesktopAppInfoFilename               ,
 
 
@@ -128,9 +129,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -235,16 +236,17 @@
 -- VVV Prop "filename"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getDesktopAppInfoFilename :: (MonadIO m, DesktopAppInfoK o) => o -> m T.Text
-getDesktopAppInfoFilename obj = liftIO $ getObjectPropertyString obj "filename"
+getDesktopAppInfoFilename obj = liftIO $ checkUnexpectedNothing "getDesktopAppInfoFilename" $ getObjectPropertyString obj "filename"
 
 constructDesktopAppInfoFilename :: T.Text -> IO ([Char], GValue)
-constructDesktopAppInfoFilename val = constructObjectPropertyString "filename" val
+constructDesktopAppInfoFilename val = constructObjectPropertyString "filename" (Just val)
 
 data DesktopAppInfoFilenamePropertyInfo
 instance AttrInfo DesktopAppInfoFilenamePropertyInfo where
-    type AttrAllowedOps DesktopAppInfoFilenamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps DesktopAppInfoFilenamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint DesktopAppInfoFilenamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint DesktopAppInfoFilenamePropertyInfo = DesktopAppInfoK
     type AttrGetType DesktopAppInfoFilenamePropertyInfo = T.Text
@@ -252,10 +254,14 @@
     attrGet _ = getDesktopAppInfoFilename
     attrSet _ = undefined
     attrConstruct _ = constructDesktopAppInfoFilename
+    attrClear _ = undefined
 
 type instance AttributeList DesktopAppInfo = DesktopAppInfoAttributeList
 type DesktopAppInfoAttributeList = ('[ '("filename", DesktopAppInfoFilenamePropertyInfo)] :: [(Symbol, *)])
 
+desktopAppInfoFilename :: AttrLabelProxy "filename"
+desktopAppInfoFilename = AttrLabelProxy
+
 type instance SignalList DesktopAppInfo = DesktopAppInfoSignalList
 type DesktopAppInfoSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -263,7 +269,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "desktop_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DesktopAppInfo"
+-- returnType : Just (TInterface "Gio" "DesktopAppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -288,7 +294,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "filename", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DesktopAppInfo"
+-- returnType : Just (TInterface "Gio" "DesktopAppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -313,7 +319,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "key_file", argType = TInterface "GLib" "KeyFile", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DesktopAppInfo"
+-- returnType : Just (TInterface "Gio" "DesktopAppInfo")
 -- throws : False
 -- Skip return : False
 
@@ -338,7 +344,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -372,7 +378,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -404,7 +410,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -433,7 +439,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -462,7 +468,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -491,7 +497,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -519,7 +525,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -548,7 +554,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -576,7 +582,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "desktop_env", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -612,7 +618,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -641,7 +647,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -675,7 +681,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -707,7 +713,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "launch_context", argType = TInterface "Gio" "AppLaunchContext", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -743,7 +749,7 @@
     overloadedMethod _ = desktopAppInfoLaunchAction
 
 -- XXX Could not generate method DesktopAppInfo::launch_uris_as_manager
--- Error was : Bad introspection data: "Closure not found! Callable\n  { returnType = TBasicType TBoolean\n  , returnMayBeNull = False\n  , returnTransfer = TransferNothing\n  , args =\n      [ Arg\n          { argCName = \"_obj\"\n          , argType = TInterface \"Gio\" \"DesktopAppInfo\"\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"uris\"\n          , argType = TGList (TBasicType TUTF8)\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"launch_context\"\n          , argType = TInterface \"Gio\" \"AppLaunchContext\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"spawn_flags\"\n          , argType = TInterface \"GLib\" \"SpawnFlags\"\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"user_setup\"\n          , argType = TInterface \"GLib\" \"SpawnChildSetupFunc\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeCall\n          , argClosure = 5\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"user_setup_data\"\n          , argType = TBasicType TVoid\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = 4\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"pid_callback\"\n          , argType = TInterface \"Gio\" \"DesktopAppLaunchCallback\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeCall\n          , argClosure = 7\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"pid_callback_data\"\n          , argType = TBasicType TVoid\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = 6\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      ]\n  , skipReturn = False\n  , callableDeprecated = Nothing\n  }\nfromList\n  [ ( 5\n    , Arg\n        { argCName = \"user_setup\"\n        , argType = TInterface \"GLib\" \"SpawnChildSetupFunc\"\n        , direction = DirectionIn\n        , mayBeNull = True\n        , argScope = ScopeTypeCall\n        , argClosure = 5\n        , argDestroy = -1\n        , argCallerAllocates = False\n        , transfer = TransferNothing\n        }\n    )\n  , ( 7\n    , Arg\n        { argCName = \"pid_callback\"\n        , argType = TInterface \"Gio\" \"DesktopAppLaunchCallback\"\n        , direction = DirectionIn\n        , mayBeNull = True\n        , argScope = ScopeTypeCall\n        , argClosure = 7\n        , argDestroy = -1\n        , argCallerAllocates = False\n        , transfer = TransferNothing\n        }\n    )\n  ]\n4"
+-- Error was : Bad introspection data: "Closure not found! Callable\n  { returnType = Just (TBasicType TBoolean)\n  , returnMayBeNull = False\n  , returnTransfer = TransferNothing\n  , args =\n      [ Arg\n          { argCName = \"_obj\"\n          , argType = TInterface \"Gio\" \"DesktopAppInfo\"\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"uris\"\n          , argType = TGList (TBasicType TUTF8)\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"launch_context\"\n          , argType = TInterface \"Gio\" \"AppLaunchContext\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"spawn_flags\"\n          , argType = TInterface \"GLib\" \"SpawnFlags\"\n          , direction = DirectionIn\n          , mayBeNull = False\n          , argScope = ScopeTypeInvalid\n          , argClosure = -1\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"user_setup\"\n          , argType = TInterface \"GLib\" \"SpawnChildSetupFunc\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeCall\n          , argClosure = 5\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"user_setup_data\"\n          , argType = TBasicType TPtr\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = 4\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"pid_callback\"\n          , argType = TInterface \"Gio\" \"DesktopAppLaunchCallback\"\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeCall\n          , argClosure = 7\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      , Arg\n          { argCName = \"pid_callback_data\"\n          , argType = TBasicType TPtr\n          , direction = DirectionIn\n          , mayBeNull = True\n          , argScope = ScopeTypeInvalid\n          , argClosure = 6\n          , argDestroy = -1\n          , argCallerAllocates = False\n          , transfer = TransferNothing\n          }\n      ]\n  , skipReturn = False\n  , callableDeprecated = Nothing\n  }\nfromList\n  [ ( 5\n    , Arg\n        { argCName = \"user_setup\"\n        , argType = TInterface \"GLib\" \"SpawnChildSetupFunc\"\n        , direction = DirectionIn\n        , mayBeNull = True\n        , argScope = ScopeTypeCall\n        , argClosure = 5\n        , argDestroy = -1\n        , argCallerAllocates = False\n        , transfer = TransferNothing\n        }\n    )\n  , ( 7\n    , Arg\n        { argCName = \"pid_callback\"\n        , argType = TInterface \"Gio\" \"DesktopAppLaunchCallback\"\n        , direction = DirectionIn\n        , mayBeNull = True\n        , argScope = ScopeTypeCall\n        , argClosure = 7\n        , argDestroy = -1\n        , argCallerAllocates = False\n        , transfer = TransferNothing\n        }\n    )\n  ]\n4"
 -- XXX: Dummy instance, since code generation failed.
 -- Please file a bug at http://github.com/haskell-gi/haskell-gi.
 data DesktopAppInfoLaunchUrisAsManagerMethodInfo
@@ -753,7 +759,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DesktopAppInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -782,7 +788,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "interface", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "DesktopAppInfo")
+-- returnType : Just (TGList (TInterface "Gio" "DesktopAppInfo"))
 -- throws : False
 -- Skip return : False
 
@@ -798,7 +804,6 @@
 desktopAppInfoGetImplementations interface = liftIO $ do
     interface' <- textToCString interface
     result <- g_desktop_app_info_get_implementations interface'
-    checkUnexpectedReturnNULL "g_desktop_app_info_get_implementations" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject DesktopAppInfo) result'
     g_list_free result
@@ -809,7 +814,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "search_string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TCArray True (-1) (-1) (TBasicType TUTF8))
+-- returnType : Just (TCArray True (-1) (-1) (TCArray True (-1) (-1) (TBasicType TUTF8)))
 -- throws : False
 -- Skip return : False
 
@@ -838,7 +843,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "desktop_env", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/DesktopAppInfo.hs-boot b/GI/Gio/Objects/DesktopAppInfo.hs-boot
--- a/GI/Gio/Objects/DesktopAppInfo.hs-boot
+++ b/GI/Gio/Objects/DesktopAppInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.DesktopAppInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Emblem.hs b/GI/Gio/Objects/Emblem.hs
--- a/GI/Gio/Objects/Emblem.hs
+++ b/GI/Gio/Objects/Emblem.hs
@@ -41,12 +41,14 @@
 -- ** Icon
     EmblemIconPropertyInfo                  ,
     constructEmblemIcon                     ,
+    emblemIcon                              ,
     getEmblemIcon                           ,
 
 
 -- ** Origin
     EmblemOriginPropertyInfo                ,
     constructEmblemOrigin                   ,
+    emblemOrigin                            ,
     getEmblemOrigin                         ,
 
 
@@ -54,9 +56,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -127,27 +129,30 @@
 -- VVV Prop "icon"
    -- Type: TInterface "GObject" "Object"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getEmblemIcon :: (MonadIO m, EmblemK o) => o -> m GObject.Object
+getEmblemIcon :: (MonadIO m, EmblemK o) => o -> m (Maybe GObject.Object)
 getEmblemIcon obj = liftIO $ getObjectPropertyObject obj "icon" GObject.Object
 
 constructEmblemIcon :: (GObject.ObjectK a) => a -> IO ([Char], GValue)
-constructEmblemIcon val = constructObjectPropertyObject "icon" val
+constructEmblemIcon val = constructObjectPropertyObject "icon" (Just val)
 
 data EmblemIconPropertyInfo
 instance AttrInfo EmblemIconPropertyInfo where
-    type AttrAllowedOps EmblemIconPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps EmblemIconPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint EmblemIconPropertyInfo = GObject.ObjectK
     type AttrBaseTypeConstraint EmblemIconPropertyInfo = EmblemK
-    type AttrGetType EmblemIconPropertyInfo = GObject.Object
+    type AttrGetType EmblemIconPropertyInfo = (Maybe GObject.Object)
     type AttrLabel EmblemIconPropertyInfo = "icon"
     attrGet _ = getEmblemIcon
     attrSet _ = undefined
     attrConstruct _ = constructEmblemIcon
+    attrClear _ = undefined
 
 -- VVV Prop "origin"
    -- Type: TInterface "Gio" "EmblemOrigin"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getEmblemOrigin :: (MonadIO m, EmblemK o) => o -> m EmblemOrigin
 getEmblemOrigin obj = liftIO $ getObjectPropertyEnum obj "origin"
@@ -165,10 +170,17 @@
     attrGet _ = getEmblemOrigin
     attrSet _ = undefined
     attrConstruct _ = constructEmblemOrigin
+    attrClear _ = undefined
 
 type instance AttributeList Emblem = EmblemAttributeList
 type EmblemAttributeList = ('[ '("icon", EmblemIconPropertyInfo), '("origin", EmblemOriginPropertyInfo)] :: [(Symbol, *)])
 
+emblemIcon :: AttrLabelProxy "icon"
+emblemIcon = AttrLabelProxy
+
+emblemOrigin :: AttrLabelProxy "origin"
+emblemOrigin = AttrLabelProxy
+
 type instance SignalList Emblem = EmblemSignalList
 type EmblemSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -176,7 +188,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Emblem"
+-- returnType : Just (TInterface "Gio" "Emblem")
 -- throws : False
 -- Skip return : False
 
@@ -201,7 +213,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "origin", argType = TInterface "Gio" "EmblemOrigin", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Emblem"
+-- returnType : Just (TInterface "Gio" "Emblem")
 -- throws : False
 -- Skip return : False
 
@@ -229,7 +241,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Emblem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -258,7 +270,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Emblem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "EmblemOrigin"
+-- returnType : Just (TInterface "Gio" "EmblemOrigin")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Emblem.hs-boot b/GI/Gio/Objects/Emblem.hs-boot
--- a/GI/Gio/Objects/Emblem.hs-boot
+++ b/GI/Gio/Objects/Emblem.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Emblem where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/EmblemedIcon.hs b/GI/Gio/Objects/EmblemedIcon.hs
--- a/GI/Gio/Objects/EmblemedIcon.hs
+++ b/GI/Gio/Objects/EmblemedIcon.hs
@@ -47,6 +47,7 @@
 -- ** Gicon
     EmblemedIconGiconPropertyInfo           ,
     constructEmblemedIconGicon              ,
+    emblemedIconGicon                       ,
     getEmblemedIconGicon                    ,
 
 
@@ -54,9 +55,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -129,27 +130,32 @@
 -- VVV Prop "gicon"
    -- Type: TInterface "Gio" "Icon"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getEmblemedIconGicon :: (MonadIO m, EmblemedIconK o) => o -> m Icon
+getEmblemedIconGicon :: (MonadIO m, EmblemedIconK o) => o -> m (Maybe Icon)
 getEmblemedIconGicon obj = liftIO $ getObjectPropertyObject obj "gicon" Icon
 
 constructEmblemedIconGicon :: (IconK a) => a -> IO ([Char], GValue)
-constructEmblemedIconGicon val = constructObjectPropertyObject "gicon" val
+constructEmblemedIconGicon val = constructObjectPropertyObject "gicon" (Just val)
 
 data EmblemedIconGiconPropertyInfo
 instance AttrInfo EmblemedIconGiconPropertyInfo where
-    type AttrAllowedOps EmblemedIconGiconPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps EmblemedIconGiconPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint EmblemedIconGiconPropertyInfo = IconK
     type AttrBaseTypeConstraint EmblemedIconGiconPropertyInfo = EmblemedIconK
-    type AttrGetType EmblemedIconGiconPropertyInfo = Icon
+    type AttrGetType EmblemedIconGiconPropertyInfo = (Maybe Icon)
     type AttrLabel EmblemedIconGiconPropertyInfo = "gicon"
     attrGet _ = getEmblemedIconGicon
     attrSet _ = undefined
     attrConstruct _ = constructEmblemedIconGicon
+    attrClear _ = undefined
 
 type instance AttributeList EmblemedIcon = EmblemedIconAttributeList
 type EmblemedIconAttributeList = ('[ '("gicon", EmblemedIconGiconPropertyInfo)] :: [(Symbol, *)])
 
+emblemedIconGicon :: AttrLabelProxy "gicon"
+emblemedIconGicon = AttrLabelProxy
+
 type instance SignalList EmblemedIcon = EmblemedIconSignalList
 type EmblemedIconSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -157,7 +163,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "emblem", argType = TInterface "Gio" "Emblem", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "EmblemedIcon"
+-- returnType : Just (TInterface "Gio" "EmblemedIcon")
 -- throws : False
 -- Skip return : False
 
@@ -190,7 +196,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "EmblemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "emblem", argType = TInterface "Gio" "Emblem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -221,7 +227,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "EmblemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -248,7 +254,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "EmblemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "Emblem")
+-- returnType : Just (TGList (TInterface "Gio" "Emblem"))
 -- throws : False
 -- Skip return : False
 
@@ -264,7 +270,6 @@
 emblemedIconGetEmblems _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_emblemed_icon_get_emblems _obj'
-    checkUnexpectedReturnNULL "g_emblemed_icon_get_emblems" result
     result' <- unpackGList result
     result'' <- mapM (newObject Emblem) result'
     touchManagedPtr _obj
@@ -278,7 +283,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "EmblemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/EmblemedIcon.hs-boot b/GI/Gio/Objects/EmblemedIcon.hs-boot
--- a/GI/Gio/Objects/EmblemedIcon.hs-boot
+++ b/GI/Gio/Objects/EmblemedIcon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.EmblemedIcon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileEnumerator.hs b/GI/Gio/Objects/FileEnumerator.hs
--- a/GI/Gio/Objects/FileEnumerator.hs
+++ b/GI/Gio/Objects/FileEnumerator.hs
@@ -83,15 +83,16 @@
 -- ** Container
     FileEnumeratorContainerPropertyInfo     ,
     constructFileEnumeratorContainer        ,
+    fileEnumeratorContainer                 ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -169,13 +170,14 @@
 -- VVV Prop "container"
    -- Type: TInterface "Gio" "File"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 constructFileEnumeratorContainer :: (FileK a) => a -> IO ([Char], GValue)
-constructFileEnumeratorContainer val = constructObjectPropertyObject "container" val
+constructFileEnumeratorContainer val = constructObjectPropertyObject "container" (Just val)
 
 data FileEnumeratorContainerPropertyInfo
 instance AttrInfo FileEnumeratorContainerPropertyInfo where
-    type AttrAllowedOps FileEnumeratorContainerPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps FileEnumeratorContainerPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint FileEnumeratorContainerPropertyInfo = FileK
     type AttrBaseTypeConstraint FileEnumeratorContainerPropertyInfo = FileEnumeratorK
     type AttrGetType FileEnumeratorContainerPropertyInfo = ()
@@ -183,10 +185,14 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructFileEnumeratorContainer
+    attrClear _ = undefined
 
 type instance AttributeList FileEnumerator = FileEnumeratorAttributeList
 type FileEnumeratorAttributeList = ('[ '("container", FileEnumeratorContainerPropertyInfo)] :: [(Symbol, *)])
 
+fileEnumeratorContainer :: AttrLabelProxy "container"
+fileEnumeratorContainer = AttrLabelProxy
+
 type instance SignalList FileEnumerator = FileEnumeratorSignalList
 type FileEnumeratorSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -194,7 +200,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -232,18 +238,18 @@
 
 -- method FileEnumerator::close_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_enumerator_close_async" g_file_enumerator_close_async :: 
     Ptr FileEnumerator ->                   -- _obj : TInterface "Gio" "FileEnumerator"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -282,7 +288,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -318,7 +324,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -351,7 +357,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -380,7 +386,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -408,7 +414,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -436,7 +442,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_info", argType = TInterface "Gio" "FileInfo", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_child", argType = TInterface "Gio" "File", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -487,7 +493,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -502,7 +508,7 @@
     (MonadIO m, FileEnumeratorK a, CancellableK b) =>
     a                                       -- _obj
     -> Maybe (b)                            -- cancellable
-    -> m FileInfo                           -- result
+    -> m (Maybe FileInfo)                   -- result
 fileEnumeratorNextFile _obj cancellable = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     maybeCancellable <- case cancellable of
@@ -512,34 +518,35 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_file_enumerator_next_file _obj' maybeCancellable
-        checkUnexpectedReturnNULL "g_file_enumerator_next_file" result
-        result' <- (wrapObject FileInfo) result
+        maybeResult <- convertIfNonNull result $ \result' -> do
+            result'' <- (wrapObject FileInfo) result'
+            return result''
         touchManagedPtr _obj
         whenJust cancellable touchManagedPtr
-        return result'
+        return maybeResult
      ) (do
         return ()
      )
 
 data FileEnumeratorNextFileMethodInfo
-instance (signature ~ (Maybe (b) -> m FileInfo), MonadIO m, FileEnumeratorK a, CancellableK b) => MethodInfo FileEnumeratorNextFileMethodInfo a signature where
+instance (signature ~ (Maybe (b) -> m (Maybe FileInfo)), MonadIO m, FileEnumeratorK a, CancellableK b) => MethodInfo FileEnumeratorNextFileMethodInfo a signature where
     overloadedMethod _ = fileEnumeratorNextFile
 
 -- method FileEnumerator::next_files_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_files", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_files", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_enumerator_next_files_async" g_file_enumerator_next_files_async :: 
     Ptr FileEnumerator ->                   -- _obj : TInterface "Gio" "FileEnumerator"
-    Int32 ->                                -- num_files : TBasicType TInt32
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- num_files : TBasicType TInt
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -579,7 +586,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "FileInfo")
+-- returnType : Just (TGList (TInterface "Gio" "FileInfo"))
 -- throws : True
 -- Skip return : False
 
@@ -600,7 +607,6 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ g_file_enumerator_next_files_finish _obj' result_'
-        checkUnexpectedReturnNULL "g_file_enumerator_next_files_finish" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject FileInfo) result'
         g_list_free result
@@ -619,7 +625,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pending", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileEnumerator.hs-boot b/GI/Gio/Objects/FileEnumerator.hs-boot
--- a/GI/Gio/Objects/FileEnumerator.hs-boot
+++ b/GI/Gio/Objects/FileEnumerator.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileEnumerator where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileIOStream.hs b/GI/Gio/Objects/FileIOStream.hs
--- a/GI/Gio/Objects/FileIOStream.hs
+++ b/GI/Gio/Objects/FileIOStream.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -135,7 +135,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -165,7 +165,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -209,19 +209,19 @@
 
 -- method FileIOStream::query_info_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_io_stream_query_info_async" g_file_io_stream_query_info_async :: 
     Ptr FileIOStream ->                     -- _obj : TInterface "Gio" "FileIOStream"
     CString ->                              -- attributes : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -263,7 +263,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileIOStream.hs-boot b/GI/Gio/Objects/FileIOStream.hs-boot
--- a/GI/Gio/Objects/FileIOStream.hs-boot
+++ b/GI/Gio/Objects/FileIOStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileIOStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileIcon.hs b/GI/Gio/Objects/FileIcon.hs
--- a/GI/Gio/Objects/FileIcon.hs
+++ b/GI/Gio/Objects/FileIcon.hs
@@ -32,6 +32,7 @@
 -- ** File
     FileIconFilePropertyInfo                ,
     constructFileIconFile                   ,
+    fileIconFile                            ,
     getFileIconFile                         ,
 
 
@@ -39,9 +40,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -114,16 +115,17 @@
 -- VVV Prop "file"
    -- Type: TInterface "Gio" "File"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getFileIconFile :: (MonadIO m, FileIconK o) => o -> m File
-getFileIconFile obj = liftIO $ getObjectPropertyObject obj "file" File
+getFileIconFile obj = liftIO $ checkUnexpectedNothing "getFileIconFile" $ getObjectPropertyObject obj "file" File
 
 constructFileIconFile :: (FileK a) => a -> IO ([Char], GValue)
-constructFileIconFile val = constructObjectPropertyObject "file" val
+constructFileIconFile val = constructObjectPropertyObject "file" (Just val)
 
 data FileIconFilePropertyInfo
 instance AttrInfo FileIconFilePropertyInfo where
-    type AttrAllowedOps FileIconFilePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps FileIconFilePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint FileIconFilePropertyInfo = FileK
     type AttrBaseTypeConstraint FileIconFilePropertyInfo = FileIconK
     type AttrGetType FileIconFilePropertyInfo = File
@@ -131,10 +133,14 @@
     attrGet _ = getFileIconFile
     attrSet _ = undefined
     attrConstruct _ = constructFileIconFile
+    attrClear _ = undefined
 
 type instance AttributeList FileIcon = FileIconAttributeList
 type FileIconAttributeList = ('[ '("file", FileIconFilePropertyInfo)] :: [(Symbol, *)])
 
+fileIconFile :: AttrLabelProxy "file"
+fileIconFile = AttrLabelProxy
+
 type instance SignalList FileIcon = FileIconSignalList
 type FileIconSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -142,7 +148,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "file", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileIcon"
+-- returnType : Just (TInterface "Gio" "FileIcon")
 -- throws : False
 -- Skip return : False
 
@@ -167,7 +173,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileIcon.hs-boot b/GI/Gio/Objects/FileIcon.hs-boot
--- a/GI/Gio/Objects/FileIcon.hs-boot
+++ b/GI/Gio/Objects/FileIcon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileIcon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileInfo.hs b/GI/Gio/Objects/FileInfo.hs
--- a/GI/Gio/Objects/FileInfo.hs
+++ b/GI/Gio/Objects/FileInfo.hs
@@ -335,9 +335,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -473,7 +473,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : False
 -- Skip return : False
 
@@ -494,7 +494,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -521,7 +521,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dest_info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -552,7 +552,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : False
 -- Skip return : False
 
@@ -581,7 +581,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -615,7 +615,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -647,7 +647,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -678,9 +678,9 @@
 
 -- method FileInfo::get_attribute_data
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "value_pp", argType = TBasicType TVoid, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "status", argType = TInterface "Gio" "FileAttributeStatus", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "value_pp", argType = TBasicType TPtr, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "status", argType = TInterface "Gio" "FileAttributeStatus", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -688,7 +688,7 @@
     Ptr FileInfo ->                         -- _obj : TInterface "Gio" "FileInfo"
     CString ->                              -- attribute : TBasicType TUTF8
     Ptr CUInt ->                            -- type : TInterface "Gio" "FileAttributeType"
-    Ptr (Ptr ()) ->                         -- value_pp : TBasicType TVoid
+    Ptr (Ptr ()) ->                         -- value_pp : TBasicType TPtr
     Ptr CUInt ->                            -- status : TInterface "Gio" "FileAttributeStatus"
     IO CInt
 
@@ -726,7 +726,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt32)
 -- throws : False
 -- Skip return : False
 
@@ -757,7 +757,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -788,7 +788,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GObject" "Object"
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : False
 -- Skip return : False
 
@@ -821,7 +821,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeStatus"
+-- returnType : Just (TInterface "Gio" "FileAttributeStatus")
 -- throws : False
 -- Skip return : False
 
@@ -853,7 +853,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -886,7 +886,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -919,7 +919,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeType"
+-- returnType : Just (TInterface "Gio" "FileAttributeType")
 -- throws : False
 -- Skip return : False
 
@@ -951,7 +951,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -982,7 +982,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -1013,7 +1013,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1042,7 +1042,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "DateTime"
+-- returnType : Just (TInterface "GLib" "DateTime")
 -- throws : False
 -- Skip return : False
 
@@ -1071,7 +1071,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1100,7 +1100,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1129,7 +1129,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1158,7 +1158,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileType"
+-- returnType : Just (TInterface "Gio" "FileType")
 -- throws : False
 -- Skip return : False
 
@@ -1186,7 +1186,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -1215,7 +1215,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1243,7 +1243,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1271,7 +1271,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1299,7 +1299,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "GLib" "TimeVal", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1329,7 +1329,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1358,7 +1358,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -1385,7 +1385,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt32)
 -- throws : False
 -- Skip return : False
 
@@ -1412,7 +1412,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -1441,7 +1441,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1470,7 +1470,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1502,7 +1502,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_space", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1534,7 +1534,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name_space", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1548,28 +1548,29 @@
     (MonadIO m, FileInfoK a) =>
     a                                       -- _obj
     -> T.Text                               -- nameSpace
-    -> m [T.Text]                           -- result
+    -> m (Maybe [T.Text])                   -- result
 fileInfoListAttributes _obj nameSpace = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     nameSpace' <- textToCString nameSpace
     result <- g_file_info_list_attributes _obj' nameSpace'
-    checkUnexpectedReturnNULL "g_file_info_list_attributes" result
-    result' <- unpackZeroTerminatedUTF8CArray result
-    mapZeroTerminatedCArray freeMem result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- unpackZeroTerminatedUTF8CArray result'
+        mapZeroTerminatedCArray freeMem result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
     freeMem nameSpace'
-    return result'
+    return maybeResult
 
 data FileInfoListAttributesMethodInfo
-instance (signature ~ (T.Text -> m [T.Text]), MonadIO m, FileInfoK a) => MethodInfo FileInfoListAttributesMethodInfo a signature where
+instance (signature ~ (T.Text -> m (Maybe [T.Text])), MonadIO m, FileInfoK a) => MethodInfo FileInfoListAttributesMethodInfo a signature where
     overloadedMethod _ = fileInfoListAttributes
 
 -- method FileInfo::remove_attribute
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1598,9 +1599,9 @@
 
 -- method FileInfo::set_attribute
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value_p", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value_p", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1608,7 +1609,7 @@
     Ptr FileInfo ->                         -- _obj : TInterface "Gio" "FileInfo"
     CString ->                              -- attribute : TBasicType TUTF8
     CUInt ->                                -- type : TInterface "Gio" "FileAttributeType"
-    Ptr () ->                               -- value_p : TBasicType TVoid
+    Ptr () ->                               -- value_p : TBasicType TPtr
     IO ()
 
 
@@ -1636,7 +1637,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1670,7 +1671,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1705,7 +1706,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1738,7 +1739,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1771,7 +1772,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mask", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1802,7 +1803,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1837,7 +1838,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "status", argType = TInterface "Gio" "FileAttributeStatus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1872,7 +1873,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1907,7 +1908,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TCArray False (-1) (-1) (TBasicType TUTF8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1940,7 +1941,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1973,7 +1974,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attr_value", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2006,7 +2007,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "content_type", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2037,7 +2038,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "display_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2068,7 +2069,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "edit_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2099,7 +2100,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2129,7 +2130,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2160,7 +2161,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_hidden", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2190,7 +2191,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_symlink", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2220,7 +2221,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mtime", argType = TInterface "GLib" "TimeVal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2251,7 +2252,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2282,7 +2283,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2311,7 +2312,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "sort_order", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2340,7 +2341,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2371,7 +2372,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "symlink_target", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2402,7 +2403,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileInfo.hs-boot b/GI/Gio/Objects/FileInfo.hs-boot
--- a/GI/Gio/Objects/FileInfo.hs-boot
+++ b/GI/Gio/Objects/FileInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileInputStream.hs b/GI/Gio/Objects/FileInputStream.hs
--- a/GI/Gio/Objects/FileInputStream.hs
+++ b/GI/Gio/Objects/FileInputStream.hs
@@ -36,9 +36,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -138,7 +138,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -182,19 +182,19 @@
 
 -- method FileInputStream::query_info_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_input_stream_query_info_async" g_file_input_stream_query_info_async :: 
     Ptr FileInputStream ->                  -- _obj : TInterface "Gio" "FileInputStream"
     CString ->                              -- attributes : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -236,7 +236,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileInputStream.hs-boot b/GI/Gio/Objects/FileInputStream.hs-boot
--- a/GI/Gio/Objects/FileInputStream.hs-boot
+++ b/GI/Gio/Objects/FileInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileMonitor.hs b/GI/Gio/Objects/FileMonitor.hs
--- a/GI/Gio/Objects/FileMonitor.hs
+++ b/GI/Gio/Objects/FileMonitor.hs
@@ -42,12 +42,14 @@
  -- * Properties
 -- ** Cancelled
     FileMonitorCancelledPropertyInfo        ,
+    fileMonitorCancelled                    ,
     getFileMonitorCancelled                 ,
 
 
 -- ** RateLimit
     FileMonitorRateLimitPropertyInfo        ,
     constructFileMonitorRateLimit           ,
+    fileMonitorRateLimit                    ,
     getFileMonitorRateLimit                 ,
     setFileMonitorRateLimit                 ,
 
@@ -71,9 +73,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -198,6 +200,7 @@
 -- VVV Prop "cancelled"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getFileMonitorCancelled :: (MonadIO m, FileMonitorK o) => o -> m Bool
 getFileMonitorCancelled obj = liftIO $ getObjectPropertyBool obj "cancelled"
@@ -212,19 +215,21 @@
     attrGet _ = getFileMonitorCancelled
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "rate-limit"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getFileMonitorRateLimit :: (MonadIO m, FileMonitorK o) => o -> m Int32
-getFileMonitorRateLimit obj = liftIO $ getObjectPropertyCInt obj "rate-limit"
+getFileMonitorRateLimit obj = liftIO $ getObjectPropertyInt32 obj "rate-limit"
 
 setFileMonitorRateLimit :: (MonadIO m, FileMonitorK o) => o -> Int32 -> m ()
-setFileMonitorRateLimit obj val = liftIO $ setObjectPropertyCInt obj "rate-limit" val
+setFileMonitorRateLimit obj val = liftIO $ setObjectPropertyInt32 obj "rate-limit" val
 
 constructFileMonitorRateLimit :: Int32 -> IO ([Char], GValue)
-constructFileMonitorRateLimit val = constructObjectPropertyCInt "rate-limit" val
+constructFileMonitorRateLimit val = constructObjectPropertyInt32 "rate-limit" val
 
 data FileMonitorRateLimitPropertyInfo
 instance AttrInfo FileMonitorRateLimitPropertyInfo where
@@ -236,10 +241,17 @@
     attrGet _ = getFileMonitorRateLimit
     attrSet _ = setFileMonitorRateLimit
     attrConstruct _ = constructFileMonitorRateLimit
+    attrClear _ = undefined
 
 type instance AttributeList FileMonitor = FileMonitorAttributeList
 type FileMonitorAttributeList = ('[ '("cancelled", FileMonitorCancelledPropertyInfo), '("rateLimit", FileMonitorRateLimitPropertyInfo)] :: [(Symbol, *)])
 
+fileMonitorCancelled :: AttrLabelProxy "cancelled"
+fileMonitorCancelled = AttrLabelProxy
+
+fileMonitorRateLimit :: AttrLabelProxy "rateLimit"
+fileMonitorRateLimit = AttrLabelProxy
+
 data FileMonitorChangedSignalInfo
 instance SignalInfo FileMonitorChangedSignalInfo where
     type HaskellCallbackType FileMonitorChangedSignalInfo = FileMonitorChangedCallback
@@ -252,7 +264,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -280,7 +292,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "other_file", argType = TInterface "Gio" "File", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "event_type", argType = TInterface "Gio" "FileMonitorEvent", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -318,7 +330,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -344,15 +356,15 @@
 
 -- method FileMonitor::set_rate_limit
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "limit_msecs", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "limit_msecs", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_monitor_set_rate_limit" g_file_monitor_set_rate_limit :: 
     Ptr FileMonitor ->                      -- _obj : TInterface "Gio" "FileMonitor"
-    Int32 ->                                -- limit_msecs : TBasicType TInt32
+    Int32 ->                                -- limit_msecs : TBasicType TInt
     IO ()
 
 
diff --git a/GI/Gio/Objects/FileMonitor.hs-boot b/GI/Gio/Objects/FileMonitor.hs-boot
--- a/GI/Gio/Objects/FileMonitor.hs-boot
+++ b/GI/Gio/Objects/FileMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FileOutputStream.hs b/GI/Gio/Objects/FileOutputStream.hs
--- a/GI/Gio/Objects/FileOutputStream.hs
+++ b/GI/Gio/Objects/FileOutputStream.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -148,7 +148,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -178,7 +178,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
@@ -222,19 +222,19 @@
 
 -- method FileOutputStream::query_info_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_file_output_stream_query_info_async" g_file_output_stream_query_info_async :: 
     Ptr FileOutputStream ->                 -- _obj : TInterface "Gio" "FileOutputStream"
     CString ->                              -- attributes : TBasicType TUTF8
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -276,7 +276,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FileOutputStream.hs-boot b/GI/Gio/Objects/FileOutputStream.hs-boot
--- a/GI/Gio/Objects/FileOutputStream.hs-boot
+++ b/GI/Gio/Objects/FileOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FileOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FilenameCompleter.hs b/GI/Gio/Objects/FilenameCompleter.hs
--- a/GI/Gio/Objects/FilenameCompleter.hs
+++ b/GI/Gio/Objects/FilenameCompleter.hs
@@ -55,9 +55,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -176,7 +176,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "FilenameCompleter"
+-- returnType : Just (TInterface "Gio" "FilenameCompleter")
 -- throws : False
 -- Skip return : False
 
@@ -197,7 +197,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilenameCompleter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "initial_text", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -231,7 +231,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilenameCompleter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "initial_text", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -266,7 +266,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilenameCompleter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dirs_only", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FilenameCompleter.hs-boot b/GI/Gio/Objects/FilenameCompleter.hs-boot
--- a/GI/Gio/Objects/FilenameCompleter.hs-boot
+++ b/GI/Gio/Objects/FilenameCompleter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FilenameCompleter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FilterInputStream.hs b/GI/Gio/Objects/FilterInputStream.hs
--- a/GI/Gio/Objects/FilterInputStream.hs
+++ b/GI/Gio/Objects/FilterInputStream.hs
@@ -38,12 +38,14 @@
 -- ** BaseStream
     FilterInputStreamBaseStreamPropertyInfo ,
     constructFilterInputStreamBaseStream    ,
+    filterInputStreamBaseStream             ,
     getFilterInputStreamBaseStream          ,
 
 
 -- ** CloseBaseStream
     FilterInputStreamCloseBaseStreamPropertyInfo,
     constructFilterInputStreamCloseBaseStream,
+    filterInputStreamCloseBaseStream        ,
     getFilterInputStreamCloseBaseStream     ,
     setFilterInputStreamCloseBaseStream     ,
 
@@ -52,9 +54,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,16 +144,17 @@
 -- VVV Prop "base-stream"
    -- Type: TInterface "Gio" "InputStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getFilterInputStreamBaseStream :: (MonadIO m, FilterInputStreamK o) => o -> m InputStream
-getFilterInputStreamBaseStream obj = liftIO $ getObjectPropertyObject obj "base-stream" InputStream
+getFilterInputStreamBaseStream obj = liftIO $ checkUnexpectedNothing "getFilterInputStreamBaseStream" $ getObjectPropertyObject obj "base-stream" InputStream
 
 constructFilterInputStreamBaseStream :: (InputStreamK a) => a -> IO ([Char], GValue)
-constructFilterInputStreamBaseStream val = constructObjectPropertyObject "base-stream" val
+constructFilterInputStreamBaseStream val = constructObjectPropertyObject "base-stream" (Just val)
 
 data FilterInputStreamBaseStreamPropertyInfo
 instance AttrInfo FilterInputStreamBaseStreamPropertyInfo where
-    type AttrAllowedOps FilterInputStreamBaseStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps FilterInputStreamBaseStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint FilterInputStreamBaseStreamPropertyInfo = InputStreamK
     type AttrBaseTypeConstraint FilterInputStreamBaseStreamPropertyInfo = FilterInputStreamK
     type AttrGetType FilterInputStreamBaseStreamPropertyInfo = InputStream
@@ -159,10 +162,12 @@
     attrGet _ = getFilterInputStreamBaseStream
     attrSet _ = undefined
     attrConstruct _ = constructFilterInputStreamBaseStream
+    attrClear _ = undefined
 
 -- VVV Prop "close-base-stream"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getFilterInputStreamCloseBaseStream :: (MonadIO m, FilterInputStreamK o) => o -> m Bool
 getFilterInputStreamCloseBaseStream obj = liftIO $ getObjectPropertyBool obj "close-base-stream"
@@ -183,10 +188,17 @@
     attrGet _ = getFilterInputStreamCloseBaseStream
     attrSet _ = setFilterInputStreamCloseBaseStream
     attrConstruct _ = constructFilterInputStreamCloseBaseStream
+    attrClear _ = undefined
 
 type instance AttributeList FilterInputStream = FilterInputStreamAttributeList
 type FilterInputStreamAttributeList = ('[ '("baseStream", FilterInputStreamBaseStreamPropertyInfo), '("closeBaseStream", FilterInputStreamCloseBaseStreamPropertyInfo)] :: [(Symbol, *)])
 
+filterInputStreamBaseStream :: AttrLabelProxy "baseStream"
+filterInputStreamBaseStream = AttrLabelProxy
+
+filterInputStreamCloseBaseStream :: AttrLabelProxy "closeBaseStream"
+filterInputStreamCloseBaseStream = AttrLabelProxy
+
 type instance SignalList FilterInputStream = FilterInputStreamSignalList
 type FilterInputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -194,7 +206,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +235,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -251,7 +263,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_base", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FilterInputStream.hs-boot b/GI/Gio/Objects/FilterInputStream.hs-boot
--- a/GI/Gio/Objects/FilterInputStream.hs-boot
+++ b/GI/Gio/Objects/FilterInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FilterInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/FilterOutputStream.hs b/GI/Gio/Objects/FilterOutputStream.hs
--- a/GI/Gio/Objects/FilterOutputStream.hs
+++ b/GI/Gio/Objects/FilterOutputStream.hs
@@ -38,12 +38,14 @@
 -- ** BaseStream
     FilterOutputStreamBaseStreamPropertyInfo,
     constructFilterOutputStreamBaseStream   ,
+    filterOutputStreamBaseStream            ,
     getFilterOutputStreamBaseStream         ,
 
 
 -- ** CloseBaseStream
     FilterOutputStreamCloseBaseStreamPropertyInfo,
     constructFilterOutputStreamCloseBaseStream,
+    filterOutputStreamCloseBaseStream       ,
     getFilterOutputStreamCloseBaseStream    ,
 
 
@@ -51,9 +53,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -145,16 +147,17 @@
 -- VVV Prop "base-stream"
    -- Type: TInterface "Gio" "OutputStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getFilterOutputStreamBaseStream :: (MonadIO m, FilterOutputStreamK o) => o -> m OutputStream
-getFilterOutputStreamBaseStream obj = liftIO $ getObjectPropertyObject obj "base-stream" OutputStream
+getFilterOutputStreamBaseStream obj = liftIO $ checkUnexpectedNothing "getFilterOutputStreamBaseStream" $ getObjectPropertyObject obj "base-stream" OutputStream
 
 constructFilterOutputStreamBaseStream :: (OutputStreamK a) => a -> IO ([Char], GValue)
-constructFilterOutputStreamBaseStream val = constructObjectPropertyObject "base-stream" val
+constructFilterOutputStreamBaseStream val = constructObjectPropertyObject "base-stream" (Just val)
 
 data FilterOutputStreamBaseStreamPropertyInfo
 instance AttrInfo FilterOutputStreamBaseStreamPropertyInfo where
-    type AttrAllowedOps FilterOutputStreamBaseStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps FilterOutputStreamBaseStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint FilterOutputStreamBaseStreamPropertyInfo = OutputStreamK
     type AttrBaseTypeConstraint FilterOutputStreamBaseStreamPropertyInfo = FilterOutputStreamK
     type AttrGetType FilterOutputStreamBaseStreamPropertyInfo = OutputStream
@@ -162,10 +165,12 @@
     attrGet _ = getFilterOutputStreamBaseStream
     attrSet _ = undefined
     attrConstruct _ = constructFilterOutputStreamBaseStream
+    attrClear _ = undefined
 
 -- VVV Prop "close-base-stream"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Just False)
 
 getFilterOutputStreamCloseBaseStream :: (MonadIO m, FilterOutputStreamK o) => o -> m Bool
 getFilterOutputStreamCloseBaseStream obj = liftIO $ getObjectPropertyBool obj "close-base-stream"
@@ -183,10 +188,17 @@
     attrGet _ = getFilterOutputStreamCloseBaseStream
     attrSet _ = undefined
     attrConstruct _ = constructFilterOutputStreamCloseBaseStream
+    attrClear _ = undefined
 
 type instance AttributeList FilterOutputStream = FilterOutputStreamAttributeList
 type FilterOutputStreamAttributeList = ('[ '("baseStream", FilterOutputStreamBaseStreamPropertyInfo), '("closeBaseStream", FilterOutputStreamCloseBaseStreamPropertyInfo)] :: [(Symbol, *)])
 
+filterOutputStreamBaseStream :: AttrLabelProxy "baseStream"
+filterOutputStreamBaseStream = AttrLabelProxy
+
+filterOutputStreamCloseBaseStream :: AttrLabelProxy "closeBaseStream"
+filterOutputStreamCloseBaseStream = AttrLabelProxy
+
 type instance SignalList FilterOutputStream = FilterOutputStreamSignalList
 type FilterOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -194,7 +206,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "OutputStream"
+-- returnType : Just (TInterface "Gio" "OutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +235,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -251,7 +263,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FilterOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_base", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/FilterOutputStream.hs-boot b/GI/Gio/Objects/FilterOutputStream.hs-boot
--- a/GI/Gio/Objects/FilterOutputStream.hs-boot
+++ b/GI/Gio/Objects/FilterOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.FilterOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/IOStream.hs b/GI/Gio/Objects/IOStream.hs
--- a/GI/Gio/Objects/IOStream.hs
+++ b/GI/Gio/Objects/IOStream.hs
@@ -77,25 +77,28 @@
 -- ** Closed
     IOStreamClosedPropertyInfo              ,
     getIOStreamClosed                       ,
+    iOStreamClosed                          ,
 
 
 -- ** InputStream
     IOStreamInputStreamPropertyInfo         ,
     getIOStreamInputStream                  ,
+    iOStreamInputStream                     ,
 
 
 -- ** OutputStream
     IOStreamOutputStreamPropertyInfo        ,
     getIOStreamOutputStream                 ,
+    iOStreamOutputStream                    ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -171,6 +174,7 @@
 -- VVV Prop "closed"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getIOStreamClosed :: (MonadIO m, IOStreamK o) => o -> m Bool
 getIOStreamClosed obj = liftIO $ getObjectPropertyBool obj "closed"
@@ -185,17 +189,19 @@
     attrGet _ = getIOStreamClosed
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "input-stream"
    -- Type: TInterface "Gio" "InputStream"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getIOStreamInputStream :: (MonadIO m, IOStreamK o) => o -> m InputStream
-getIOStreamInputStream obj = liftIO $ getObjectPropertyObject obj "input-stream" InputStream
+getIOStreamInputStream obj = liftIO $ checkUnexpectedNothing "getIOStreamInputStream" $ getObjectPropertyObject obj "input-stream" InputStream
 
 data IOStreamInputStreamPropertyInfo
 instance AttrInfo IOStreamInputStreamPropertyInfo where
-    type AttrAllowedOps IOStreamInputStreamPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps IOStreamInputStreamPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint IOStreamInputStreamPropertyInfo = (~) ()
     type AttrBaseTypeConstraint IOStreamInputStreamPropertyInfo = IOStreamK
     type AttrGetType IOStreamInputStreamPropertyInfo = InputStream
@@ -203,17 +209,19 @@
     attrGet _ = getIOStreamInputStream
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "output-stream"
    -- Type: TInterface "Gio" "OutputStream"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getIOStreamOutputStream :: (MonadIO m, IOStreamK o) => o -> m OutputStream
-getIOStreamOutputStream obj = liftIO $ getObjectPropertyObject obj "output-stream" OutputStream
+getIOStreamOutputStream obj = liftIO $ checkUnexpectedNothing "getIOStreamOutputStream" $ getObjectPropertyObject obj "output-stream" OutputStream
 
 data IOStreamOutputStreamPropertyInfo
 instance AttrInfo IOStreamOutputStreamPropertyInfo where
-    type AttrAllowedOps IOStreamOutputStreamPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps IOStreamOutputStreamPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint IOStreamOutputStreamPropertyInfo = (~) ()
     type AttrBaseTypeConstraint IOStreamOutputStreamPropertyInfo = IOStreamK
     type AttrGetType IOStreamOutputStreamPropertyInfo = OutputStream
@@ -221,10 +229,20 @@
     attrGet _ = getIOStreamOutputStream
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList IOStream = IOStreamAttributeList
 type IOStreamAttributeList = ('[ '("closed", IOStreamClosedPropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo)] :: [(Symbol, *)])
 
+iOStreamClosed :: AttrLabelProxy "closed"
+iOStreamClosed = AttrLabelProxy
+
+iOStreamInputStream :: AttrLabelProxy "inputStream"
+iOStreamInputStream = AttrLabelProxy
+
+iOStreamOutputStream :: AttrLabelProxy "outputStream"
+iOStreamOutputStream = AttrLabelProxy
+
 type instance SignalList IOStream = IOStreamSignalList
 type IOStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -232,7 +250,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -259,7 +277,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -297,18 +315,18 @@
 
 -- method IOStream::close_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_io_stream_close_async" g_io_stream_close_async :: 
     Ptr IOStream ->                         -- _obj : TInterface "Gio" "IOStream"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -347,7 +365,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -383,7 +401,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : False
 -- Skip return : False
 
@@ -412,7 +430,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "OutputStream"
+-- returnType : Just (TInterface "Gio" "OutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -441,7 +459,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -469,7 +487,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -497,7 +515,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -527,9 +545,9 @@
 
 -- method IOStream::splice_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stream2", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "IOStreamSpliceFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stream2", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "IOStreamSpliceFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -537,10 +555,10 @@
     Ptr IOStream ->                         -- _obj : TInterface "Gio" "IOStream"
     Ptr IOStream ->                         -- stream2 : TInterface "Gio" "IOStream"
     CUInt ->                                -- flags : TInterface "Gio" "IOStreamSpliceFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -584,7 +602,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/IOStream.hs-boot b/GI/Gio/Objects/IOStream.hs-boot
--- a/GI/Gio/Objects/IOStream.hs-boot
+++ b/GI/Gio/Objects/IOStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.IOStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/InetAddress.hs b/GI/Gio/Objects/InetAddress.hs
--- a/GI/Gio/Objects/InetAddress.hs
+++ b/GI/Gio/Objects/InetAddress.hs
@@ -110,71 +110,83 @@
     InetAddressBytesPropertyInfo            ,
     constructInetAddressBytes               ,
     getInetAddressBytes                     ,
+    inetAddressBytes                        ,
 
 
 -- ** Family
     InetAddressFamilyPropertyInfo           ,
     constructInetAddressFamily              ,
     getInetAddressFamily                    ,
+    inetAddressFamily                       ,
 
 
 -- ** IsAny
     InetAddressIsAnyPropertyInfo            ,
     getInetAddressIsAny                     ,
+    inetAddressIsAny                        ,
 
 
 -- ** IsLinkLocal
     InetAddressIsLinkLocalPropertyInfo      ,
     getInetAddressIsLinkLocal               ,
+    inetAddressIsLinkLocal                  ,
 
 
 -- ** IsLoopback
     InetAddressIsLoopbackPropertyInfo       ,
     getInetAddressIsLoopback                ,
+    inetAddressIsLoopback                   ,
 
 
 -- ** IsMcGlobal
     InetAddressIsMcGlobalPropertyInfo       ,
     getInetAddressIsMcGlobal                ,
+    inetAddressIsMcGlobal                   ,
 
 
 -- ** IsMcLinkLocal
     InetAddressIsMcLinkLocalPropertyInfo    ,
     getInetAddressIsMcLinkLocal             ,
+    inetAddressIsMcLinkLocal                ,
 
 
 -- ** IsMcNodeLocal
     InetAddressIsMcNodeLocalPropertyInfo    ,
     getInetAddressIsMcNodeLocal             ,
+    inetAddressIsMcNodeLocal                ,
 
 
 -- ** IsMcOrgLocal
     InetAddressIsMcOrgLocalPropertyInfo     ,
     getInetAddressIsMcOrgLocal              ,
+    inetAddressIsMcOrgLocal                 ,
 
 
 -- ** IsMcSiteLocal
     InetAddressIsMcSiteLocalPropertyInfo    ,
     getInetAddressIsMcSiteLocal             ,
+    inetAddressIsMcSiteLocal                ,
 
 
 -- ** IsMulticast
     InetAddressIsMulticastPropertyInfo      ,
     getInetAddressIsMulticast               ,
+    inetAddressIsMulticast                  ,
 
 
 -- ** IsSiteLocal
     InetAddressIsSiteLocalPropertyInfo      ,
     getInetAddressIsSiteLocal               ,
+    inetAddressIsSiteLocal                  ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -252,13 +264,14 @@
 #endif
 
 -- VVV Prop "bytes"
-   -- Type: TBasicType TVoid
+   -- Type: TBasicType TPtr
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getInetAddressBytes :: (MonadIO m, InetAddressK o) => o -> m (Ptr ())
 getInetAddressBytes obj = liftIO $ getObjectPropertyPtr obj "bytes"
 
-constructInetAddressBytes :: (Ptr ()) -> IO ([Char], GValue)
+constructInetAddressBytes :: Ptr () -> IO ([Char], GValue)
 constructInetAddressBytes val = constructObjectPropertyPtr "bytes" val
 
 data InetAddressBytesPropertyInfo
@@ -271,10 +284,12 @@
     attrGet _ = getInetAddressBytes
     attrSet _ = undefined
     attrConstruct _ = constructInetAddressBytes
+    attrClear _ = undefined
 
 -- VVV Prop "family"
    -- Type: TInterface "Gio" "SocketFamily"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressFamily :: (MonadIO m, InetAddressK o) => o -> m SocketFamily
 getInetAddressFamily obj = liftIO $ getObjectPropertyEnum obj "family"
@@ -292,10 +307,12 @@
     attrGet _ = getInetAddressFamily
     attrSet _ = undefined
     attrConstruct _ = constructInetAddressFamily
+    attrClear _ = undefined
 
 -- VVV Prop "is-any"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsAny :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsAny obj = liftIO $ getObjectPropertyBool obj "is-any"
@@ -310,10 +327,12 @@
     attrGet _ = getInetAddressIsAny
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-link-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsLinkLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsLinkLocal obj = liftIO $ getObjectPropertyBool obj "is-link-local"
@@ -328,10 +347,12 @@
     attrGet _ = getInetAddressIsLinkLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-loopback"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsLoopback :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsLoopback obj = liftIO $ getObjectPropertyBool obj "is-loopback"
@@ -346,10 +367,12 @@
     attrGet _ = getInetAddressIsLoopback
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-mc-global"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMcGlobal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMcGlobal obj = liftIO $ getObjectPropertyBool obj "is-mc-global"
@@ -364,10 +387,12 @@
     attrGet _ = getInetAddressIsMcGlobal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-mc-link-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMcLinkLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMcLinkLocal obj = liftIO $ getObjectPropertyBool obj "is-mc-link-local"
@@ -382,10 +407,12 @@
     attrGet _ = getInetAddressIsMcLinkLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-mc-node-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMcNodeLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMcNodeLocal obj = liftIO $ getObjectPropertyBool obj "is-mc-node-local"
@@ -400,10 +427,12 @@
     attrGet _ = getInetAddressIsMcNodeLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-mc-org-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMcOrgLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMcOrgLocal obj = liftIO $ getObjectPropertyBool obj "is-mc-org-local"
@@ -418,10 +447,12 @@
     attrGet _ = getInetAddressIsMcOrgLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-mc-site-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMcSiteLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMcSiteLocal obj = liftIO $ getObjectPropertyBool obj "is-mc-site-local"
@@ -436,10 +467,12 @@
     attrGet _ = getInetAddressIsMcSiteLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-multicast"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsMulticast :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsMulticast obj = liftIO $ getObjectPropertyBool obj "is-multicast"
@@ -454,10 +487,12 @@
     attrGet _ = getInetAddressIsMulticast
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "is-site-local"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressIsSiteLocal :: (MonadIO m, InetAddressK o) => o -> m Bool
 getInetAddressIsSiteLocal obj = liftIO $ getObjectPropertyBool obj "is-site-local"
@@ -472,10 +507,47 @@
     attrGet _ = getInetAddressIsSiteLocal
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList InetAddress = InetAddressAttributeList
 type InetAddressAttributeList = ('[ '("bytes", InetAddressBytesPropertyInfo), '("family", InetAddressFamilyPropertyInfo), '("isAny", InetAddressIsAnyPropertyInfo), '("isLinkLocal", InetAddressIsLinkLocalPropertyInfo), '("isLoopback", InetAddressIsLoopbackPropertyInfo), '("isMcGlobal", InetAddressIsMcGlobalPropertyInfo), '("isMcLinkLocal", InetAddressIsMcLinkLocalPropertyInfo), '("isMcNodeLocal", InetAddressIsMcNodeLocalPropertyInfo), '("isMcOrgLocal", InetAddressIsMcOrgLocalPropertyInfo), '("isMcSiteLocal", InetAddressIsMcSiteLocalPropertyInfo), '("isMulticast", InetAddressIsMulticastPropertyInfo), '("isSiteLocal", InetAddressIsSiteLocalPropertyInfo)] :: [(Symbol, *)])
 
+inetAddressBytes :: AttrLabelProxy "bytes"
+inetAddressBytes = AttrLabelProxy
+
+inetAddressFamily :: AttrLabelProxy "family"
+inetAddressFamily = AttrLabelProxy
+
+inetAddressIsAny :: AttrLabelProxy "isAny"
+inetAddressIsAny = AttrLabelProxy
+
+inetAddressIsLinkLocal :: AttrLabelProxy "isLinkLocal"
+inetAddressIsLinkLocal = AttrLabelProxy
+
+inetAddressIsLoopback :: AttrLabelProxy "isLoopback"
+inetAddressIsLoopback = AttrLabelProxy
+
+inetAddressIsMcGlobal :: AttrLabelProxy "isMcGlobal"
+inetAddressIsMcGlobal = AttrLabelProxy
+
+inetAddressIsMcLinkLocal :: AttrLabelProxy "isMcLinkLocal"
+inetAddressIsMcLinkLocal = AttrLabelProxy
+
+inetAddressIsMcNodeLocal :: AttrLabelProxy "isMcNodeLocal"
+inetAddressIsMcNodeLocal = AttrLabelProxy
+
+inetAddressIsMcOrgLocal :: AttrLabelProxy "isMcOrgLocal"
+inetAddressIsMcOrgLocal = AttrLabelProxy
+
+inetAddressIsMcSiteLocal :: AttrLabelProxy "isMcSiteLocal"
+inetAddressIsMcSiteLocal = AttrLabelProxy
+
+inetAddressIsMulticast :: AttrLabelProxy "isMulticast"
+inetAddressIsMulticast = AttrLabelProxy
+
+inetAddressIsSiteLocal :: AttrLabelProxy "isSiteLocal"
+inetAddressIsSiteLocal = AttrLabelProxy
+
 type instance SignalList InetAddress = InetAddressSignalList
 type InetAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -483,7 +555,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -507,7 +579,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "bytes", argType = TCArray False (-1) (-1) (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -533,7 +605,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -558,7 +630,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -582,7 +654,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "other_address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -614,7 +686,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketFamily"
+-- returnType : Just (TInterface "Gio" "SocketFamily")
 -- throws : False
 -- Skip return : False
 
@@ -642,7 +714,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -670,7 +742,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -698,7 +770,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -726,7 +798,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -754,7 +826,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -782,7 +854,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -810,7 +882,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -838,7 +910,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -866,7 +938,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -894,7 +966,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -922,7 +994,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -949,7 +1021,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/InetAddress.hs-boot b/GI/Gio/Objects/InetAddress.hs-boot
--- a/GI/Gio/Objects/InetAddress.hs-boot
+++ b/GI/Gio/Objects/InetAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.InetAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/InetAddressMask.hs b/GI/Gio/Objects/InetAddressMask.hs
--- a/GI/Gio/Objects/InetAddressMask.hs
+++ b/GI/Gio/Objects/InetAddressMask.hs
@@ -60,20 +60,24 @@
  -- * Properties
 -- ** Address
     InetAddressMaskAddressPropertyInfo      ,
+    clearInetAddressMaskAddress             ,
     constructInetAddressMaskAddress         ,
     getInetAddressMaskAddress               ,
+    inetAddressMaskAddress                  ,
     setInetAddressMaskAddress               ,
 
 
 -- ** Family
     InetAddressMaskFamilyPropertyInfo       ,
     getInetAddressMaskFamily                ,
+    inetAddressMaskFamily                   ,
 
 
 -- ** Length
     InetAddressMaskLengthPropertyInfo       ,
     constructInetAddressMaskLength          ,
     getInetAddressMaskLength                ,
+    inetAddressMaskLength                   ,
     setInetAddressMaskLength                ,
 
 
@@ -81,9 +85,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -156,19 +160,23 @@
 -- VVV Prop "address"
    -- Type: TInterface "Gio" "InetAddress"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressMaskAddress :: (MonadIO m, InetAddressMaskK o) => o -> m InetAddress
-getInetAddressMaskAddress obj = liftIO $ getObjectPropertyObject obj "address" InetAddress
+getInetAddressMaskAddress obj = liftIO $ checkUnexpectedNothing "getInetAddressMaskAddress" $ getObjectPropertyObject obj "address" InetAddress
 
 setInetAddressMaskAddress :: (MonadIO m, InetAddressMaskK o, InetAddressK a) => o -> a -> m ()
-setInetAddressMaskAddress obj val = liftIO $ setObjectPropertyObject obj "address" val
+setInetAddressMaskAddress obj val = liftIO $ setObjectPropertyObject obj "address" (Just val)
 
 constructInetAddressMaskAddress :: (InetAddressK a) => a -> IO ([Char], GValue)
-constructInetAddressMaskAddress val = constructObjectPropertyObject "address" val
+constructInetAddressMaskAddress val = constructObjectPropertyObject "address" (Just val)
 
+clearInetAddressMaskAddress :: (MonadIO m, InetAddressMaskK o) => o -> m ()
+clearInetAddressMaskAddress obj = liftIO $ setObjectPropertyObject obj "address" (Nothing :: Maybe InetAddress)
+
 data InetAddressMaskAddressPropertyInfo
 instance AttrInfo InetAddressMaskAddressPropertyInfo where
-    type AttrAllowedOps InetAddressMaskAddressPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps InetAddressMaskAddressPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint InetAddressMaskAddressPropertyInfo = InetAddressK
     type AttrBaseTypeConstraint InetAddressMaskAddressPropertyInfo = InetAddressMaskK
     type AttrGetType InetAddressMaskAddressPropertyInfo = InetAddress
@@ -176,10 +184,12 @@
     attrGet _ = getInetAddressMaskAddress
     attrSet _ = setInetAddressMaskAddress
     attrConstruct _ = constructInetAddressMaskAddress
+    attrClear _ = clearInetAddressMaskAddress
 
 -- VVV Prop "family"
    -- Type: TInterface "Gio" "SocketFamily"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressMaskFamily :: (MonadIO m, InetAddressMaskK o) => o -> m SocketFamily
 getInetAddressMaskFamily obj = liftIO $ getObjectPropertyEnum obj "family"
@@ -194,19 +204,21 @@
     attrGet _ = getInetAddressMaskFamily
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "length"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Nothing)
 
 getInetAddressMaskLength :: (MonadIO m, InetAddressMaskK o) => o -> m Word32
-getInetAddressMaskLength obj = liftIO $ getObjectPropertyCUInt obj "length"
+getInetAddressMaskLength obj = liftIO $ getObjectPropertyUInt32 obj "length"
 
 setInetAddressMaskLength :: (MonadIO m, InetAddressMaskK o) => o -> Word32 -> m ()
-setInetAddressMaskLength obj val = liftIO $ setObjectPropertyCUInt obj "length" val
+setInetAddressMaskLength obj val = liftIO $ setObjectPropertyUInt32 obj "length" val
 
 constructInetAddressMaskLength :: Word32 -> IO ([Char], GValue)
-constructInetAddressMaskLength val = constructObjectPropertyCUInt "length" val
+constructInetAddressMaskLength val = constructObjectPropertyUInt32 "length" val
 
 data InetAddressMaskLengthPropertyInfo
 instance AttrInfo InetAddressMaskLengthPropertyInfo where
@@ -218,24 +230,34 @@
     attrGet _ = getInetAddressMaskLength
     attrSet _ = setInetAddressMaskLength
     attrConstruct _ = constructInetAddressMaskLength
+    attrClear _ = undefined
 
 type instance AttributeList InetAddressMask = InetAddressMaskAttributeList
 type InetAddressMaskAttributeList = ('[ '("address", InetAddressMaskAddressPropertyInfo), '("family", InetAddressMaskFamilyPropertyInfo), '("length", InetAddressMaskLengthPropertyInfo)] :: [(Symbol, *)])
 
+inetAddressMaskAddress :: AttrLabelProxy "address"
+inetAddressMaskAddress = AttrLabelProxy
+
+inetAddressMaskFamily :: AttrLabelProxy "family"
+inetAddressMaskFamily = AttrLabelProxy
+
+inetAddressMaskLength :: AttrLabelProxy "length"
+inetAddressMaskLength = AttrLabelProxy
+
 type instance SignalList InetAddressMask = InetAddressMaskSignalList
 type InetAddressMaskSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method InetAddressMask::new
 -- method type : Constructor
--- Args : [Arg {argCName = "addr", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "addr", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddressMask"
+-- returnType : Just (TInterface "Gio" "InetAddressMask")
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_inet_address_mask_new" g_inet_address_mask_new :: 
     Ptr InetAddress ->                      -- addr : TInterface "Gio" "InetAddress"
-    Word32 ->                               -- length : TBasicType TUInt32
+    Word32 ->                               -- length : TBasicType TUInt
     Ptr (Ptr GError) ->                     -- error
     IO (Ptr InetAddressMask)
 
@@ -261,7 +283,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "mask_string", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddressMask"
+-- returnType : Just (TInterface "Gio" "InetAddressMask")
 -- throws : True
 -- Skip return : False
 
@@ -291,7 +313,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mask2", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -323,7 +345,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -352,7 +374,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketFamily"
+-- returnType : Just (TInterface "Gio" "SocketFamily")
 -- throws : False
 -- Skip return : False
 
@@ -380,7 +402,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -407,7 +429,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -439,7 +461,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetAddressMask", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/InetAddressMask.hs-boot b/GI/Gio/Objects/InetAddressMask.hs-boot
--- a/GI/Gio/Objects/InetAddressMask.hs-boot
+++ b/GI/Gio/Objects/InetAddressMask.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.InetAddressMask where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/InetSocketAddress.hs b/GI/Gio/Objects/InetSocketAddress.hs
--- a/GI/Gio/Objects/InetSocketAddress.hs
+++ b/GI/Gio/Objects/InetSocketAddress.hs
@@ -52,33 +52,37 @@
     InetSocketAddressAddressPropertyInfo    ,
     constructInetSocketAddressAddress       ,
     getInetSocketAddressAddress             ,
+    inetSocketAddressAddress                ,
 
 
 -- ** Flowinfo
     InetSocketAddressFlowinfoPropertyInfo   ,
     constructInetSocketAddressFlowinfo      ,
     getInetSocketAddressFlowinfo            ,
+    inetSocketAddressFlowinfo               ,
 
 
 -- ** Port
     InetSocketAddressPortPropertyInfo       ,
     constructInetSocketAddressPort          ,
     getInetSocketAddressPort                ,
+    inetSocketAddressPort                   ,
 
 
 -- ** ScopeId
     InetSocketAddressScopeIdPropertyInfo    ,
     constructInetSocketAddressScopeId       ,
     getInetSocketAddressScopeId             ,
+    inetSocketAddressScopeId                ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -153,16 +157,17 @@
 -- VVV Prop "address"
    -- Type: TInterface "Gio" "InetAddress"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getInetSocketAddressAddress :: (MonadIO m, InetSocketAddressK o) => o -> m InetAddress
-getInetSocketAddressAddress obj = liftIO $ getObjectPropertyObject obj "address" InetAddress
+getInetSocketAddressAddress obj = liftIO $ checkUnexpectedNothing "getInetSocketAddressAddress" $ getObjectPropertyObject obj "address" InetAddress
 
 constructInetSocketAddressAddress :: (InetAddressK a) => a -> IO ([Char], GValue)
-constructInetSocketAddressAddress val = constructObjectPropertyObject "address" val
+constructInetSocketAddressAddress val = constructObjectPropertyObject "address" (Just val)
 
 data InetSocketAddressAddressPropertyInfo
 instance AttrInfo InetSocketAddressAddressPropertyInfo where
-    type AttrAllowedOps InetSocketAddressAddressPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps InetSocketAddressAddressPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint InetSocketAddressAddressPropertyInfo = InetAddressK
     type AttrBaseTypeConstraint InetSocketAddressAddressPropertyInfo = InetSocketAddressK
     type AttrGetType InetSocketAddressAddressPropertyInfo = InetAddress
@@ -170,16 +175,18 @@
     attrGet _ = getInetSocketAddressAddress
     attrSet _ = undefined
     attrConstruct _ = constructInetSocketAddressAddress
+    attrClear _ = undefined
 
 -- VVV Prop "flowinfo"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getInetSocketAddressFlowinfo :: (MonadIO m, InetSocketAddressK o) => o -> m Word32
-getInetSocketAddressFlowinfo obj = liftIO $ getObjectPropertyCUInt obj "flowinfo"
+getInetSocketAddressFlowinfo obj = liftIO $ getObjectPropertyUInt32 obj "flowinfo"
 
 constructInetSocketAddressFlowinfo :: Word32 -> IO ([Char], GValue)
-constructInetSocketAddressFlowinfo val = constructObjectPropertyCUInt "flowinfo" val
+constructInetSocketAddressFlowinfo val = constructObjectPropertyUInt32 "flowinfo" val
 
 data InetSocketAddressFlowinfoPropertyInfo
 instance AttrInfo InetSocketAddressFlowinfoPropertyInfo where
@@ -191,16 +198,18 @@
     attrGet _ = getInetSocketAddressFlowinfo
     attrSet _ = undefined
     attrConstruct _ = constructInetSocketAddressFlowinfo
+    attrClear _ = undefined
 
 -- VVV Prop "port"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getInetSocketAddressPort :: (MonadIO m, InetSocketAddressK o) => o -> m Word32
-getInetSocketAddressPort obj = liftIO $ getObjectPropertyCUInt obj "port"
+getInetSocketAddressPort obj = liftIO $ getObjectPropertyUInt32 obj "port"
 
 constructInetSocketAddressPort :: Word32 -> IO ([Char], GValue)
-constructInetSocketAddressPort val = constructObjectPropertyCUInt "port" val
+constructInetSocketAddressPort val = constructObjectPropertyUInt32 "port" val
 
 data InetSocketAddressPortPropertyInfo
 instance AttrInfo InetSocketAddressPortPropertyInfo where
@@ -212,16 +221,18 @@
     attrGet _ = getInetSocketAddressPort
     attrSet _ = undefined
     attrConstruct _ = constructInetSocketAddressPort
+    attrClear _ = undefined
 
 -- VVV Prop "scope-id"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getInetSocketAddressScopeId :: (MonadIO m, InetSocketAddressK o) => o -> m Word32
-getInetSocketAddressScopeId obj = liftIO $ getObjectPropertyCUInt obj "scope-id"
+getInetSocketAddressScopeId obj = liftIO $ getObjectPropertyUInt32 obj "scope-id"
 
 constructInetSocketAddressScopeId :: Word32 -> IO ([Char], GValue)
-constructInetSocketAddressScopeId val = constructObjectPropertyCUInt "scope-id" val
+constructInetSocketAddressScopeId val = constructObjectPropertyUInt32 "scope-id" val
 
 data InetSocketAddressScopeIdPropertyInfo
 instance AttrInfo InetSocketAddressScopeIdPropertyInfo where
@@ -233,10 +244,23 @@
     attrGet _ = getInetSocketAddressScopeId
     attrSet _ = undefined
     attrConstruct _ = constructInetSocketAddressScopeId
+    attrClear _ = undefined
 
 type instance AttributeList InetSocketAddress = InetSocketAddressAttributeList
 type InetSocketAddressAttributeList = ('[ '("address", InetSocketAddressAddressPropertyInfo), '("family", SocketAddressFamilyPropertyInfo), '("flowinfo", InetSocketAddressFlowinfoPropertyInfo), '("port", InetSocketAddressPortPropertyInfo), '("scopeId", InetSocketAddressScopeIdPropertyInfo)] :: [(Symbol, *)])
 
+inetSocketAddressAddress :: AttrLabelProxy "address"
+inetSocketAddressAddress = AttrLabelProxy
+
+inetSocketAddressFlowinfo :: AttrLabelProxy "flowinfo"
+inetSocketAddressFlowinfo = AttrLabelProxy
+
+inetSocketAddressPort :: AttrLabelProxy "port"
+inetSocketAddressPort = AttrLabelProxy
+
+inetSocketAddressScopeId :: AttrLabelProxy "scopeId"
+inetSocketAddressScopeId = AttrLabelProxy
+
 type instance SignalList InetSocketAddress = InetSocketAddressSignalList
 type InetSocketAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -244,7 +268,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetSocketAddress"
+-- returnType : Just (TInterface "Gio" "InetSocketAddress")
 -- throws : False
 -- Skip return : False
 
@@ -269,15 +293,15 @@
 
 -- method InetSocketAddress::new_from_string
 -- method type : Constructor
--- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "address", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetSocketAddress"
+-- returnType : Just (TInterface "Gio" "InetSocketAddress")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_inet_socket_address_new_from_string" g_inet_socket_address_new_from_string :: 
     CString ->                              -- address : TBasicType TUTF8
-    Word32 ->                               -- port : TBasicType TUInt32
+    Word32 ->                               -- port : TBasicType TUInt
     IO (Ptr InetSocketAddress)
 
 
@@ -298,7 +322,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InetAddress"
+-- returnType : Just (TInterface "Gio" "InetAddress")
 -- throws : False
 -- Skip return : False
 
@@ -327,7 +351,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
@@ -354,7 +378,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
@@ -381,7 +405,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InetSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt32)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/InetSocketAddress.hs-boot b/GI/Gio/Objects/InetSocketAddress.hs-boot
--- a/GI/Gio/Objects/InetSocketAddress.hs-boot
+++ b/GI/Gio/Objects/InetSocketAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.InetSocketAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/InputStream.hs b/GI/Gio/Objects/InputStream.hs
--- a/GI/Gio/Objects/InputStream.hs
+++ b/GI/Gio/Objects/InputStream.hs
@@ -116,9 +116,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -211,7 +211,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -238,7 +238,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -276,18 +276,18 @@
 
 -- method InputStream::close_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_input_stream_close_async" g_input_stream_close_async :: 
     Ptr InputStream ->                      -- _obj : TInterface "Gio" "InputStream"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -326,7 +326,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -362,7 +362,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -390,7 +390,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -418,7 +418,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -464,7 +464,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_read", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -513,9 +513,9 @@
 
 -- method InputStream::read_all_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -523,10 +523,10 @@
     Ptr InputStream ->                      -- _obj : TInterface "Gio" "InputStream"
     Ptr Word8 ->                            -- buffer : TCArray False (-1) 2 (TBasicType TUInt8)
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -569,7 +569,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_read", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -607,9 +607,9 @@
 
 -- method InputStream::read_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -617,10 +617,10 @@
     Ptr InputStream ->                      -- _obj : TInterface "Gio" "InputStream"
     Ptr Word8 ->                            -- buffer : TCArray False (-1) 2 (TBasicType TUInt8)
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -663,7 +663,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : True
 -- Skip return : False
 
@@ -705,19 +705,19 @@
 
 -- method InputStream::read_bytes_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_input_stream_read_bytes_async" g_input_stream_read_bytes_async :: 
     Ptr InputStream ->                      -- _obj : TInterface "Gio" "InputStream"
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -757,7 +757,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : True
 -- Skip return : False
 
@@ -795,7 +795,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -831,7 +831,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -863,7 +863,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -903,19 +903,19 @@
 
 -- method InputStream::skip_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_input_stream_skip_async" g_input_stream_skip_async :: 
     Ptr InputStream ->                      -- _obj : TInterface "Gio" "InputStream"
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -955,7 +955,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/InputStream.hs-boot b/GI/Gio/Objects/InputStream.hs-boot
--- a/GI/Gio/Objects/InputStream.hs-boot
+++ b/GI/Gio/Objects/InputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.InputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ListStore.hs b/GI/Gio/Objects/ListStore.hs
--- a/GI/Gio/Objects/ListStore.hs
+++ b/GI/Gio/Objects/ListStore.hs
@@ -63,15 +63,16 @@
     ListStoreItemTypePropertyInfo           ,
     constructListStoreItemType              ,
     getListStoreItemType                    ,
+    listStoreItemType                       ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -149,6 +150,7 @@
 -- VVV Prop "item-type"
    -- Type: TBasicType TGType
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getListStoreItemType :: (MonadIO m, ListStoreK o) => o -> m GType
 getListStoreItemType obj = liftIO $ getObjectPropertyGType obj "item-type"
@@ -166,10 +168,14 @@
     attrGet _ = getListStoreItemType
     attrSet _ = undefined
     attrConstruct _ = constructListStoreItemType
+    attrClear _ = undefined
 
 type instance AttributeList ListStore = ListStoreAttributeList
 type ListStoreAttributeList = ('[ '("itemType", ListStoreItemTypePropertyInfo)] :: [(Symbol, *)])
 
+listStoreItemType :: AttrLabelProxy "itemType"
+listStoreItemType = AttrLabelProxy
+
 type instance SignalList ListStore = ListStoreSignalList
 type ListStoreSignalList = ('[ '("itemsChanged", ListModelItemsChangedSignalInfo), '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -177,7 +183,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "item_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ListStore"
+-- returnType : Just (TInterface "Gio" "ListStore")
 -- throws : False
 -- Skip return : False
 
@@ -201,7 +207,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -230,15 +236,15 @@
 
 -- method ListStore::insert
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_store_insert" g_list_store_insert :: 
     Ptr ListStore ->                        -- _obj : TInterface "Gio" "ListStore"
-    Word32 ->                               -- position : TBasicType TUInt32
+    Word32 ->                               -- position : TBasicType TUInt
     Ptr GObject.Object ->                   -- item : TInterface "GObject" "Object"
     IO ()
 
@@ -263,9 +269,9 @@
 
 -- method ListStore::insert_sorted
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "compare_func", argType = TInterface "GLib" "CompareDataFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "compare_func", argType = TInterface "GLib" "CompareDataFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -273,7 +279,7 @@
     Ptr ListStore ->                        -- _obj : TInterface "Gio" "ListStore"
     Ptr GObject.Object ->                   -- item : TInterface "GObject" "Object"
     FunPtr GLib.CompareDataFuncC ->         -- compare_func : TInterface "GLib" "CompareDataFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO Word32
 
 
@@ -300,15 +306,15 @@
 
 -- method ListStore::remove
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_store_remove" g_list_store_remove :: 
     Ptr ListStore ->                        -- _obj : TInterface "Gio" "ListStore"
-    Word32 ->                               -- position : TBasicType TUInt32
+    Word32 ->                               -- position : TBasicType TUInt
     IO ()
 
 
@@ -331,7 +337,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -356,16 +362,16 @@
 
 -- method ListStore::sort
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "compare_func", argType = TInterface "GLib" "CompareDataFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "compare_func", argType = TInterface "GLib" "CompareDataFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_store_sort" g_list_store_sort :: 
     Ptr ListStore ->                        -- _obj : TInterface "Gio" "ListStore"
     FunPtr GLib.CompareDataFuncC ->         -- compare_func : TInterface "GLib" "CompareDataFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -389,18 +395,18 @@
 
 -- method ListStore::splice
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_removals", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "additions", argType = TCArray False (-1) 4 (TInterface "GObject" "Object"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_additions", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_additions", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ListStore", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_removals", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "additions", argType = TCArray False (-1) 4 (TInterface "GObject" "Object"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_additions", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_additions", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_list_store_splice" g_list_store_splice :: 
     Ptr ListStore ->                        -- _obj : TInterface "Gio" "ListStore"
-    Word32 ->                               -- position : TBasicType TUInt32
-    Word32 ->                               -- n_removals : TBasicType TUInt32
+    Word32 ->                               -- position : TBasicType TUInt
+    Word32 ->                               -- n_removals : TBasicType TUInt
     Ptr (Ptr GObject.Object) ->             -- additions : TCArray False (-1) 4 (TInterface "GObject" "Object")
-    Word32 ->                               -- n_additions : TBasicType TUInt32
+    Word32 ->                               -- n_additions : TBasicType TUInt
     IO ()
 
 
diff --git a/GI/Gio/Objects/ListStore.hs-boot b/GI/Gio/Objects/ListStore.hs-boot
--- a/GI/Gio/Objects/ListStore.hs-boot
+++ b/GI/Gio/Objects/ListStore.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ListStore where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MemoryInputStream.hs b/GI/Gio/Objects/MemoryInputStream.hs
--- a/GI/Gio/Objects/MemoryInputStream.hs
+++ b/GI/Gio/Objects/MemoryInputStream.hs
@@ -43,9 +43,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -149,7 +149,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "MemoryInputStream"
+-- returnType : Just (TInterface "Gio" "MemoryInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -170,7 +170,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MemoryInputStream"
+-- returnType : Just (TInterface "Gio" "MemoryInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -195,7 +195,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "data", argType = TCArray False (-1) 1 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "MemoryInputStream"
+-- returnType : Just (TInterface "Gio" "MemoryInputStream")
 -- throws : False
 -- Skip return : False
 
@@ -230,7 +230,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -261,7 +261,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "len", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/MemoryInputStream.hs-boot b/GI/Gio/Objects/MemoryInputStream.hs-boot
--- a/GI/Gio/Objects/MemoryInputStream.hs-boot
+++ b/GI/Gio/Objects/MemoryInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MemoryInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MemoryOutputStream.hs b/GI/Gio/Objects/MemoryOutputStream.hs
--- a/GI/Gio/Objects/MemoryOutputStream.hs
+++ b/GI/Gio/Objects/MemoryOutputStream.hs
@@ -53,26 +53,29 @@
     MemoryOutputStreamDataPropertyInfo      ,
     constructMemoryOutputStreamData         ,
     getMemoryOutputStreamData               ,
+    memoryOutputStreamData                  ,
 
 
 -- ** DataSize
     MemoryOutputStreamDataSizePropertyInfo  ,
     getMemoryOutputStreamDataSize           ,
+    memoryOutputStreamDataSize              ,
 
 
 -- ** Size
     MemoryOutputStreamSizePropertyInfo      ,
     constructMemoryOutputStreamSize         ,
     getMemoryOutputStreamSize               ,
+    memoryOutputStreamSize                  ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -170,13 +173,14 @@
 #endif
 
 -- VVV Prop "data"
-   -- Type: TBasicType TVoid
+   -- Type: TBasicType TPtr
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getMemoryOutputStreamData :: (MonadIO m, MemoryOutputStreamK o) => o -> m (Ptr ())
 getMemoryOutputStreamData obj = liftIO $ getObjectPropertyPtr obj "data"
 
-constructMemoryOutputStreamData :: (Ptr ()) -> IO ([Char], GValue)
+constructMemoryOutputStreamData :: Ptr () -> IO ([Char], GValue)
 constructMemoryOutputStreamData val = constructObjectPropertyPtr "data" val
 
 data MemoryOutputStreamDataPropertyInfo
@@ -189,49 +193,63 @@
     attrGet _ = getMemoryOutputStreamData
     attrSet _ = undefined
     attrConstruct _ = constructMemoryOutputStreamData
+    attrClear _ = undefined
 
 -- VVV Prop "data-size"
-   -- Type: TBasicType TUInt64
+   -- Type: TBasicType TULong
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getMemoryOutputStreamDataSize :: (MonadIO m, MemoryOutputStreamK o) => o -> m Word64
-getMemoryOutputStreamDataSize obj = liftIO $ getObjectPropertyUInt64 obj "data-size"
+getMemoryOutputStreamDataSize :: (MonadIO m, MemoryOutputStreamK o) => o -> m CULong
+getMemoryOutputStreamDataSize obj = liftIO $ getObjectPropertyULong obj "data-size"
 
 data MemoryOutputStreamDataSizePropertyInfo
 instance AttrInfo MemoryOutputStreamDataSizePropertyInfo where
     type AttrAllowedOps MemoryOutputStreamDataSizePropertyInfo = '[ 'AttrGet]
     type AttrSetTypeConstraint MemoryOutputStreamDataSizePropertyInfo = (~) ()
     type AttrBaseTypeConstraint MemoryOutputStreamDataSizePropertyInfo = MemoryOutputStreamK
-    type AttrGetType MemoryOutputStreamDataSizePropertyInfo = Word64
+    type AttrGetType MemoryOutputStreamDataSizePropertyInfo = CULong
     type AttrLabel MemoryOutputStreamDataSizePropertyInfo = "data-size"
     attrGet _ = getMemoryOutputStreamDataSize
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "size"
-   -- Type: TBasicType TUInt64
+   -- Type: TBasicType TULong
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getMemoryOutputStreamSize :: (MonadIO m, MemoryOutputStreamK o) => o -> m Word64
-getMemoryOutputStreamSize obj = liftIO $ getObjectPropertyUInt64 obj "size"
+getMemoryOutputStreamSize :: (MonadIO m, MemoryOutputStreamK o) => o -> m CULong
+getMemoryOutputStreamSize obj = liftIO $ getObjectPropertyULong obj "size"
 
-constructMemoryOutputStreamSize :: Word64 -> IO ([Char], GValue)
-constructMemoryOutputStreamSize val = constructObjectPropertyUInt64 "size" val
+constructMemoryOutputStreamSize :: CULong -> IO ([Char], GValue)
+constructMemoryOutputStreamSize val = constructObjectPropertyULong "size" val
 
 data MemoryOutputStreamSizePropertyInfo
 instance AttrInfo MemoryOutputStreamSizePropertyInfo where
     type AttrAllowedOps MemoryOutputStreamSizePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
-    type AttrSetTypeConstraint MemoryOutputStreamSizePropertyInfo = (~) Word64
+    type AttrSetTypeConstraint MemoryOutputStreamSizePropertyInfo = (~) CULong
     type AttrBaseTypeConstraint MemoryOutputStreamSizePropertyInfo = MemoryOutputStreamK
-    type AttrGetType MemoryOutputStreamSizePropertyInfo = Word64
+    type AttrGetType MemoryOutputStreamSizePropertyInfo = CULong
     type AttrLabel MemoryOutputStreamSizePropertyInfo = "size"
     attrGet _ = getMemoryOutputStreamSize
     attrSet _ = undefined
     attrConstruct _ = constructMemoryOutputStreamSize
+    attrClear _ = undefined
 
 type instance AttributeList MemoryOutputStream = MemoryOutputStreamAttributeList
 type MemoryOutputStreamAttributeList = ('[ '("data", MemoryOutputStreamDataPropertyInfo), '("dataSize", MemoryOutputStreamDataSizePropertyInfo), '("size", MemoryOutputStreamSizePropertyInfo)] :: [(Symbol, *)])
 
+memoryOutputStreamData :: AttrLabelProxy "data"
+memoryOutputStreamData = AttrLabelProxy
+
+memoryOutputStreamDataSize :: AttrLabelProxy "dataSize"
+memoryOutputStreamDataSize = AttrLabelProxy
+
+memoryOutputStreamSize :: AttrLabelProxy "size"
+memoryOutputStreamSize = AttrLabelProxy
+
 type instance SignalList MemoryOutputStream = MemoryOutputStreamSignalList
 type MemoryOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -239,7 +257,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "MemoryOutputStream"
+-- returnType : Just (TInterface "Gio" "MemoryOutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -260,34 +278,34 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_memory_output_stream_get_data" g_memory_output_stream_get_data :: 
     Ptr MemoryOutputStream ->               -- _obj : TInterface "Gio" "MemoryOutputStream"
-    IO ()
+    IO (Ptr ())
 
 
 memoryOutputStreamGetData ::
     (MonadIO m, MemoryOutputStreamK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 memoryOutputStreamGetData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    g_memory_output_stream_get_data _obj'
+    result <- g_memory_output_stream_get_data _obj'
     touchManagedPtr _obj
-    return ()
+    return result
 
 data MemoryOutputStreamGetDataMethodInfo
-instance (signature ~ (m ()), MonadIO m, MemoryOutputStreamK a) => MethodInfo MemoryOutputStreamGetDataMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, MemoryOutputStreamK a) => MethodInfo MemoryOutputStreamGetDataMethodInfo a signature where
     overloadedMethod _ = memoryOutputStreamGetData
 
 -- method MemoryOutputStream::get_data_size
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -314,7 +332,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -341,7 +359,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : False
 -- Skip return : False
 
@@ -370,27 +388,27 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MemoryOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_memory_output_stream_steal_data" g_memory_output_stream_steal_data :: 
     Ptr MemoryOutputStream ->               -- _obj : TInterface "Gio" "MemoryOutputStream"
-    IO ()
+    IO (Ptr ())
 
 
 memoryOutputStreamStealData ::
     (MonadIO m, MemoryOutputStreamK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 memoryOutputStreamStealData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    g_memory_output_stream_steal_data _obj'
+    result <- g_memory_output_stream_steal_data _obj'
     touchManagedPtr _obj
-    return ()
+    return result
 
 data MemoryOutputStreamStealDataMethodInfo
-instance (signature ~ (m ()), MonadIO m, MemoryOutputStreamK a) => MethodInfo MemoryOutputStreamStealDataMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, MemoryOutputStreamK a) => MethodInfo MemoryOutputStreamStealDataMethodInfo a signature where
     overloadedMethod _ = memoryOutputStreamStealData
 
 
diff --git a/GI/Gio/Objects/MemoryOutputStream.hs-boot b/GI/Gio/Objects/MemoryOutputStream.hs-boot
--- a/GI/Gio/Objects/MemoryOutputStream.hs-boot
+++ b/GI/Gio/Objects/MemoryOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MemoryOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Menu.hs b/GI/Gio/Objects/Menu.hs
--- a/GI/Gio/Objects/Menu.hs
+++ b/GI/Gio/Objects/Menu.hs
@@ -100,9 +100,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -197,7 +197,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Menu"
+-- returnType : Just (TInterface "Gio" "Menu")
 -- throws : False
 -- Skip return : False
 
@@ -218,7 +218,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -261,7 +261,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -292,7 +292,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -331,7 +331,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -370,7 +370,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -395,15 +395,15 @@
 
 -- method Menu::insert
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_insert" g_menu_insert :: 
     Ptr Menu ->                             -- _obj : TInterface "Gio" "Menu"
-    Int32 ->                                -- position : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
     CString ->                              -- label : TBasicType TUTF8
     CString ->                              -- detailed_action : TBasicType TUTF8
     IO ()
@@ -440,15 +440,15 @@
 
 -- method Menu::insert_item
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_insert_item" g_menu_insert_item :: 
     Ptr Menu ->                             -- _obj : TInterface "Gio" "Menu"
-    Int32 ->                                -- position : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
     Ptr MenuItem ->                         -- item : TInterface "Gio" "MenuItem"
     IO ()
 
@@ -473,15 +473,15 @@
 
 -- method Menu::insert_section
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_insert_section" g_menu_insert_section :: 
     Ptr Menu ->                             -- _obj : TInterface "Gio" "Menu"
-    Int32 ->                                -- position : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
     CString ->                              -- label : TBasicType TUTF8
     Ptr MenuModel ->                        -- section : TInterface "Gio" "MenuModel"
     IO ()
@@ -514,15 +514,15 @@
 
 -- method Menu::insert_submenu
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_insert_submenu" g_menu_insert_submenu :: 
     Ptr Menu ->                             -- _obj : TInterface "Gio" "Menu"
-    Int32 ->                                -- position : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
     CString ->                              -- label : TBasicType TUTF8
     Ptr MenuModel ->                        -- submenu : TInterface "Gio" "MenuModel"
     IO ()
@@ -557,7 +557,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -600,7 +600,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -631,7 +631,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -670,7 +670,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -707,15 +707,15 @@
 
 -- method Menu::remove
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_remove" g_menu_remove :: 
     Ptr Menu ->                             -- _obj : TInterface "Gio" "Menu"
-    Int32 ->                                -- position : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
     IO ()
 
 
@@ -738,7 +738,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Menu", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Menu.hs-boot b/GI/Gio/Objects/Menu.hs-boot
--- a/GI/Gio/Objects/Menu.hs-boot
+++ b/GI/Gio/Objects/Menu.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Menu where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MenuAttributeIter.hs b/GI/Gio/Objects/MenuAttributeIter.hs
--- a/GI/Gio/Objects/MenuAttributeIter.hs
+++ b/GI/Gio/Objects/MenuAttributeIter.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -120,7 +120,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuAttributeIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -149,7 +149,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuAttributeIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_name", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -187,7 +187,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuAttributeIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -216,7 +216,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuAttributeIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/MenuAttributeIter.hs-boot b/GI/Gio/Objects/MenuAttributeIter.hs-boot
--- a/GI/Gio/Objects/MenuAttributeIter.hs-boot
+++ b/GI/Gio/Objects/MenuAttributeIter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MenuAttributeIter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MenuItem.hs b/GI/Gio/Objects/MenuItem.hs
--- a/GI/Gio/Objects/MenuItem.hs
+++ b/GI/Gio/Objects/MenuItem.hs
@@ -87,9 +87,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -173,7 +173,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuItem"
+-- returnType : Just (TInterface "Gio" "MenuItem")
 -- throws : False
 -- Skip return : False
 
@@ -208,15 +208,15 @@
 
 -- method MenuItem::new_from_model
 -- method type : Constructor
--- Args : [Arg {argCName = "model", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "model", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuItem"
+-- returnType : Just (TInterface "Gio" "MenuItem")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_item_new_from_model" g_menu_item_new_from_model :: 
     Ptr MenuModel ->                        -- model : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- item_index : TBasicType TInt32
+    Int32 ->                                -- item_index : TBasicType TInt
     IO (Ptr MenuItem)
 
 
@@ -237,7 +237,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuItem"
+-- returnType : Just (TInterface "Gio" "MenuItem")
 -- throws : False
 -- Skip return : False
 
@@ -270,7 +270,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuItem"
+-- returnType : Just (TInterface "Gio" "MenuItem")
 -- throws : False
 -- Skip return : False
 
@@ -303,7 +303,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "expected_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -344,7 +344,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "link", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuModel"
+-- returnType : Just (TInterface "Gio" "MenuModel")
 -- throws : False
 -- Skip return : False
 
@@ -377,7 +377,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target_value", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -419,7 +419,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -457,7 +457,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -488,7 +488,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -519,7 +519,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -554,7 +554,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "link", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "model", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -593,7 +593,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "section", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -628,7 +628,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuItem", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "submenu", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/MenuItem.hs-boot b/GI/Gio/Objects/MenuItem.hs-boot
--- a/GI/Gio/Objects/MenuItem.hs-boot
+++ b/GI/Gio/Objects/MenuItem.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MenuItem where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MenuLinkIter.hs b/GI/Gio/Objects/MenuLinkIter.hs
--- a/GI/Gio/Objects/MenuLinkIter.hs
+++ b/GI/Gio/Objects/MenuLinkIter.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -120,7 +120,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuLinkIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -149,7 +149,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuLinkIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "out_link", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TInterface "Gio" "MenuModel", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -187,7 +187,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuLinkIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuModel"
+-- returnType : Just (TInterface "Gio" "MenuModel")
 -- throws : False
 -- Skip return : False
 
@@ -216,7 +216,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuLinkIter", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/MenuLinkIter.hs-boot b/GI/Gio/Objects/MenuLinkIter.hs-boot
--- a/GI/Gio/Objects/MenuLinkIter.hs-boot
+++ b/GI/Gio/Objects/MenuLinkIter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MenuLinkIter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MenuModel.hs b/GI/Gio/Objects/MenuModel.hs
--- a/GI/Gio/Objects/MenuModel.hs
+++ b/GI/Gio/Objects/MenuModel.hs
@@ -71,9 +71,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -204,15 +204,15 @@
 
 -- method MenuModel::get_item_attribute_value
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "expected_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "expected_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_model_get_item_attribute_value" g_menu_model_get_item_attribute_value :: 
     Ptr MenuModel ->                        -- _obj : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- item_index : TBasicType TInt32
+    Int32 ->                                -- item_index : TBasicType TInt
     CString ->                              -- attribute : TBasicType TUTF8
     Ptr GLib.VariantType ->                 -- expected_type : TInterface "GLib" "VariantType"
     IO (Ptr GVariant)
@@ -247,15 +247,15 @@
 
 -- method MenuModel::get_item_link
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "link", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "link", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuModel"
+-- returnType : Just (TInterface "Gio" "MenuModel")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_model_get_item_link" g_menu_model_get_item_link :: 
     Ptr MenuModel ->                        -- _obj : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- item_index : TBasicType TInt32
+    Int32 ->                                -- item_index : TBasicType TInt
     CString ->                              -- link : TBasicType TUTF8
     IO (Ptr MenuModel)
 
@@ -284,7 +284,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -311,7 +311,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -337,17 +337,17 @@
 
 -- method MenuModel::items_changed
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "removed", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "added", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "position", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "removed", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "added", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_model_items_changed" g_menu_model_items_changed :: 
     Ptr MenuModel ->                        -- _obj : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- position : TBasicType TInt32
-    Int32 ->                                -- removed : TBasicType TInt32
-    Int32 ->                                -- added : TBasicType TInt32
+    Int32 ->                                -- position : TBasicType TInt
+    Int32 ->                                -- removed : TBasicType TInt
+    Int32 ->                                -- added : TBasicType TInt
     IO ()
 
 
@@ -370,15 +370,15 @@
 
 -- method MenuModel::iterate_item_attributes
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuAttributeIter"
+-- returnType : Just (TInterface "Gio" "MenuAttributeIter")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_model_iterate_item_attributes" g_menu_model_iterate_item_attributes :: 
     Ptr MenuModel ->                        -- _obj : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- item_index : TBasicType TInt32
+    Int32 ->                                -- item_index : TBasicType TInt
     IO (Ptr MenuAttributeIter)
 
 
@@ -401,15 +401,15 @@
 
 -- method MenuModel::iterate_item_links
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MenuModel", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "item_index", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "MenuLinkIter"
+-- returnType : Just (TInterface "Gio" "MenuLinkIter")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_menu_model_iterate_item_links" g_menu_model_iterate_item_links :: 
     Ptr MenuModel ->                        -- _obj : TInterface "Gio" "MenuModel"
-    Int32 ->                                -- item_index : TBasicType TInt32
+    Int32 ->                                -- item_index : TBasicType TInt
     IO (Ptr MenuLinkIter)
 
 
diff --git a/GI/Gio/Objects/MenuModel.hs-boot b/GI/Gio/Objects/MenuModel.hs-boot
--- a/GI/Gio/Objects/MenuModel.hs-boot
+++ b/GI/Gio/Objects/MenuModel.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MenuModel where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/MountOperation.hs b/GI/Gio/Objects/MountOperation.hs
--- a/GI/Gio/Objects/MountOperation.hs
+++ b/GI/Gio/Objects/MountOperation.hs
@@ -93,6 +93,7 @@
     MountOperationAnonymousPropertyInfo     ,
     constructMountOperationAnonymous        ,
     getMountOperationAnonymous              ,
+    mountOperationAnonymous                 ,
     setMountOperationAnonymous              ,
 
 
@@ -100,6 +101,7 @@
     MountOperationChoicePropertyInfo        ,
     constructMountOperationChoice           ,
     getMountOperationChoice                 ,
+    mountOperationChoice                    ,
     setMountOperationChoice                 ,
 
 
@@ -107,6 +109,7 @@
     MountOperationDomainPropertyInfo        ,
     constructMountOperationDomain           ,
     getMountOperationDomain                 ,
+    mountOperationDomain                    ,
     setMountOperationDomain                 ,
 
 
@@ -114,6 +117,7 @@
     MountOperationPasswordPropertyInfo      ,
     constructMountOperationPassword         ,
     getMountOperationPassword               ,
+    mountOperationPassword                  ,
     setMountOperationPassword               ,
 
 
@@ -121,6 +125,7 @@
     MountOperationPasswordSavePropertyInfo  ,
     constructMountOperationPasswordSave     ,
     getMountOperationPasswordSave           ,
+    mountOperationPasswordSave              ,
     setMountOperationPasswordSave           ,
 
 
@@ -128,6 +133,7 @@
     MountOperationUsernamePropertyInfo      ,
     constructMountOperationUsername         ,
     getMountOperationUsername               ,
+    mountOperationUsername                  ,
     setMountOperationUsername               ,
 
 
@@ -210,9 +216,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -569,6 +575,7 @@
 -- VVV Prop "anonymous"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationAnonymous :: (MonadIO m, MountOperationK o) => o -> m Bool
 getMountOperationAnonymous obj = liftIO $ getObjectPropertyBool obj "anonymous"
@@ -589,19 +596,21 @@
     attrGet _ = getMountOperationAnonymous
     attrSet _ = setMountOperationAnonymous
     attrConstruct _ = constructMountOperationAnonymous
+    attrClear _ = undefined
 
 -- VVV Prop "choice"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationChoice :: (MonadIO m, MountOperationK o) => o -> m Int32
-getMountOperationChoice obj = liftIO $ getObjectPropertyCInt obj "choice"
+getMountOperationChoice obj = liftIO $ getObjectPropertyInt32 obj "choice"
 
 setMountOperationChoice :: (MonadIO m, MountOperationK o) => o -> Int32 -> m ()
-setMountOperationChoice obj val = liftIO $ setObjectPropertyCInt obj "choice" val
+setMountOperationChoice obj val = liftIO $ setObjectPropertyInt32 obj "choice" val
 
 constructMountOperationChoice :: Int32 -> IO ([Char], GValue)
-constructMountOperationChoice val = constructObjectPropertyCInt "choice" val
+constructMountOperationChoice val = constructObjectPropertyInt32 "choice" val
 
 data MountOperationChoicePropertyInfo
 instance AttrInfo MountOperationChoicePropertyInfo where
@@ -613,19 +622,21 @@
     attrGet _ = getMountOperationChoice
     attrSet _ = setMountOperationChoice
     attrConstruct _ = constructMountOperationChoice
+    attrClear _ = undefined
 
 -- VVV Prop "domain"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationDomain :: (MonadIO m, MountOperationK o) => o -> m T.Text
-getMountOperationDomain obj = liftIO $ getObjectPropertyString obj "domain"
+getMountOperationDomain obj = liftIO $ checkUnexpectedNothing "getMountOperationDomain" $ getObjectPropertyString obj "domain"
 
 setMountOperationDomain :: (MonadIO m, MountOperationK o) => o -> T.Text -> m ()
-setMountOperationDomain obj val = liftIO $ setObjectPropertyString obj "domain" val
+setMountOperationDomain obj val = liftIO $ setObjectPropertyString obj "domain" (Just val)
 
 constructMountOperationDomain :: T.Text -> IO ([Char], GValue)
-constructMountOperationDomain val = constructObjectPropertyString "domain" val
+constructMountOperationDomain val = constructObjectPropertyString "domain" (Just val)
 
 data MountOperationDomainPropertyInfo
 instance AttrInfo MountOperationDomainPropertyInfo where
@@ -637,19 +648,21 @@
     attrGet _ = getMountOperationDomain
     attrSet _ = setMountOperationDomain
     attrConstruct _ = constructMountOperationDomain
+    attrClear _ = undefined
 
 -- VVV Prop "password"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationPassword :: (MonadIO m, MountOperationK o) => o -> m T.Text
-getMountOperationPassword obj = liftIO $ getObjectPropertyString obj "password"
+getMountOperationPassword obj = liftIO $ checkUnexpectedNothing "getMountOperationPassword" $ getObjectPropertyString obj "password"
 
 setMountOperationPassword :: (MonadIO m, MountOperationK o) => o -> T.Text -> m ()
-setMountOperationPassword obj val = liftIO $ setObjectPropertyString obj "password" val
+setMountOperationPassword obj val = liftIO $ setObjectPropertyString obj "password" (Just val)
 
 constructMountOperationPassword :: T.Text -> IO ([Char], GValue)
-constructMountOperationPassword val = constructObjectPropertyString "password" val
+constructMountOperationPassword val = constructObjectPropertyString "password" (Just val)
 
 data MountOperationPasswordPropertyInfo
 instance AttrInfo MountOperationPasswordPropertyInfo where
@@ -661,10 +674,12 @@
     attrGet _ = getMountOperationPassword
     attrSet _ = setMountOperationPassword
     attrConstruct _ = constructMountOperationPassword
+    attrClear _ = undefined
 
 -- VVV Prop "password-save"
    -- Type: TInterface "Gio" "PasswordSave"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationPasswordSave :: (MonadIO m, MountOperationK o) => o -> m PasswordSave
 getMountOperationPasswordSave obj = liftIO $ getObjectPropertyEnum obj "password-save"
@@ -685,19 +700,21 @@
     attrGet _ = getMountOperationPasswordSave
     attrSet _ = setMountOperationPasswordSave
     attrConstruct _ = constructMountOperationPasswordSave
+    attrClear _ = undefined
 
 -- VVV Prop "username"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getMountOperationUsername :: (MonadIO m, MountOperationK o) => o -> m T.Text
-getMountOperationUsername obj = liftIO $ getObjectPropertyString obj "username"
+getMountOperationUsername obj = liftIO $ checkUnexpectedNothing "getMountOperationUsername" $ getObjectPropertyString obj "username"
 
 setMountOperationUsername :: (MonadIO m, MountOperationK o) => o -> T.Text -> m ()
-setMountOperationUsername obj val = liftIO $ setObjectPropertyString obj "username" val
+setMountOperationUsername obj val = liftIO $ setObjectPropertyString obj "username" (Just val)
 
 constructMountOperationUsername :: T.Text -> IO ([Char], GValue)
-constructMountOperationUsername val = constructObjectPropertyString "username" val
+constructMountOperationUsername val = constructObjectPropertyString "username" (Just val)
 
 data MountOperationUsernamePropertyInfo
 instance AttrInfo MountOperationUsernamePropertyInfo where
@@ -709,10 +726,29 @@
     attrGet _ = getMountOperationUsername
     attrSet _ = setMountOperationUsername
     attrConstruct _ = constructMountOperationUsername
+    attrClear _ = undefined
 
 type instance AttributeList MountOperation = MountOperationAttributeList
 type MountOperationAttributeList = ('[ '("anonymous", MountOperationAnonymousPropertyInfo), '("choice", MountOperationChoicePropertyInfo), '("domain", MountOperationDomainPropertyInfo), '("password", MountOperationPasswordPropertyInfo), '("passwordSave", MountOperationPasswordSavePropertyInfo), '("username", MountOperationUsernamePropertyInfo)] :: [(Symbol, *)])
 
+mountOperationAnonymous :: AttrLabelProxy "anonymous"
+mountOperationAnonymous = AttrLabelProxy
+
+mountOperationChoice :: AttrLabelProxy "choice"
+mountOperationChoice = AttrLabelProxy
+
+mountOperationDomain :: AttrLabelProxy "domain"
+mountOperationDomain = AttrLabelProxy
+
+mountOperationPassword :: AttrLabelProxy "password"
+mountOperationPassword = AttrLabelProxy
+
+mountOperationPasswordSave :: AttrLabelProxy "passwordSave"
+mountOperationPasswordSave = AttrLabelProxy
+
+mountOperationUsername :: AttrLabelProxy "username"
+mountOperationUsername = AttrLabelProxy
+
 data MountOperationAbortedSignalInfo
 instance SignalInfo MountOperationAbortedSignalInfo where
     type HaskellCallbackType MountOperationAbortedSignalInfo = MountOperationAbortedCallback
@@ -750,7 +786,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "MountOperation"
+-- returnType : Just (TInterface "Gio" "MountOperation")
 -- throws : False
 -- Skip return : False
 
@@ -771,7 +807,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -799,7 +835,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -826,7 +862,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -855,7 +891,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -884,7 +920,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "PasswordSave"
+-- returnType : Just (TInterface "Gio" "PasswordSave")
 -- throws : False
 -- Skip return : False
 
@@ -912,7 +948,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -941,7 +977,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "MountOperationResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -971,7 +1007,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "anonymous", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -999,15 +1035,15 @@
 
 -- method MountOperation::set_choice
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "choice", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "choice", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_mount_operation_set_choice" g_mount_operation_set_choice :: 
     Ptr MountOperation ->                   -- _obj : TInterface "Gio" "MountOperation"
-    Int32 ->                                -- choice : TBasicType TInt32
+    Int32 ->                                -- choice : TBasicType TInt
     IO ()
 
 
@@ -1030,7 +1066,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1061,7 +1097,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1092,7 +1128,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "save", argType = TInterface "Gio" "PasswordSave", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1122,7 +1158,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "MountOperation", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "username", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/MountOperation.hs-boot b/GI/Gio/Objects/MountOperation.hs-boot
--- a/GI/Gio/Objects/MountOperation.hs-boot
+++ b/GI/Gio/Objects/MountOperation.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.MountOperation where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/NativeVolumeMonitor.hs b/GI/Gio/Objects/NativeVolumeMonitor.hs
--- a/GI/Gio/Objects/NativeVolumeMonitor.hs
+++ b/GI/Gio/Objects/NativeVolumeMonitor.hs
@@ -18,9 +18,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/NativeVolumeMonitor.hs-boot b/GI/Gio/Objects/NativeVolumeMonitor.hs-boot
--- a/GI/Gio/Objects/NativeVolumeMonitor.hs-boot
+++ b/GI/Gio/Objects/NativeVolumeMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.NativeVolumeMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/NetworkAddress.hs b/GI/Gio/Objects/NetworkAddress.hs
--- a/GI/Gio/Objects/NetworkAddress.hs
+++ b/GI/Gio/Objects/NetworkAddress.hs
@@ -55,27 +55,30 @@
     NetworkAddressHostnamePropertyInfo      ,
     constructNetworkAddressHostname         ,
     getNetworkAddressHostname               ,
+    networkAddressHostname                  ,
 
 
 -- ** Port
     NetworkAddressPortPropertyInfo          ,
     constructNetworkAddressPort             ,
     getNetworkAddressPort                   ,
+    networkAddressPort                      ,
 
 
 -- ** Scheme
     NetworkAddressSchemePropertyInfo        ,
     constructNetworkAddressScheme           ,
     getNetworkAddressScheme                 ,
+    networkAddressScheme                    ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -146,16 +149,17 @@
 -- VVV Prop "hostname"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkAddressHostname :: (MonadIO m, NetworkAddressK o) => o -> m T.Text
-getNetworkAddressHostname obj = liftIO $ getObjectPropertyString obj "hostname"
+getNetworkAddressHostname obj = liftIO $ checkUnexpectedNothing "getNetworkAddressHostname" $ getObjectPropertyString obj "hostname"
 
 constructNetworkAddressHostname :: T.Text -> IO ([Char], GValue)
-constructNetworkAddressHostname val = constructObjectPropertyString "hostname" val
+constructNetworkAddressHostname val = constructObjectPropertyString "hostname" (Just val)
 
 data NetworkAddressHostnamePropertyInfo
 instance AttrInfo NetworkAddressHostnamePropertyInfo where
-    type AttrAllowedOps NetworkAddressHostnamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NetworkAddressHostnamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NetworkAddressHostnamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NetworkAddressHostnamePropertyInfo = NetworkAddressK
     type AttrGetType NetworkAddressHostnamePropertyInfo = T.Text
@@ -163,16 +167,18 @@
     attrGet _ = getNetworkAddressHostname
     attrSet _ = undefined
     attrConstruct _ = constructNetworkAddressHostname
+    attrClear _ = undefined
 
 -- VVV Prop "port"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getNetworkAddressPort :: (MonadIO m, NetworkAddressK o) => o -> m Word32
-getNetworkAddressPort obj = liftIO $ getObjectPropertyCUInt obj "port"
+getNetworkAddressPort obj = liftIO $ getObjectPropertyUInt32 obj "port"
 
 constructNetworkAddressPort :: Word32 -> IO ([Char], GValue)
-constructNetworkAddressPort val = constructObjectPropertyCUInt "port" val
+constructNetworkAddressPort val = constructObjectPropertyUInt32 "port" val
 
 data NetworkAddressPortPropertyInfo
 instance AttrInfo NetworkAddressPortPropertyInfo where
@@ -184,20 +190,22 @@
     attrGet _ = getNetworkAddressPort
     attrSet _ = undefined
     attrConstruct _ = constructNetworkAddressPort
+    attrClear _ = undefined
 
 -- VVV Prop "scheme"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkAddressScheme :: (MonadIO m, NetworkAddressK o) => o -> m T.Text
-getNetworkAddressScheme obj = liftIO $ getObjectPropertyString obj "scheme"
+getNetworkAddressScheme obj = liftIO $ checkUnexpectedNothing "getNetworkAddressScheme" $ getObjectPropertyString obj "scheme"
 
 constructNetworkAddressScheme :: T.Text -> IO ([Char], GValue)
-constructNetworkAddressScheme val = constructObjectPropertyString "scheme" val
+constructNetworkAddressScheme val = constructObjectPropertyString "scheme" (Just val)
 
 data NetworkAddressSchemePropertyInfo
 instance AttrInfo NetworkAddressSchemePropertyInfo where
-    type AttrAllowedOps NetworkAddressSchemePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NetworkAddressSchemePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NetworkAddressSchemePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NetworkAddressSchemePropertyInfo = NetworkAddressK
     type AttrGetType NetworkAddressSchemePropertyInfo = T.Text
@@ -205,10 +213,20 @@
     attrGet _ = getNetworkAddressScheme
     attrSet _ = undefined
     attrConstruct _ = constructNetworkAddressScheme
+    attrClear _ = undefined
 
 type instance AttributeList NetworkAddress = NetworkAddressAttributeList
 type NetworkAddressAttributeList = ('[ '("hostname", NetworkAddressHostnamePropertyInfo), '("port", NetworkAddressPortPropertyInfo), '("scheme", NetworkAddressSchemePropertyInfo)] :: [(Symbol, *)])
 
+networkAddressHostname :: AttrLabelProxy "hostname"
+networkAddressHostname = AttrLabelProxy
+
+networkAddressPort :: AttrLabelProxy "port"
+networkAddressPort = AttrLabelProxy
+
+networkAddressScheme :: AttrLabelProxy "scheme"
+networkAddressScheme = AttrLabelProxy
+
 type instance SignalList NetworkAddress = NetworkAddressSignalList
 type NetworkAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -216,7 +234,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkAddress"
+-- returnType : Just (TInterface "Gio" "NetworkAddress")
 -- throws : False
 -- Skip return : False
 
@@ -243,7 +261,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkAddress"
+-- returnType : Just (TInterface "Gio" "NetworkAddress")
 -- throws : False
 -- Skip return : False
 
@@ -266,7 +284,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -295,7 +313,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
@@ -322,7 +340,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -351,7 +369,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "host_and_port", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkAddress"
+-- returnType : Just (TInterface "Gio" "NetworkAddress")
 -- throws : True
 -- Skip return : False
 
@@ -383,7 +401,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkAddress"
+-- returnType : Just (TInterface "Gio" "NetworkAddress")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/NetworkAddress.hs-boot b/GI/Gio/Objects/NetworkAddress.hs-boot
--- a/GI/Gio/Objects/NetworkAddress.hs-boot
+++ b/GI/Gio/Objects/NetworkAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.NetworkAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/NetworkService.hs b/GI/Gio/Objects/NetworkService.hs
--- a/GI/Gio/Objects/NetworkService.hs
+++ b/GI/Gio/Objects/NetworkService.hs
@@ -53,18 +53,21 @@
     NetworkServiceDomainPropertyInfo        ,
     constructNetworkServiceDomain           ,
     getNetworkServiceDomain                 ,
+    networkServiceDomain                    ,
 
 
 -- ** Protocol
     NetworkServiceProtocolPropertyInfo      ,
     constructNetworkServiceProtocol         ,
     getNetworkServiceProtocol               ,
+    networkServiceProtocol                  ,
 
 
 -- ** Scheme
     NetworkServiceSchemePropertyInfo        ,
     constructNetworkServiceScheme           ,
     getNetworkServiceScheme                 ,
+    networkServiceScheme                    ,
     setNetworkServiceScheme                 ,
 
 
@@ -72,15 +75,16 @@
     NetworkServiceServicePropertyInfo       ,
     constructNetworkServiceService          ,
     getNetworkServiceService                ,
+    networkServiceService                   ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -153,16 +157,17 @@
 -- VVV Prop "domain"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkServiceDomain :: (MonadIO m, NetworkServiceK o) => o -> m T.Text
-getNetworkServiceDomain obj = liftIO $ getObjectPropertyString obj "domain"
+getNetworkServiceDomain obj = liftIO $ checkUnexpectedNothing "getNetworkServiceDomain" $ getObjectPropertyString obj "domain"
 
 constructNetworkServiceDomain :: T.Text -> IO ([Char], GValue)
-constructNetworkServiceDomain val = constructObjectPropertyString "domain" val
+constructNetworkServiceDomain val = constructObjectPropertyString "domain" (Just val)
 
 data NetworkServiceDomainPropertyInfo
 instance AttrInfo NetworkServiceDomainPropertyInfo where
-    type AttrAllowedOps NetworkServiceDomainPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NetworkServiceDomainPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NetworkServiceDomainPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NetworkServiceDomainPropertyInfo = NetworkServiceK
     type AttrGetType NetworkServiceDomainPropertyInfo = T.Text
@@ -170,20 +175,22 @@
     attrGet _ = getNetworkServiceDomain
     attrSet _ = undefined
     attrConstruct _ = constructNetworkServiceDomain
+    attrClear _ = undefined
 
 -- VVV Prop "protocol"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkServiceProtocol :: (MonadIO m, NetworkServiceK o) => o -> m T.Text
-getNetworkServiceProtocol obj = liftIO $ getObjectPropertyString obj "protocol"
+getNetworkServiceProtocol obj = liftIO $ checkUnexpectedNothing "getNetworkServiceProtocol" $ getObjectPropertyString obj "protocol"
 
 constructNetworkServiceProtocol :: T.Text -> IO ([Char], GValue)
-constructNetworkServiceProtocol val = constructObjectPropertyString "protocol" val
+constructNetworkServiceProtocol val = constructObjectPropertyString "protocol" (Just val)
 
 data NetworkServiceProtocolPropertyInfo
 instance AttrInfo NetworkServiceProtocolPropertyInfo where
-    type AttrAllowedOps NetworkServiceProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NetworkServiceProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NetworkServiceProtocolPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NetworkServiceProtocolPropertyInfo = NetworkServiceK
     type AttrGetType NetworkServiceProtocolPropertyInfo = T.Text
@@ -191,19 +198,21 @@
     attrGet _ = getNetworkServiceProtocol
     attrSet _ = undefined
     attrConstruct _ = constructNetworkServiceProtocol
+    attrClear _ = undefined
 
 -- VVV Prop "scheme"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getNetworkServiceScheme :: (MonadIO m, NetworkServiceK o) => o -> m T.Text
-getNetworkServiceScheme obj = liftIO $ getObjectPropertyString obj "scheme"
+getNetworkServiceScheme obj = liftIO $ checkUnexpectedNothing "getNetworkServiceScheme" $ getObjectPropertyString obj "scheme"
 
 setNetworkServiceScheme :: (MonadIO m, NetworkServiceK o) => o -> T.Text -> m ()
-setNetworkServiceScheme obj val = liftIO $ setObjectPropertyString obj "scheme" val
+setNetworkServiceScheme obj val = liftIO $ setObjectPropertyString obj "scheme" (Just val)
 
 constructNetworkServiceScheme :: T.Text -> IO ([Char], GValue)
-constructNetworkServiceScheme val = constructObjectPropertyString "scheme" val
+constructNetworkServiceScheme val = constructObjectPropertyString "scheme" (Just val)
 
 data NetworkServiceSchemePropertyInfo
 instance AttrInfo NetworkServiceSchemePropertyInfo where
@@ -215,20 +224,22 @@
     attrGet _ = getNetworkServiceScheme
     attrSet _ = setNetworkServiceScheme
     attrConstruct _ = constructNetworkServiceScheme
+    attrClear _ = undefined
 
 -- VVV Prop "service"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getNetworkServiceService :: (MonadIO m, NetworkServiceK o) => o -> m T.Text
-getNetworkServiceService obj = liftIO $ getObjectPropertyString obj "service"
+getNetworkServiceService obj = liftIO $ checkUnexpectedNothing "getNetworkServiceService" $ getObjectPropertyString obj "service"
 
 constructNetworkServiceService :: T.Text -> IO ([Char], GValue)
-constructNetworkServiceService val = constructObjectPropertyString "service" val
+constructNetworkServiceService val = constructObjectPropertyString "service" (Just val)
 
 data NetworkServiceServicePropertyInfo
 instance AttrInfo NetworkServiceServicePropertyInfo where
-    type AttrAllowedOps NetworkServiceServicePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NetworkServiceServicePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NetworkServiceServicePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NetworkServiceServicePropertyInfo = NetworkServiceK
     type AttrGetType NetworkServiceServicePropertyInfo = T.Text
@@ -236,10 +247,23 @@
     attrGet _ = getNetworkServiceService
     attrSet _ = undefined
     attrConstruct _ = constructNetworkServiceService
+    attrClear _ = undefined
 
 type instance AttributeList NetworkService = NetworkServiceAttributeList
 type NetworkServiceAttributeList = ('[ '("domain", NetworkServiceDomainPropertyInfo), '("protocol", NetworkServiceProtocolPropertyInfo), '("scheme", NetworkServiceSchemePropertyInfo), '("service", NetworkServiceServicePropertyInfo)] :: [(Symbol, *)])
 
+networkServiceDomain :: AttrLabelProxy "domain"
+networkServiceDomain = AttrLabelProxy
+
+networkServiceProtocol :: AttrLabelProxy "protocol"
+networkServiceProtocol = AttrLabelProxy
+
+networkServiceScheme :: AttrLabelProxy "scheme"
+networkServiceScheme = AttrLabelProxy
+
+networkServiceService :: AttrLabelProxy "service"
+networkServiceService = AttrLabelProxy
+
 type instance SignalList NetworkService = NetworkServiceSignalList
 type NetworkServiceSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -247,7 +271,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "NetworkService"
+-- returnType : Just (TInterface "Gio" "NetworkService")
 -- throws : False
 -- Skip return : False
 
@@ -280,7 +304,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -309,7 +333,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -338,7 +362,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -367,7 +391,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -396,7 +420,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "NetworkService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "scheme", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/NetworkService.hs-boot b/GI/Gio/Objects/NetworkService.hs-boot
--- a/GI/Gio/Objects/NetworkService.hs-boot
+++ b/GI/Gio/Objects/NetworkService.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.NetworkService where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Notification.hs b/GI/Gio/Objects/Notification.hs
--- a/GI/Gio/Objects/Notification.hs
+++ b/GI/Gio/Objects/Notification.hs
@@ -70,9 +70,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -154,7 +154,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "title", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Notification"
+-- returnType : Just (TInterface "Gio" "Notification")
 -- throws : False
 -- Skip return : False
 
@@ -179,7 +179,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -214,7 +214,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -256,7 +256,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "body", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -291,7 +291,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "detailed_action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -322,7 +322,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -360,7 +360,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon", argType = TInterface "Gio" "Icon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -391,7 +391,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TInterface "Gio" "NotificationPriority", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -421,7 +421,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "title", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -452,7 +452,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "urgent", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Notification.hs-boot b/GI/Gio/Objects/Notification.hs-boot
--- a/GI/Gio/Objects/Notification.hs-boot
+++ b/GI/Gio/Objects/Notification.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Notification where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/OutputStream.hs b/GI/Gio/Objects/OutputStream.hs
--- a/GI/Gio/Objects/OutputStream.hs
+++ b/GI/Gio/Objects/OutputStream.hs
@@ -136,9 +136,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -235,7 +235,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -262,7 +262,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -300,18 +300,18 @@
 
 -- method OutputStream::close_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_output_stream_close_async" g_output_stream_close_async :: 
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -350,7 +350,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -386,7 +386,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -424,18 +424,18 @@
 
 -- method OutputStream::flush_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_output_stream_flush_async" g_output_stream_flush_async :: 
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -474,7 +474,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -510,7 +510,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -538,7 +538,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -566,7 +566,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -594,7 +594,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -626,7 +626,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "OutputStreamSpliceFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -671,9 +671,9 @@
 
 -- method OutputStream::splice_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "OutputStreamSpliceFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "OutputStreamSpliceFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -681,10 +681,10 @@
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
     Ptr InputStream ->                      -- source : TInterface "Gio" "InputStream"
     CUInt ->                                -- flags : TInterface "Gio" "OutputStreamSpliceFlags"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -728,7 +728,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -764,7 +764,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -810,7 +810,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_written", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -859,9 +859,9 @@
 
 -- method OutputStream::write_all_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -869,10 +869,10 @@
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
     Ptr Word8 ->                            -- buffer : TCArray False (-1) 2 (TBasicType TUInt8)
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -915,7 +915,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes_written", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -953,9 +953,9 @@
 
 -- method OutputStream::write_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "count", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -963,10 +963,10 @@
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
     Ptr Word8 ->                            -- buffer : TCArray False (-1) 2 (TBasicType TUInt8)
     Word64 ->                               -- count : TBasicType TUInt64
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1009,7 +1009,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1051,19 +1051,19 @@
 
 -- method OutputStream::write_bytes_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bytes", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_output_stream_write_bytes_async" g_output_stream_write_bytes_async :: 
     Ptr OutputStream ->                     -- _obj : TInterface "Gio" "OutputStream"
     Ptr GLib.Bytes ->                       -- bytes : TInterface "GLib" "Bytes"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1105,7 +1105,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1141,7 +1141,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/OutputStream.hs-boot b/GI/Gio/Objects/OutputStream.hs-boot
--- a/GI/Gio/Objects/OutputStream.hs-boot
+++ b/GI/Gio/Objects/OutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.OutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Permission.hs b/GI/Gio/Objects/Permission.hs
--- a/GI/Gio/Objects/Permission.hs
+++ b/GI/Gio/Objects/Permission.hs
@@ -73,25 +73,28 @@
 -- ** Allowed
     PermissionAllowedPropertyInfo           ,
     getPermissionAllowed                    ,
+    permissionAllowed                       ,
 
 
 -- ** CanAcquire
     PermissionCanAcquirePropertyInfo        ,
     getPermissionCanAcquire                 ,
+    permissionCanAcquire                    ,
 
 
 -- ** CanRelease
     PermissionCanReleasePropertyInfo        ,
     getPermissionCanRelease                 ,
+    permissionCanRelease                    ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -167,6 +170,7 @@
 -- VVV Prop "allowed"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getPermissionAllowed :: (MonadIO m, PermissionK o) => o -> m Bool
 getPermissionAllowed obj = liftIO $ getObjectPropertyBool obj "allowed"
@@ -181,10 +185,12 @@
     attrGet _ = getPermissionAllowed
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "can-acquire"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getPermissionCanAcquire :: (MonadIO m, PermissionK o) => o -> m Bool
 getPermissionCanAcquire obj = liftIO $ getObjectPropertyBool obj "can-acquire"
@@ -199,10 +205,12 @@
     attrGet _ = getPermissionCanAcquire
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "can-release"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getPermissionCanRelease :: (MonadIO m, PermissionK o) => o -> m Bool
 getPermissionCanRelease obj = liftIO $ getObjectPropertyBool obj "can-release"
@@ -217,10 +225,20 @@
     attrGet _ = getPermissionCanRelease
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList Permission = PermissionAttributeList
 type PermissionAttributeList = ('[ '("allowed", PermissionAllowedPropertyInfo), '("canAcquire", PermissionCanAcquirePropertyInfo), '("canRelease", PermissionCanReleasePropertyInfo)] :: [(Symbol, *)])
 
+permissionAllowed :: AttrLabelProxy "allowed"
+permissionAllowed = AttrLabelProxy
+
+permissionCanAcquire :: AttrLabelProxy "canAcquire"
+permissionCanAcquire = AttrLabelProxy
+
+permissionCanRelease :: AttrLabelProxy "canRelease"
+permissionCanRelease = AttrLabelProxy
+
 type instance SignalList Permission = PermissionSignalList
 type PermissionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -228,7 +246,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -266,9 +284,9 @@
 
 -- method Permission::acquire_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -276,7 +294,7 @@
     Ptr Permission ->                       -- _obj : TInterface "Gio" "Permission"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -314,7 +332,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -350,7 +368,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -378,7 +396,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -406,7 +424,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -434,7 +452,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "allowed", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "can_acquire", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "can_release", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -470,7 +488,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -508,9 +526,9 @@
 
 -- method Permission::release_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -518,7 +536,7 @@
     Ptr Permission ->                       -- _obj : TInterface "Gio" "Permission"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -556,7 +574,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Permission", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Permission.hs-boot b/GI/Gio/Objects/Permission.hs-boot
--- a/GI/Gio/Objects/Permission.hs-boot
+++ b/GI/Gio/Objects/Permission.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Permission where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/PropertyAction.hs b/GI/Gio/Objects/PropertyAction.hs
--- a/GI/Gio/Objects/PropertyAction.hs
+++ b/GI/Gio/Objects/PropertyAction.hs
@@ -27,52 +27,60 @@
 -- ** Enabled
     PropertyActionEnabledPropertyInfo       ,
     getPropertyActionEnabled                ,
+    propertyActionEnabled                   ,
 
 
 -- ** InvertBoolean
     PropertyActionInvertBooleanPropertyInfo ,
     constructPropertyActionInvertBoolean    ,
     getPropertyActionInvertBoolean          ,
+    propertyActionInvertBoolean             ,
 
 
 -- ** Name
     PropertyActionNamePropertyInfo          ,
     constructPropertyActionName             ,
     getPropertyActionName                   ,
+    propertyActionName                      ,
 
 
 -- ** Object
     PropertyActionObjectPropertyInfo        ,
     constructPropertyActionObject           ,
+    propertyActionObject                    ,
 
 
 -- ** ParameterType
     PropertyActionParameterTypePropertyInfo ,
     getPropertyActionParameterType          ,
+    propertyActionParameterType             ,
 
 
 -- ** PropertyName
     PropertyActionPropertyNamePropertyInfo  ,
     constructPropertyActionPropertyName     ,
+    propertyActionPropertyName              ,
 
 
 -- ** State
     PropertyActionStatePropertyInfo         ,
     getPropertyActionState                  ,
+    propertyActionState                     ,
 
 
 -- ** StateType
     PropertyActionStateTypePropertyInfo     ,
     getPropertyActionStateType              ,
+    propertyActionStateType                 ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -145,11 +153,12 @@
 #endif
 
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "PropertyAction"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "PropertyAction"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 -- VVV Prop "enabled"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getPropertyActionEnabled :: (MonadIO m, PropertyActionK o) => o -> m Bool
 getPropertyActionEnabled obj = liftIO $ getObjectPropertyBool obj "enabled"
@@ -164,10 +173,12 @@
     attrGet _ = getPropertyActionEnabled
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "invert-boolean"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getPropertyActionInvertBoolean :: (MonadIO m, PropertyActionK o) => o -> m Bool
 getPropertyActionInvertBoolean obj = liftIO $ getObjectPropertyBool obj "invert-boolean"
@@ -185,38 +196,42 @@
     attrGet _ = getPropertyActionInvertBoolean
     attrSet _ = undefined
     attrConstruct _ = constructPropertyActionInvertBoolean
+    attrClear _ = undefined
 
 -- VVV Prop "name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getPropertyActionName :: (MonadIO m, PropertyActionK o) => o -> m T.Text
+getPropertyActionName :: (MonadIO m, PropertyActionK o) => o -> m (Maybe T.Text)
 getPropertyActionName obj = liftIO $ getObjectPropertyString obj "name"
 
 constructPropertyActionName :: T.Text -> IO ([Char], GValue)
-constructPropertyActionName val = constructObjectPropertyString "name" val
+constructPropertyActionName val = constructObjectPropertyString "name" (Just val)
 
 data PropertyActionNamePropertyInfo
 instance AttrInfo PropertyActionNamePropertyInfo where
-    type AttrAllowedOps PropertyActionNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps PropertyActionNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint PropertyActionNamePropertyInfo = PropertyActionK
-    type AttrGetType PropertyActionNamePropertyInfo = T.Text
+    type AttrGetType PropertyActionNamePropertyInfo = (Maybe T.Text)
     type AttrLabel PropertyActionNamePropertyInfo = "name"
     attrGet _ = getPropertyActionName
     attrSet _ = undefined
     attrConstruct _ = constructPropertyActionName
+    attrClear _ = undefined
 
 -- VVV Prop "object"
    -- Type: TInterface "GObject" "Object"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructPropertyActionObject :: (GObject.ObjectK a) => a -> IO ([Char], GValue)
-constructPropertyActionObject val = constructObjectPropertyObject "object" val
+constructPropertyActionObject val = constructObjectPropertyObject "object" (Just val)
 
 data PropertyActionObjectPropertyInfo
 instance AttrInfo PropertyActionObjectPropertyInfo where
-    type AttrAllowedOps PropertyActionObjectPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps PropertyActionObjectPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionObjectPropertyInfo = GObject.ObjectK
     type AttrBaseTypeConstraint PropertyActionObjectPropertyInfo = PropertyActionK
     type AttrGetType PropertyActionObjectPropertyInfo = ()
@@ -224,35 +239,39 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructPropertyActionObject
+    attrClear _ = undefined
 
 -- VVV Prop "parameter-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getPropertyActionParameterType :: (MonadIO m, PropertyActionK o) => o -> m GLib.VariantType
+getPropertyActionParameterType :: (MonadIO m, PropertyActionK o) => o -> m (Maybe GLib.VariantType)
 getPropertyActionParameterType obj = liftIO $ getObjectPropertyBoxed obj "parameter-type" GLib.VariantType
 
 data PropertyActionParameterTypePropertyInfo
 instance AttrInfo PropertyActionParameterTypePropertyInfo where
-    type AttrAllowedOps PropertyActionParameterTypePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps PropertyActionParameterTypePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionParameterTypePropertyInfo = (~) ()
     type AttrBaseTypeConstraint PropertyActionParameterTypePropertyInfo = PropertyActionK
-    type AttrGetType PropertyActionParameterTypePropertyInfo = GLib.VariantType
+    type AttrGetType PropertyActionParameterTypePropertyInfo = (Maybe GLib.VariantType)
     type AttrLabel PropertyActionParameterTypePropertyInfo = "parameter-type"
     attrGet _ = getPropertyActionParameterType
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "property-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructPropertyActionPropertyName :: T.Text -> IO ([Char], GValue)
-constructPropertyActionPropertyName val = constructObjectPropertyString "property-name" val
+constructPropertyActionPropertyName val = constructObjectPropertyString "property-name" (Just val)
 
 data PropertyActionPropertyNamePropertyInfo
 instance AttrInfo PropertyActionPropertyNamePropertyInfo where
-    type AttrAllowedOps PropertyActionPropertyNamePropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps PropertyActionPropertyNamePropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionPropertyNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint PropertyActionPropertyNamePropertyInfo = PropertyActionK
     type AttrGetType PropertyActionPropertyNamePropertyInfo = ()
@@ -260,46 +279,75 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructPropertyActionPropertyName
+    attrClear _ = undefined
 
 -- VVV Prop "state"
    -- Type: TVariant
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getPropertyActionState :: (MonadIO m, PropertyActionK o) => o -> m GVariant
+getPropertyActionState :: (MonadIO m, PropertyActionK o) => o -> m (Maybe GVariant)
 getPropertyActionState obj = liftIO $ getObjectPropertyVariant obj "state"
 
 data PropertyActionStatePropertyInfo
 instance AttrInfo PropertyActionStatePropertyInfo where
-    type AttrAllowedOps PropertyActionStatePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps PropertyActionStatePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionStatePropertyInfo = (~) ()
     type AttrBaseTypeConstraint PropertyActionStatePropertyInfo = PropertyActionK
-    type AttrGetType PropertyActionStatePropertyInfo = GVariant
+    type AttrGetType PropertyActionStatePropertyInfo = (Maybe GVariant)
     type AttrLabel PropertyActionStatePropertyInfo = "state"
     attrGet _ = getPropertyActionState
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "state-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getPropertyActionStateType :: (MonadIO m, PropertyActionK o) => o -> m GLib.VariantType
+getPropertyActionStateType :: (MonadIO m, PropertyActionK o) => o -> m (Maybe GLib.VariantType)
 getPropertyActionStateType obj = liftIO $ getObjectPropertyBoxed obj "state-type" GLib.VariantType
 
 data PropertyActionStateTypePropertyInfo
 instance AttrInfo PropertyActionStateTypePropertyInfo where
-    type AttrAllowedOps PropertyActionStateTypePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps PropertyActionStateTypePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint PropertyActionStateTypePropertyInfo = (~) ()
     type AttrBaseTypeConstraint PropertyActionStateTypePropertyInfo = PropertyActionK
-    type AttrGetType PropertyActionStateTypePropertyInfo = GLib.VariantType
+    type AttrGetType PropertyActionStateTypePropertyInfo = (Maybe GLib.VariantType)
     type AttrLabel PropertyActionStateTypePropertyInfo = "state-type"
     attrGet _ = getPropertyActionStateType
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList PropertyAction = PropertyActionAttributeList
 type PropertyActionAttributeList = ('[ '("enabled", PropertyActionEnabledPropertyInfo), '("invertBoolean", PropertyActionInvertBooleanPropertyInfo), '("object", PropertyActionObjectPropertyInfo), '("parameterType", PropertyActionParameterTypePropertyInfo), '("propertyName", PropertyActionPropertyNamePropertyInfo), '("state", PropertyActionStatePropertyInfo), '("stateType", PropertyActionStateTypePropertyInfo)] :: [(Symbol, *)])
 
+propertyActionEnabled :: AttrLabelProxy "enabled"
+propertyActionEnabled = AttrLabelProxy
+
+propertyActionInvertBoolean :: AttrLabelProxy "invertBoolean"
+propertyActionInvertBoolean = AttrLabelProxy
+
+propertyActionName :: AttrLabelProxy "name"
+propertyActionName = AttrLabelProxy
+
+propertyActionObject :: AttrLabelProxy "object"
+propertyActionObject = AttrLabelProxy
+
+propertyActionParameterType :: AttrLabelProxy "parameterType"
+propertyActionParameterType = AttrLabelProxy
+
+propertyActionPropertyName :: AttrLabelProxy "propertyName"
+propertyActionPropertyName = AttrLabelProxy
+
+propertyActionState :: AttrLabelProxy "state"
+propertyActionState = AttrLabelProxy
+
+propertyActionStateType :: AttrLabelProxy "stateType"
+propertyActionStateType = AttrLabelProxy
+
 type instance SignalList PropertyAction = PropertyActionSignalList
 type PropertyActionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -307,7 +355,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "PropertyAction"
+-- returnType : Just (TInterface "Gio" "PropertyAction")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/PropertyAction.hs-boot b/GI/Gio/Objects/PropertyAction.hs-boot
--- a/GI/Gio/Objects/PropertyAction.hs-boot
+++ b/GI/Gio/Objects/PropertyAction.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.PropertyAction where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ProxyAddress.hs b/GI/Gio/Objects/ProxyAddress.hs
--- a/GI/Gio/Objects/ProxyAddress.hs
+++ b/GI/Gio/Objects/ProxyAddress.hs
@@ -63,51 +63,58 @@
     ProxyAddressDestinationHostnamePropertyInfo,
     constructProxyAddressDestinationHostname,
     getProxyAddressDestinationHostname      ,
+    proxyAddressDestinationHostname         ,
 
 
 -- ** DestinationPort
     ProxyAddressDestinationPortPropertyInfo ,
     constructProxyAddressDestinationPort    ,
     getProxyAddressDestinationPort          ,
+    proxyAddressDestinationPort             ,
 
 
 -- ** DestinationProtocol
     ProxyAddressDestinationProtocolPropertyInfo,
     constructProxyAddressDestinationProtocol,
     getProxyAddressDestinationProtocol      ,
+    proxyAddressDestinationProtocol         ,
 
 
 -- ** Password
     ProxyAddressPasswordPropertyInfo        ,
     constructProxyAddressPassword           ,
     getProxyAddressPassword                 ,
+    proxyAddressPassword                    ,
 
 
 -- ** Protocol
     ProxyAddressProtocolPropertyInfo        ,
     constructProxyAddressProtocol           ,
     getProxyAddressProtocol                 ,
+    proxyAddressProtocol                    ,
 
 
 -- ** Uri
     ProxyAddressUriPropertyInfo             ,
     constructProxyAddressUri                ,
     getProxyAddressUri                      ,
+    proxyAddressUri                         ,
 
 
 -- ** Username
     ProxyAddressUsernamePropertyInfo        ,
     constructProxyAddressUsername           ,
     getProxyAddressUsername                 ,
+    proxyAddressUsername                    ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -189,16 +196,17 @@
 -- VVV Prop "destination-hostname"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressDestinationHostname :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressDestinationHostname obj = liftIO $ getObjectPropertyString obj "destination-hostname"
+getProxyAddressDestinationHostname obj = liftIO $ checkUnexpectedNothing "getProxyAddressDestinationHostname" $ getObjectPropertyString obj "destination-hostname"
 
 constructProxyAddressDestinationHostname :: T.Text -> IO ([Char], GValue)
-constructProxyAddressDestinationHostname val = constructObjectPropertyString "destination-hostname" val
+constructProxyAddressDestinationHostname val = constructObjectPropertyString "destination-hostname" (Just val)
 
 data ProxyAddressDestinationHostnamePropertyInfo
 instance AttrInfo ProxyAddressDestinationHostnamePropertyInfo where
-    type AttrAllowedOps ProxyAddressDestinationHostnamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressDestinationHostnamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressDestinationHostnamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressDestinationHostnamePropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressDestinationHostnamePropertyInfo = T.Text
@@ -206,16 +214,18 @@
     attrGet _ = getProxyAddressDestinationHostname
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressDestinationHostname
+    attrClear _ = undefined
 
 -- VVV Prop "destination-port"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getProxyAddressDestinationPort :: (MonadIO m, ProxyAddressK o) => o -> m Word32
-getProxyAddressDestinationPort obj = liftIO $ getObjectPropertyCUInt obj "destination-port"
+getProxyAddressDestinationPort obj = liftIO $ getObjectPropertyUInt32 obj "destination-port"
 
 constructProxyAddressDestinationPort :: Word32 -> IO ([Char], GValue)
-constructProxyAddressDestinationPort val = constructObjectPropertyCUInt "destination-port" val
+constructProxyAddressDestinationPort val = constructObjectPropertyUInt32 "destination-port" val
 
 data ProxyAddressDestinationPortPropertyInfo
 instance AttrInfo ProxyAddressDestinationPortPropertyInfo where
@@ -227,20 +237,22 @@
     attrGet _ = getProxyAddressDestinationPort
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressDestinationPort
+    attrClear _ = undefined
 
 -- VVV Prop "destination-protocol"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressDestinationProtocol :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressDestinationProtocol obj = liftIO $ getObjectPropertyString obj "destination-protocol"
+getProxyAddressDestinationProtocol obj = liftIO $ checkUnexpectedNothing "getProxyAddressDestinationProtocol" $ getObjectPropertyString obj "destination-protocol"
 
 constructProxyAddressDestinationProtocol :: T.Text -> IO ([Char], GValue)
-constructProxyAddressDestinationProtocol val = constructObjectPropertyString "destination-protocol" val
+constructProxyAddressDestinationProtocol val = constructObjectPropertyString "destination-protocol" (Just val)
 
 data ProxyAddressDestinationProtocolPropertyInfo
 instance AttrInfo ProxyAddressDestinationProtocolPropertyInfo where
-    type AttrAllowedOps ProxyAddressDestinationProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressDestinationProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressDestinationProtocolPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressDestinationProtocolPropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressDestinationProtocolPropertyInfo = T.Text
@@ -248,20 +260,22 @@
     attrGet _ = getProxyAddressDestinationProtocol
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressDestinationProtocol
+    attrClear _ = undefined
 
 -- VVV Prop "password"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressPassword :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressPassword obj = liftIO $ getObjectPropertyString obj "password"
+getProxyAddressPassword obj = liftIO $ checkUnexpectedNothing "getProxyAddressPassword" $ getObjectPropertyString obj "password"
 
 constructProxyAddressPassword :: T.Text -> IO ([Char], GValue)
-constructProxyAddressPassword val = constructObjectPropertyString "password" val
+constructProxyAddressPassword val = constructObjectPropertyString "password" (Just val)
 
 data ProxyAddressPasswordPropertyInfo
 instance AttrInfo ProxyAddressPasswordPropertyInfo where
-    type AttrAllowedOps ProxyAddressPasswordPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressPasswordPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressPasswordPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressPasswordPropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressPasswordPropertyInfo = T.Text
@@ -269,20 +283,22 @@
     attrGet _ = getProxyAddressPassword
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressPassword
+    attrClear _ = undefined
 
 -- VVV Prop "protocol"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressProtocol :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressProtocol obj = liftIO $ getObjectPropertyString obj "protocol"
+getProxyAddressProtocol obj = liftIO $ checkUnexpectedNothing "getProxyAddressProtocol" $ getObjectPropertyString obj "protocol"
 
 constructProxyAddressProtocol :: T.Text -> IO ([Char], GValue)
-constructProxyAddressProtocol val = constructObjectPropertyString "protocol" val
+constructProxyAddressProtocol val = constructObjectPropertyString "protocol" (Just val)
 
 data ProxyAddressProtocolPropertyInfo
 instance AttrInfo ProxyAddressProtocolPropertyInfo where
-    type AttrAllowedOps ProxyAddressProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressProtocolPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressProtocolPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressProtocolPropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressProtocolPropertyInfo = T.Text
@@ -290,20 +306,22 @@
     attrGet _ = getProxyAddressProtocol
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressProtocol
+    attrClear _ = undefined
 
 -- VVV Prop "uri"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressUri :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressUri obj = liftIO $ getObjectPropertyString obj "uri"
+getProxyAddressUri obj = liftIO $ checkUnexpectedNothing "getProxyAddressUri" $ getObjectPropertyString obj "uri"
 
 constructProxyAddressUri :: T.Text -> IO ([Char], GValue)
-constructProxyAddressUri val = constructObjectPropertyString "uri" val
+constructProxyAddressUri val = constructObjectPropertyString "uri" (Just val)
 
 data ProxyAddressUriPropertyInfo
 instance AttrInfo ProxyAddressUriPropertyInfo where
-    type AttrAllowedOps ProxyAddressUriPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressUriPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressUriPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressUriPropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressUriPropertyInfo = T.Text
@@ -311,20 +329,22 @@
     attrGet _ = getProxyAddressUri
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressUri
+    attrClear _ = undefined
 
 -- VVV Prop "username"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getProxyAddressUsername :: (MonadIO m, ProxyAddressK o) => o -> m T.Text
-getProxyAddressUsername obj = liftIO $ getObjectPropertyString obj "username"
+getProxyAddressUsername obj = liftIO $ checkUnexpectedNothing "getProxyAddressUsername" $ getObjectPropertyString obj "username"
 
 constructProxyAddressUsername :: T.Text -> IO ([Char], GValue)
-constructProxyAddressUsername val = constructObjectPropertyString "username" val
+constructProxyAddressUsername val = constructObjectPropertyString "username" (Just val)
 
 data ProxyAddressUsernamePropertyInfo
 instance AttrInfo ProxyAddressUsernamePropertyInfo where
-    type AttrAllowedOps ProxyAddressUsernamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressUsernamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressUsernamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressUsernamePropertyInfo = ProxyAddressK
     type AttrGetType ProxyAddressUsernamePropertyInfo = T.Text
@@ -332,10 +352,32 @@
     attrGet _ = getProxyAddressUsername
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressUsername
+    attrClear _ = undefined
 
 type instance AttributeList ProxyAddress = ProxyAddressAttributeList
 type ProxyAddressAttributeList = ('[ '("address", InetSocketAddressAddressPropertyInfo), '("destinationHostname", ProxyAddressDestinationHostnamePropertyInfo), '("destinationPort", ProxyAddressDestinationPortPropertyInfo), '("destinationProtocol", ProxyAddressDestinationProtocolPropertyInfo), '("family", SocketAddressFamilyPropertyInfo), '("flowinfo", InetSocketAddressFlowinfoPropertyInfo), '("password", ProxyAddressPasswordPropertyInfo), '("port", InetSocketAddressPortPropertyInfo), '("protocol", ProxyAddressProtocolPropertyInfo), '("scopeId", InetSocketAddressScopeIdPropertyInfo), '("uri", ProxyAddressUriPropertyInfo), '("username", ProxyAddressUsernamePropertyInfo)] :: [(Symbol, *)])
 
+proxyAddressDestinationHostname :: AttrLabelProxy "destinationHostname"
+proxyAddressDestinationHostname = AttrLabelProxy
+
+proxyAddressDestinationPort :: AttrLabelProxy "destinationPort"
+proxyAddressDestinationPort = AttrLabelProxy
+
+proxyAddressDestinationProtocol :: AttrLabelProxy "destinationProtocol"
+proxyAddressDestinationProtocol = AttrLabelProxy
+
+proxyAddressPassword :: AttrLabelProxy "password"
+proxyAddressPassword = AttrLabelProxy
+
+proxyAddressProtocol :: AttrLabelProxy "protocol"
+proxyAddressProtocol = AttrLabelProxy
+
+proxyAddressUri :: AttrLabelProxy "uri"
+proxyAddressUri = AttrLabelProxy
+
+proxyAddressUsername :: AttrLabelProxy "username"
+proxyAddressUsername = AttrLabelProxy
+
 type instance SignalList ProxyAddress = ProxyAddressSignalList
 type ProxyAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -343,7 +385,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "inetaddr", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dest_hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dest_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "username", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ProxyAddress"
+-- returnType : Just (TInterface "Gio" "ProxyAddress")
 -- throws : False
 -- Skip return : False
 
@@ -396,7 +438,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -425,7 +467,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
@@ -452,7 +494,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -481,7 +523,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -510,7 +552,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -539,7 +581,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -568,7 +610,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ProxyAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ProxyAddress.hs-boot b/GI/Gio/Objects/ProxyAddress.hs-boot
--- a/GI/Gio/Objects/ProxyAddress.hs-boot
+++ b/GI/Gio/Objects/ProxyAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ProxyAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ProxyAddressEnumerator.hs b/GI/Gio/Objects/ProxyAddressEnumerator.hs
--- a/GI/Gio/Objects/ProxyAddressEnumerator.hs
+++ b/GI/Gio/Objects/ProxyAddressEnumerator.hs
@@ -21,18 +21,22 @@
     ProxyAddressEnumeratorConnectablePropertyInfo,
     constructProxyAddressEnumeratorConnectable,
     getProxyAddressEnumeratorConnectable    ,
+    proxyAddressEnumeratorConnectable       ,
 
 
 -- ** DefaultPort
     ProxyAddressEnumeratorDefaultPortPropertyInfo,
     constructProxyAddressEnumeratorDefaultPort,
     getProxyAddressEnumeratorDefaultPort    ,
+    proxyAddressEnumeratorDefaultPort       ,
 
 
 -- ** ProxyResolver
     ProxyAddressEnumeratorProxyResolverPropertyInfo,
+    clearProxyAddressEnumeratorProxyResolver,
     constructProxyAddressEnumeratorProxyResolver,
     getProxyAddressEnumeratorProxyResolver  ,
+    proxyAddressEnumeratorProxyResolver     ,
     setProxyAddressEnumeratorProxyResolver  ,
 
 
@@ -40,15 +44,16 @@
     ProxyAddressEnumeratorUriPropertyInfo   ,
     constructProxyAddressEnumeratorUri      ,
     getProxyAddressEnumeratorUri            ,
+    proxyAddressEnumeratorUri               ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -117,33 +122,36 @@
 -- VVV Prop "connectable"
    -- Type: TInterface "Gio" "SocketConnectable"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getProxyAddressEnumeratorConnectable :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m SocketConnectable
+getProxyAddressEnumeratorConnectable :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m (Maybe SocketConnectable)
 getProxyAddressEnumeratorConnectable obj = liftIO $ getObjectPropertyObject obj "connectable" SocketConnectable
 
 constructProxyAddressEnumeratorConnectable :: (SocketConnectableK a) => a -> IO ([Char], GValue)
-constructProxyAddressEnumeratorConnectable val = constructObjectPropertyObject "connectable" val
+constructProxyAddressEnumeratorConnectable val = constructObjectPropertyObject "connectable" (Just val)
 
 data ProxyAddressEnumeratorConnectablePropertyInfo
 instance AttrInfo ProxyAddressEnumeratorConnectablePropertyInfo where
-    type AttrAllowedOps ProxyAddressEnumeratorConnectablePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressEnumeratorConnectablePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressEnumeratorConnectablePropertyInfo = SocketConnectableK
     type AttrBaseTypeConstraint ProxyAddressEnumeratorConnectablePropertyInfo = ProxyAddressEnumeratorK
-    type AttrGetType ProxyAddressEnumeratorConnectablePropertyInfo = SocketConnectable
+    type AttrGetType ProxyAddressEnumeratorConnectablePropertyInfo = (Maybe SocketConnectable)
     type AttrLabel ProxyAddressEnumeratorConnectablePropertyInfo = "connectable"
     attrGet _ = getProxyAddressEnumeratorConnectable
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressEnumeratorConnectable
+    attrClear _ = undefined
 
 -- VVV Prop "default-port"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getProxyAddressEnumeratorDefaultPort :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m Word32
-getProxyAddressEnumeratorDefaultPort obj = liftIO $ getObjectPropertyCUInt obj "default-port"
+getProxyAddressEnumeratorDefaultPort obj = liftIO $ getObjectPropertyUInt32 obj "default-port"
 
 constructProxyAddressEnumeratorDefaultPort :: Word32 -> IO ([Char], GValue)
-constructProxyAddressEnumeratorDefaultPort val = constructObjectPropertyCUInt "default-port" val
+constructProxyAddressEnumeratorDefaultPort val = constructObjectPropertyUInt32 "default-port" val
 
 data ProxyAddressEnumeratorDefaultPortPropertyInfo
 instance AttrInfo ProxyAddressEnumeratorDefaultPortPropertyInfo where
@@ -155,54 +163,74 @@
     attrGet _ = getProxyAddressEnumeratorDefaultPort
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressEnumeratorDefaultPort
+    attrClear _ = undefined
 
 -- VVV Prop "proxy-resolver"
    -- Type: TInterface "Gio" "ProxyResolver"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getProxyAddressEnumeratorProxyResolver :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m ProxyResolver
+getProxyAddressEnumeratorProxyResolver :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m (Maybe ProxyResolver)
 getProxyAddressEnumeratorProxyResolver obj = liftIO $ getObjectPropertyObject obj "proxy-resolver" ProxyResolver
 
 setProxyAddressEnumeratorProxyResolver :: (MonadIO m, ProxyAddressEnumeratorK o, ProxyResolverK a) => o -> a -> m ()
-setProxyAddressEnumeratorProxyResolver obj val = liftIO $ setObjectPropertyObject obj "proxy-resolver" val
+setProxyAddressEnumeratorProxyResolver obj val = liftIO $ setObjectPropertyObject obj "proxy-resolver" (Just val)
 
 constructProxyAddressEnumeratorProxyResolver :: (ProxyResolverK a) => a -> IO ([Char], GValue)
-constructProxyAddressEnumeratorProxyResolver val = constructObjectPropertyObject "proxy-resolver" val
+constructProxyAddressEnumeratorProxyResolver val = constructObjectPropertyObject "proxy-resolver" (Just val)
 
+clearProxyAddressEnumeratorProxyResolver :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m ()
+clearProxyAddressEnumeratorProxyResolver obj = liftIO $ setObjectPropertyObject obj "proxy-resolver" (Nothing :: Maybe ProxyResolver)
+
 data ProxyAddressEnumeratorProxyResolverPropertyInfo
 instance AttrInfo ProxyAddressEnumeratorProxyResolverPropertyInfo where
-    type AttrAllowedOps ProxyAddressEnumeratorProxyResolverPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressEnumeratorProxyResolverPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressEnumeratorProxyResolverPropertyInfo = ProxyResolverK
     type AttrBaseTypeConstraint ProxyAddressEnumeratorProxyResolverPropertyInfo = ProxyAddressEnumeratorK
-    type AttrGetType ProxyAddressEnumeratorProxyResolverPropertyInfo = ProxyResolver
+    type AttrGetType ProxyAddressEnumeratorProxyResolverPropertyInfo = (Maybe ProxyResolver)
     type AttrLabel ProxyAddressEnumeratorProxyResolverPropertyInfo = "proxy-resolver"
     attrGet _ = getProxyAddressEnumeratorProxyResolver
     attrSet _ = setProxyAddressEnumeratorProxyResolver
     attrConstruct _ = constructProxyAddressEnumeratorProxyResolver
+    attrClear _ = clearProxyAddressEnumeratorProxyResolver
 
 -- VVV Prop "uri"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getProxyAddressEnumeratorUri :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m T.Text
+getProxyAddressEnumeratorUri :: (MonadIO m, ProxyAddressEnumeratorK o) => o -> m (Maybe T.Text)
 getProxyAddressEnumeratorUri obj = liftIO $ getObjectPropertyString obj "uri"
 
 constructProxyAddressEnumeratorUri :: T.Text -> IO ([Char], GValue)
-constructProxyAddressEnumeratorUri val = constructObjectPropertyString "uri" val
+constructProxyAddressEnumeratorUri val = constructObjectPropertyString "uri" (Just val)
 
 data ProxyAddressEnumeratorUriPropertyInfo
 instance AttrInfo ProxyAddressEnumeratorUriPropertyInfo where
-    type AttrAllowedOps ProxyAddressEnumeratorUriPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ProxyAddressEnumeratorUriPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ProxyAddressEnumeratorUriPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ProxyAddressEnumeratorUriPropertyInfo = ProxyAddressEnumeratorK
-    type AttrGetType ProxyAddressEnumeratorUriPropertyInfo = T.Text
+    type AttrGetType ProxyAddressEnumeratorUriPropertyInfo = (Maybe T.Text)
     type AttrLabel ProxyAddressEnumeratorUriPropertyInfo = "uri"
     attrGet _ = getProxyAddressEnumeratorUri
     attrSet _ = undefined
     attrConstruct _ = constructProxyAddressEnumeratorUri
+    attrClear _ = undefined
 
 type instance AttributeList ProxyAddressEnumerator = ProxyAddressEnumeratorAttributeList
 type ProxyAddressEnumeratorAttributeList = ('[ '("connectable", ProxyAddressEnumeratorConnectablePropertyInfo), '("defaultPort", ProxyAddressEnumeratorDefaultPortPropertyInfo), '("proxyResolver", ProxyAddressEnumeratorProxyResolverPropertyInfo), '("uri", ProxyAddressEnumeratorUriPropertyInfo)] :: [(Symbol, *)])
+
+proxyAddressEnumeratorConnectable :: AttrLabelProxy "connectable"
+proxyAddressEnumeratorConnectable = AttrLabelProxy
+
+proxyAddressEnumeratorDefaultPort :: AttrLabelProxy "defaultPort"
+proxyAddressEnumeratorDefaultPort = AttrLabelProxy
+
+proxyAddressEnumeratorProxyResolver :: AttrLabelProxy "proxyResolver"
+proxyAddressEnumeratorProxyResolver = AttrLabelProxy
+
+proxyAddressEnumeratorUri :: AttrLabelProxy "uri"
+proxyAddressEnumeratorUri = AttrLabelProxy
 
 type instance SignalList ProxyAddressEnumerator = ProxyAddressEnumeratorSignalList
 type ProxyAddressEnumeratorSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
diff --git a/GI/Gio/Objects/ProxyAddressEnumerator.hs-boot b/GI/Gio/Objects/ProxyAddressEnumerator.hs-boot
--- a/GI/Gio/Objects/ProxyAddressEnumerator.hs-boot
+++ b/GI/Gio/Objects/ProxyAddressEnumerator.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ProxyAddressEnumerator where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Resolver.hs b/GI/Gio/Objects/Resolver.hs
--- a/GI/Gio/Objects/Resolver.hs
+++ b/GI/Gio/Objects/Resolver.hs
@@ -105,9 +105,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -236,7 +236,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -281,9 +281,9 @@
 
 -- method Resolver::lookup_by_address_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -292,7 +292,7 @@
     Ptr InetAddress ->                      -- address : TInterface "Gio" "InetAddress"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -333,7 +333,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : True
 -- Skip return : False
 
@@ -372,7 +372,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "InetAddress")
+-- returnType : Just (TGList (TInterface "Gio" "InetAddress"))
 -- throws : True
 -- Skip return : False
 
@@ -400,7 +400,6 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_resolver_lookup_by_name _obj' hostname' maybeCancellable
-        checkUnexpectedReturnNULL "g_resolver_lookup_by_name" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject InetAddress) result'
         g_list_free result
@@ -418,9 +417,9 @@
 
 -- method Resolver::lookup_by_name_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -429,7 +428,7 @@
     CString ->                              -- hostname : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -470,7 +469,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "InetAddress")
+-- returnType : Just (TGList (TInterface "Gio" "InetAddress"))
 -- throws : True
 -- Skip return : False
 
@@ -491,7 +490,6 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ g_resolver_lookup_by_name_finish _obj' result_'
-        checkUnexpectedReturnNULL "g_resolver_lookup_by_name_finish" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject InetAddress) result'
         g_list_free result
@@ -510,7 +508,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rrname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "record_type", argType = TInterface "Gio" "ResolverRecordType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList TVariant
+-- returnType : Just (TGList TVariant)
 -- throws : True
 -- Skip return : False
 
@@ -541,7 +539,6 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_resolver_lookup_records _obj' rrname' recordType' maybeCancellable
-        checkUnexpectedReturnNULL "g_resolver_lookup_records" result
         result' <- unpackGList result
         result'' <- mapM wrapGVariantPtr result'
         g_list_free result
@@ -559,9 +556,9 @@
 
 -- method Resolver::lookup_records_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rrname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "record_type", argType = TInterface "Gio" "ResolverRecordType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rrname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "record_type", argType = TInterface "Gio" "ResolverRecordType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -571,7 +568,7 @@
     CUInt ->                                -- record_type : TInterface "Gio" "ResolverRecordType"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -614,7 +611,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList TVariant
+-- returnType : Just (TGList TVariant)
 -- throws : True
 -- Skip return : False
 
@@ -635,7 +632,6 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ g_resolver_lookup_records_finish _obj' result_'
-        checkUnexpectedReturnNULL "g_resolver_lookup_records_finish" result
         result' <- unpackGList result
         result'' <- mapM wrapGVariantPtr result'
         g_list_free result
@@ -654,7 +650,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "SrvTarget")
+-- returnType : Just (TGList (TInterface "Gio" "SrvTarget"))
 -- throws : True
 -- Skip return : False
 
@@ -688,7 +684,6 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_resolver_lookup_service _obj' service' protocol' domain' maybeCancellable
-        checkUnexpectedReturnNULL "g_resolver_lookup_service" result
         result' <- unpackGList result
         result'' <- mapM (wrapBoxed SrvTarget) result'
         g_list_free result
@@ -710,9 +705,9 @@
 
 -- method Resolver::lookup_service_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -723,7 +718,7 @@
     CString ->                              -- domain : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -770,7 +765,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "SrvTarget")
+-- returnType : Just (TGList (TInterface "Gio" "SrvTarget"))
 -- throws : True
 -- Skip return : False
 
@@ -791,7 +786,6 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ g_resolver_lookup_service_finish _obj' result_'
-        checkUnexpectedReturnNULL "g_resolver_lookup_service_finish" result
         result' <- unpackGList result
         result'' <- mapM (wrapBoxed SrvTarget) result'
         g_list_free result
@@ -810,7 +804,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -837,7 +831,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Resolver"
+-- returnType : Just (TInterface "Gio" "Resolver")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Resolver.hs-boot b/GI/Gio/Objects/Resolver.hs-boot
--- a/GI/Gio/Objects/Resolver.hs-boot
+++ b/GI/Gio/Objects/Resolver.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Resolver where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Settings.hs b/GI/Gio/Objects/Settings.hs
--- a/GI/Gio/Objects/Settings.hs
+++ b/GI/Gio/Objects/Settings.hs
@@ -234,35 +234,41 @@
 -- ** DelayApply
     SettingsDelayApplyPropertyInfo          ,
     getSettingsDelayApply                   ,
+    settingsDelayApply                      ,
 
 
 -- ** HasUnapplied
     SettingsHasUnappliedPropertyInfo        ,
     getSettingsHasUnapplied                 ,
+    settingsHasUnapplied                    ,
 
 
 -- ** Path
     SettingsPathPropertyInfo                ,
     constructSettingsPath                   ,
     getSettingsPath                         ,
+    settingsPath                            ,
 
 
 -- ** Schema
     SettingsSchemaPropertyInfo              ,
     constructSettingsSchema                 ,
     getSettingsSchema                       ,
+    settingsSchema                          ,
 
 
 -- ** SchemaId
     SettingsSchemaIdPropertyInfo            ,
     constructSettingsSchemaId               ,
     getSettingsSchemaId                     ,
+    settingsSchemaId                        ,
 
 
 -- ** SettingsSchema
     SettingsSettingsSchemaPropertyInfo      ,
     constructSettingsSettingsSchema         ,
     getSettingsSettingsSchema               ,
+    settingsSettingsSchema                  ,
 
 
 
@@ -320,9 +326,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -601,6 +607,7 @@
 -- VVV Prop "delay-apply"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
 getSettingsDelayApply :: (MonadIO m, SettingsK o) => o -> m Bool
 getSettingsDelayApply obj = liftIO $ getObjectPropertyBool obj "delay-apply"
@@ -615,10 +622,12 @@
     attrGet _ = getSettingsDelayApply
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "has-unapplied"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getSettingsHasUnapplied :: (MonadIO m, SettingsK o) => o -> m Bool
 getSettingsHasUnapplied obj = liftIO $ getObjectPropertyBool obj "has-unapplied"
@@ -633,94 +642,121 @@
     attrGet _ = getSettingsHasUnapplied
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSettingsPath :: (MonadIO m, SettingsK o) => o -> m T.Text
+getSettingsPath :: (MonadIO m, SettingsK o) => o -> m (Maybe T.Text)
 getSettingsPath obj = liftIO $ getObjectPropertyString obj "path"
 
 constructSettingsPath :: T.Text -> IO ([Char], GValue)
-constructSettingsPath val = constructObjectPropertyString "path" val
+constructSettingsPath val = constructObjectPropertyString "path" (Just val)
 
 data SettingsPathPropertyInfo
 instance AttrInfo SettingsPathPropertyInfo where
-    type AttrAllowedOps SettingsPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SettingsPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SettingsPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint SettingsPathPropertyInfo = SettingsK
-    type AttrGetType SettingsPathPropertyInfo = T.Text
+    type AttrGetType SettingsPathPropertyInfo = (Maybe T.Text)
     type AttrLabel SettingsPathPropertyInfo = "path"
     attrGet _ = getSettingsPath
     attrSet _ = undefined
     attrConstruct _ = constructSettingsPath
+    attrClear _ = undefined
 
 -- VVV Prop "schema"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSettingsSchema :: (MonadIO m, SettingsK o) => o -> m T.Text
+getSettingsSchema :: (MonadIO m, SettingsK o) => o -> m (Maybe T.Text)
 getSettingsSchema obj = liftIO $ getObjectPropertyString obj "schema"
 
 constructSettingsSchema :: T.Text -> IO ([Char], GValue)
-constructSettingsSchema val = constructObjectPropertyString "schema" val
+constructSettingsSchema val = constructObjectPropertyString "schema" (Just val)
 
 data SettingsSchemaPropertyInfo
 instance AttrInfo SettingsSchemaPropertyInfo where
-    type AttrAllowedOps SettingsSchemaPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SettingsSchemaPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SettingsSchemaPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint SettingsSchemaPropertyInfo = SettingsK
-    type AttrGetType SettingsSchemaPropertyInfo = T.Text
+    type AttrGetType SettingsSchemaPropertyInfo = (Maybe T.Text)
     type AttrLabel SettingsSchemaPropertyInfo = "schema"
     attrGet _ = getSettingsSchema
     attrSet _ = undefined
     attrConstruct _ = constructSettingsSchema
+    attrClear _ = undefined
 
 -- VVV Prop "schema-id"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSettingsSchemaId :: (MonadIO m, SettingsK o) => o -> m T.Text
+getSettingsSchemaId :: (MonadIO m, SettingsK o) => o -> m (Maybe T.Text)
 getSettingsSchemaId obj = liftIO $ getObjectPropertyString obj "schema-id"
 
 constructSettingsSchemaId :: T.Text -> IO ([Char], GValue)
-constructSettingsSchemaId val = constructObjectPropertyString "schema-id" val
+constructSettingsSchemaId val = constructObjectPropertyString "schema-id" (Just val)
 
 data SettingsSchemaIdPropertyInfo
 instance AttrInfo SettingsSchemaIdPropertyInfo where
-    type AttrAllowedOps SettingsSchemaIdPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SettingsSchemaIdPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SettingsSchemaIdPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint SettingsSchemaIdPropertyInfo = SettingsK
-    type AttrGetType SettingsSchemaIdPropertyInfo = T.Text
+    type AttrGetType SettingsSchemaIdPropertyInfo = (Maybe T.Text)
     type AttrLabel SettingsSchemaIdPropertyInfo = "schema-id"
     attrGet _ = getSettingsSchemaId
     attrSet _ = undefined
     attrConstruct _ = constructSettingsSchemaId
+    attrClear _ = undefined
 
 -- VVV Prop "settings-schema"
    -- Type: TInterface "Gio" "SettingsSchema"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSettingsSettingsSchema :: (MonadIO m, SettingsK o) => o -> m SettingsSchema
+getSettingsSettingsSchema :: (MonadIO m, SettingsK o) => o -> m (Maybe SettingsSchema)
 getSettingsSettingsSchema obj = liftIO $ getObjectPropertyBoxed obj "settings-schema" SettingsSchema
 
 constructSettingsSettingsSchema :: SettingsSchema -> IO ([Char], GValue)
-constructSettingsSettingsSchema val = constructObjectPropertyBoxed "settings-schema" val
+constructSettingsSettingsSchema val = constructObjectPropertyBoxed "settings-schema" (Just val)
 
 data SettingsSettingsSchemaPropertyInfo
 instance AttrInfo SettingsSettingsSchemaPropertyInfo where
-    type AttrAllowedOps SettingsSettingsSchemaPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SettingsSettingsSchemaPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SettingsSettingsSchemaPropertyInfo = (~) SettingsSchema
     type AttrBaseTypeConstraint SettingsSettingsSchemaPropertyInfo = SettingsK
-    type AttrGetType SettingsSettingsSchemaPropertyInfo = SettingsSchema
+    type AttrGetType SettingsSettingsSchemaPropertyInfo = (Maybe SettingsSchema)
     type AttrLabel SettingsSettingsSchemaPropertyInfo = "settings-schema"
     attrGet _ = getSettingsSettingsSchema
     attrSet _ = undefined
     attrConstruct _ = constructSettingsSettingsSchema
+    attrClear _ = undefined
 
 type instance AttributeList Settings = SettingsAttributeList
 type SettingsAttributeList = ('[ '("delayApply", SettingsDelayApplyPropertyInfo), '("hasUnapplied", SettingsHasUnappliedPropertyInfo), '("path", SettingsPathPropertyInfo), '("schema", SettingsSchemaPropertyInfo), '("schemaId", SettingsSchemaIdPropertyInfo), '("settingsSchema", SettingsSettingsSchemaPropertyInfo)] :: [(Symbol, *)])
 
+settingsDelayApply :: AttrLabelProxy "delayApply"
+settingsDelayApply = AttrLabelProxy
+
+settingsHasUnapplied :: AttrLabelProxy "hasUnapplied"
+settingsHasUnapplied = AttrLabelProxy
+
+settingsPath :: AttrLabelProxy "path"
+settingsPath = AttrLabelProxy
+
+settingsSchema :: AttrLabelProxy "schema"
+settingsSchema = AttrLabelProxy
+
+settingsSchemaId :: AttrLabelProxy "schemaId"
+settingsSchemaId = AttrLabelProxy
+
+settingsSettingsSchema :: AttrLabelProxy "settingsSchema"
+settingsSettingsSchema = AttrLabelProxy
+
 data SettingsChangeEventSignalInfo
 instance SignalInfo SettingsChangeEventSignalInfo where
     type HaskellCallbackType SettingsChangeEventSignalInfo = SettingsChangeEventCallback
@@ -748,7 +784,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "schema_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -773,7 +809,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "schema", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "backend", argType = TInterface "Gio" "SettingsBackend", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -814,7 +850,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "schema_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "backend", argType = TInterface "Gio" "SettingsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -843,7 +879,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "schema_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "backend", argType = TInterface "Gio" "SettingsBackend", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -876,7 +912,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "schema_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -905,7 +941,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -932,7 +968,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "SettingsBindFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -974,7 +1010,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "inverted", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1016,7 +1052,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Action"
+-- returnType : Just (TInterface "Gio" "Action")
 -- throws : False
 -- Skip return : False
 
@@ -1049,7 +1085,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1076,7 +1112,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1108,7 +1144,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Settings"
+-- returnType : Just (TInterface "Gio" "Settings")
 -- throws : False
 -- Skip return : False
 
@@ -1141,7 +1177,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1174,7 +1210,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TDouble
+-- returnType : Just (TBasicType TDouble)
 -- throws : False
 -- Skip return : False
 
@@ -1206,7 +1242,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -1237,7 +1273,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1268,7 +1304,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1296,7 +1332,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -1325,9 +1361,9 @@
 
 -- method Settings::get_mapped
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mapping", argType = TInterface "Gio" "SettingsGetMapping", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mapping", argType = TInterface "Gio" "SettingsGetMapping", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeCall, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
@@ -1335,8 +1371,8 @@
     Ptr Settings ->                         -- _obj : TInterface "Gio" "Settings"
     CString ->                              -- key : TBasicType TUTF8
     FunPtr SettingsGetMappingC ->           -- mapping : TInterface "Gio" "SettingsGetMapping"
-    Ptr () ->                               -- user_data : TBasicType TVoid
-    IO ()
+    Ptr () ->                               -- user_data : TBasicType TPtr
+    IO (Ptr ())
 
 
 settingsGetMapped ::
@@ -1344,27 +1380,27 @@
     a                                       -- _obj
     -> T.Text                               -- key
     -> SettingsGetMapping                   -- mapping
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 settingsGetMapped _obj key mapping = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     key' <- textToCString key
     mapping' <- mkSettingsGetMapping (settingsGetMappingWrapper Nothing mapping)
     let userData = nullPtr
-    g_settings_get_mapped _obj' key' mapping' userData
+    result <- g_settings_get_mapped _obj' key' mapping' userData
     safeFreeFunPtr $ castFunPtrToPtr mapping'
     touchManagedPtr _obj
     freeMem key'
-    return ()
+    return result
 
 data SettingsGetMappedMethodInfo
-instance (signature ~ (T.Text -> SettingsGetMapping -> m ()), MonadIO m, SettingsK a) => MethodInfo SettingsGetMappedMethodInfo a signature where
+instance (signature ~ (T.Text -> SettingsGetMapping -> m (Ptr ())), MonadIO m, SettingsK a) => MethodInfo SettingsGetMappedMethodInfo a signature where
     overloadedMethod _ = settingsGetMapped
 
 -- method Settings::get_range
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1397,7 +1433,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -1431,7 +1467,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1466,7 +1502,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1497,7 +1533,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1530,7 +1566,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -1563,7 +1599,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1595,7 +1631,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1626,7 +1662,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -1657,7 +1693,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1692,7 +1728,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1723,7 +1759,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1750,7 +1786,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1785,7 +1821,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TDouble, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1818,16 +1854,16 @@
 
 -- method Settings::set_enum
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_settings_set_enum" g_settings_set_enum :: 
     Ptr Settings ->                         -- _obj : TInterface "Gio" "Settings"
     CString ->                              -- key : TBasicType TUTF8
-    Int32 ->                                -- value : TBasicType TInt32
+    Int32 ->                                -- value : TBasicType TInt
     IO CInt
 
 
@@ -1852,16 +1888,16 @@
 
 -- method Settings::set_flags
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_settings_set_flags" g_settings_set_flags :: 
     Ptr Settings ->                         -- _obj : TInterface "Gio" "Settings"
     CString ->                              -- key : TBasicType TUTF8
-    Word32 ->                               -- value : TBasicType TUInt32
+    Word32 ->                               -- value : TBasicType TUInt
     IO CInt
 
 
@@ -1886,16 +1922,16 @@
 
 -- method Settings::set_int
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_settings_set_int" g_settings_set_int :: 
     Ptr Settings ->                         -- _obj : TInterface "Gio" "Settings"
     CString ->                              -- key : TBasicType TUTF8
-    Int32 ->                                -- value : TBasicType TInt32
+    Int32 ->                                -- value : TBasicType TInt
     IO CInt
 
 
@@ -1922,7 +1958,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1958,7 +1994,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TCArray True (-1) (-1) (TBasicType TUTF8), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1997,16 +2033,16 @@
 
 -- method Settings::set_uint
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_settings_set_uint" g_settings_set_uint :: 
     Ptr Settings ->                         -- _obj : TInterface "Gio" "Settings"
     CString ->                              -- key : TBasicType TUTF8
-    Word32 ->                               -- value : TBasicType TUInt32
+    Word32 ->                               -- value : TBasicType TUInt
     IO CInt
 
 
@@ -2033,7 +2069,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Settings", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -2068,7 +2104,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -2089,7 +2125,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -2110,7 +2146,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2129,7 +2165,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "property", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Settings.hs-boot b/GI/Gio/Objects/Settings.hs-boot
--- a/GI/Gio/Objects/Settings.hs-boot
+++ b/GI/Gio/Objects/Settings.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Settings where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimpleAction.hs b/GI/Gio/Objects/SimpleAction.hs
--- a/GI/Gio/Objects/SimpleAction.hs
+++ b/GI/Gio/Objects/SimpleAction.hs
@@ -48,18 +48,21 @@
     constructSimpleActionEnabled            ,
     getSimpleActionEnabled                  ,
     setSimpleActionEnabled                  ,
+    simpleActionEnabled                     ,
 
 
 -- ** Name
     SimpleActionNamePropertyInfo            ,
     constructSimpleActionName               ,
     getSimpleActionName                     ,
+    simpleActionName                        ,
 
 
 -- ** ParameterType
     SimpleActionParameterTypePropertyInfo   ,
     constructSimpleActionParameterType      ,
     getSimpleActionParameterType            ,
+    simpleActionParameterType               ,
 
 
 -- ** State
@@ -67,11 +70,13 @@
     constructSimpleActionState              ,
     getSimpleActionState                    ,
     setSimpleActionState                    ,
+    simpleActionState                       ,
 
 
 -- ** StateType
     SimpleActionStateTypePropertyInfo       ,
     getSimpleActionStateType                ,
+    simpleActionStateType                   ,
 
 
 
@@ -105,9 +110,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -277,20 +282,21 @@
     connectSignalFunPtr obj "change-state" cb' after
 
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "enabled", propType = TBasicType TBoolean, propFlags = [PropertyReadable,PropertyWritable], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "enabled", propType = TBasicType TBoolean, propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "enabled", propType = TBasicType TBoolean, propFlags = [PropertyReadable,PropertyWritable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "enabled", propType = TBasicType TBoolean, propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "name", propType = TBasicType TUTF8, propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "parameter-type", propType = TInterface "GLib" "VariantType", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "parameter-type", propType = TInterface "GLib" "VariantType", propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "parameter-type", propType = TInterface "GLib" "VariantType", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "parameter-type", propType = TInterface "GLib" "VariantType", propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "state", propType = TVariant, propFlags = [PropertyReadable,PropertyWritable,PropertyConstruct], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "state", propType = TVariant, propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleAction"} -> Property {propName = "state", propType = TVariant, propFlags = [PropertyReadable,PropertyWritable,PropertyConstruct], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "Action"} -> Property {propName = "state", propType = TVariant, propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 -- VVV Prop "enabled"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getSimpleActionEnabled :: (MonadIO m, SimpleActionK o) => o -> m Bool
 getSimpleActionEnabled obj = liftIO $ getObjectPropertyBool obj "enabled"
@@ -311,94 +317,118 @@
     attrGet _ = getSimpleActionEnabled
     attrSet _ = setSimpleActionEnabled
     attrConstruct _ = constructSimpleActionEnabled
+    attrClear _ = undefined
 
 -- VVV Prop "name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleActionName :: (MonadIO m, SimpleActionK o) => o -> m T.Text
+getSimpleActionName :: (MonadIO m, SimpleActionK o) => o -> m (Maybe T.Text)
 getSimpleActionName obj = liftIO $ getObjectPropertyString obj "name"
 
 constructSimpleActionName :: T.Text -> IO ([Char], GValue)
-constructSimpleActionName val = constructObjectPropertyString "name" val
+constructSimpleActionName val = constructObjectPropertyString "name" (Just val)
 
 data SimpleActionNamePropertyInfo
 instance AttrInfo SimpleActionNamePropertyInfo where
-    type AttrAllowedOps SimpleActionNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SimpleActionNamePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleActionNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint SimpleActionNamePropertyInfo = SimpleActionK
-    type AttrGetType SimpleActionNamePropertyInfo = T.Text
+    type AttrGetType SimpleActionNamePropertyInfo = (Maybe T.Text)
     type AttrLabel SimpleActionNamePropertyInfo = "name"
     attrGet _ = getSimpleActionName
     attrSet _ = undefined
     attrConstruct _ = constructSimpleActionName
+    attrClear _ = undefined
 
 -- VVV Prop "parameter-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleActionParameterType :: (MonadIO m, SimpleActionK o) => o -> m GLib.VariantType
+getSimpleActionParameterType :: (MonadIO m, SimpleActionK o) => o -> m (Maybe GLib.VariantType)
 getSimpleActionParameterType obj = liftIO $ getObjectPropertyBoxed obj "parameter-type" GLib.VariantType
 
 constructSimpleActionParameterType :: GLib.VariantType -> IO ([Char], GValue)
-constructSimpleActionParameterType val = constructObjectPropertyBoxed "parameter-type" val
+constructSimpleActionParameterType val = constructObjectPropertyBoxed "parameter-type" (Just val)
 
 data SimpleActionParameterTypePropertyInfo
 instance AttrInfo SimpleActionParameterTypePropertyInfo where
-    type AttrAllowedOps SimpleActionParameterTypePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SimpleActionParameterTypePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleActionParameterTypePropertyInfo = (~) GLib.VariantType
     type AttrBaseTypeConstraint SimpleActionParameterTypePropertyInfo = SimpleActionK
-    type AttrGetType SimpleActionParameterTypePropertyInfo = GLib.VariantType
+    type AttrGetType SimpleActionParameterTypePropertyInfo = (Maybe GLib.VariantType)
     type AttrLabel SimpleActionParameterTypePropertyInfo = "parameter-type"
     attrGet _ = getSimpleActionParameterType
     attrSet _ = undefined
     attrConstruct _ = constructSimpleActionParameterType
+    attrClear _ = undefined
 
 -- VVV Prop "state"
    -- Type: TVariant
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Just False)
 
-getSimpleActionState :: (MonadIO m, SimpleActionK o) => o -> m GVariant
+getSimpleActionState :: (MonadIO m, SimpleActionK o) => o -> m (Maybe GVariant)
 getSimpleActionState obj = liftIO $ getObjectPropertyVariant obj "state"
 
 setSimpleActionState :: (MonadIO m, SimpleActionK o) => o -> GVariant -> m ()
-setSimpleActionState obj val = liftIO $ setObjectPropertyVariant obj "state" val
+setSimpleActionState obj val = liftIO $ setObjectPropertyVariant obj "state" (Just val)
 
 constructSimpleActionState :: GVariant -> IO ([Char], GValue)
-constructSimpleActionState val = constructObjectPropertyVariant "state" val
+constructSimpleActionState val = constructObjectPropertyVariant "state" (Just val)
 
 data SimpleActionStatePropertyInfo
 instance AttrInfo SimpleActionStatePropertyInfo where
     type AttrAllowedOps SimpleActionStatePropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
     type AttrSetTypeConstraint SimpleActionStatePropertyInfo = (~) GVariant
     type AttrBaseTypeConstraint SimpleActionStatePropertyInfo = SimpleActionK
-    type AttrGetType SimpleActionStatePropertyInfo = GVariant
+    type AttrGetType SimpleActionStatePropertyInfo = (Maybe GVariant)
     type AttrLabel SimpleActionStatePropertyInfo = "state"
     attrGet _ = getSimpleActionState
     attrSet _ = setSimpleActionState
     attrConstruct _ = constructSimpleActionState
+    attrClear _ = undefined
 
 -- VVV Prop "state-type"
    -- Type: TInterface "GLib" "VariantType"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleActionStateType :: (MonadIO m, SimpleActionK o) => o -> m GLib.VariantType
+getSimpleActionStateType :: (MonadIO m, SimpleActionK o) => o -> m (Maybe GLib.VariantType)
 getSimpleActionStateType obj = liftIO $ getObjectPropertyBoxed obj "state-type" GLib.VariantType
 
 data SimpleActionStateTypePropertyInfo
 instance AttrInfo SimpleActionStateTypePropertyInfo where
-    type AttrAllowedOps SimpleActionStateTypePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps SimpleActionStateTypePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleActionStateTypePropertyInfo = (~) ()
     type AttrBaseTypeConstraint SimpleActionStateTypePropertyInfo = SimpleActionK
-    type AttrGetType SimpleActionStateTypePropertyInfo = GLib.VariantType
+    type AttrGetType SimpleActionStateTypePropertyInfo = (Maybe GLib.VariantType)
     type AttrLabel SimpleActionStateTypePropertyInfo = "state-type"
     attrGet _ = getSimpleActionStateType
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList SimpleAction = SimpleActionAttributeList
 type SimpleActionAttributeList = ('[ '("stateType", SimpleActionStateTypePropertyInfo)] :: [(Symbol, *)])
 
+simpleActionEnabled :: AttrLabelProxy "enabled"
+simpleActionEnabled = AttrLabelProxy
+
+simpleActionName :: AttrLabelProxy "name"
+simpleActionName = AttrLabelProxy
+
+simpleActionParameterType :: AttrLabelProxy "parameterType"
+simpleActionParameterType = AttrLabelProxy
+
+simpleActionState :: AttrLabelProxy "state"
+simpleActionState = AttrLabelProxy
+
+simpleActionStateType :: AttrLabelProxy "stateType"
+simpleActionStateType = AttrLabelProxy
+
 data SimpleActionActivateSignalInfo
 instance SignalInfo SimpleActionActivateSignalInfo where
     type HaskellCallbackType SimpleActionActivateSignalInfo = SimpleActionActivateCallback
@@ -416,7 +446,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameter_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleAction"
+-- returnType : Just (TInterface "Gio" "SimpleAction")
 -- throws : False
 -- Skip return : False
 
@@ -449,7 +479,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parameter_type", argType = TInterface "GLib" "VariantType", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "state", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleAction"
+-- returnType : Just (TInterface "Gio" "SimpleAction")
 -- throws : False
 -- Skip return : False
 
@@ -485,7 +515,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "enabled", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -515,7 +545,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -545,7 +575,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "state_hint", argType = TVariant, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SimpleAction.hs-boot b/GI/Gio/Objects/SimpleAction.hs-boot
--- a/GI/Gio/Objects/SimpleAction.hs-boot
+++ b/GI/Gio/Objects/SimpleAction.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimpleAction where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimpleActionGroup.hs b/GI/Gio/Objects/SimpleActionGroup.hs
--- a/GI/Gio/Objects/SimpleActionGroup.hs
+++ b/GI/Gio/Objects/SimpleActionGroup.hs
@@ -45,9 +45,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,7 +142,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleActionGroup"
+-- returnType : Just (TInterface "Gio" "SimpleActionGroup")
 -- throws : False
 -- Skip return : False
 
@@ -161,17 +161,17 @@
 
 -- method SimpleActionGroup::add_entries
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "entries", argType = TCArray False (-1) 2 (TInterface "Gio" "ActionEntry"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_entries", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_entries", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "entries", argType = TCArray False (-1) 2 (TInterface "Gio" "ActionEntry"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_entries", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_entries", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_simple_action_group_add_entries" g_simple_action_group_add_entries :: 
     Ptr SimpleActionGroup ->                -- _obj : TInterface "Gio" "SimpleActionGroup"
     Ptr ActionEntry ->                      -- entries : TCArray False (-1) 2 (TInterface "Gio" "ActionEntry")
-    Int32 ->                                -- n_entries : TBasicType TInt32
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Int32 ->                                -- n_entries : TBasicType TInt
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 {-# DEPRECATED simpleActionGroupAddEntries ["(Since version 2.38)","Use g_action_map_add_action_entries()"]#-}
@@ -200,7 +200,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action", argType = TInterface "Gio" "Action", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -231,7 +231,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Action"
+-- returnType : Just (TInterface "Gio" "Action")
 -- throws : False
 -- Skip return : False
 
@@ -264,7 +264,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleActionGroup", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "action_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SimpleActionGroup.hs-boot b/GI/Gio/Objects/SimpleActionGroup.hs-boot
--- a/GI/Gio/Objects/SimpleActionGroup.hs-boot
+++ b/GI/Gio/Objects/SimpleActionGroup.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimpleActionGroup where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimpleAsyncResult.hs b/GI/Gio/Objects/SimpleAsyncResult.hs
--- a/GI/Gio/Objects/SimpleAsyncResult.hs
+++ b/GI/Gio/Objects/SimpleAsyncResult.hs
@@ -83,9 +83,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -170,17 +170,17 @@
 
 -- method SimpleAsyncResult::new
 -- method type : Constructor
--- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleAsyncResult"
+-- returnType : Just (TInterface "Gio" "SimpleAsyncResult")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_simple_async_result_new" g_simple_async_result_new :: 
     Ptr GObject.Object ->                   -- source_object : TInterface "GObject" "Object"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
-    Ptr () ->                               -- source_tag : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
+    Ptr () ->                               -- source_tag : TBasicType TPtr
     IO (Ptr SimpleAsyncResult)
 
 {-# DEPRECATED simpleAsyncResultNew ["(Since version 2.46)","Use g_task_new() instead."]#-}
@@ -212,16 +212,16 @@
 
 -- method SimpleAsyncResult::new_from_error
 -- method type : Constructor
--- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleAsyncResult"
+-- returnType : Just (TInterface "Gio" "SimpleAsyncResult")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_simple_async_result_new_from_error" g_simple_async_result_new_from_error :: 
     Ptr GObject.Object ->                   -- source_object : TInterface "GObject" "Object"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     Ptr GError ->                           -- error : TError
     IO (Ptr SimpleAsyncResult)
 
@@ -258,7 +258,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -285,7 +285,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -312,7 +312,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -340,7 +340,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -367,7 +367,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -399,7 +399,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "check_cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -434,7 +434,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -465,7 +465,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handle_cancellation", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -495,7 +495,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "op_res", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -525,7 +525,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleAsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "op_res", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -552,16 +552,16 @@
 
 -- method SimpleAsyncResult::is_valid
 -- method type : MemberFunction
--- Args : [Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_simple_async_result_is_valid" g_simple_async_result_is_valid :: 
     Ptr AsyncResult ->                      -- result : TInterface "Gio" "AsyncResult"
     Ptr GObject.Object ->                   -- source : TInterface "GObject" "Object"
-    Ptr () ->                               -- source_tag : TBasicType TVoid
+    Ptr () ->                               -- source_tag : TBasicType TPtr
     IO CInt
 
 {-# DEPRECATED simpleAsyncResultIsValid ["(Since version 2.46)","Use #GTask and g_task_is_valid() instead."]#-}
@@ -569,7 +569,7 @@
     (MonadIO m, AsyncResultK a, GObject.ObjectK b) =>
     a                                       -- result_
     -> Maybe (b)                            -- source
-    -> Maybe (Ptr ())                       -- sourceTag
+    -> Ptr ()                               -- sourceTag
     -> m Bool                               -- result
 simpleAsyncResultIsValid result_ source sourceTag = liftIO $ do
     let result_' = unsafeManagedPtrCastPtr result_
@@ -578,11 +578,7 @@
         Just jSource -> do
             let jSource' = unsafeManagedPtrCastPtr jSource
             return jSource'
-    maybeSourceTag <- case sourceTag of
-        Nothing -> return nullPtr
-        Just jSourceTag -> do
-            return jSourceTag
-    result <- g_simple_async_result_is_valid result_' maybeSource maybeSourceTag
+    result <- g_simple_async_result_is_valid result_' maybeSource sourceTag
     let result' = (/= 0) result
     touchManagedPtr result_
     whenJust source touchManagedPtr
diff --git a/GI/Gio/Objects/SimpleAsyncResult.hs-boot b/GI/Gio/Objects/SimpleAsyncResult.hs-boot
--- a/GI/Gio/Objects/SimpleAsyncResult.hs-boot
+++ b/GI/Gio/Objects/SimpleAsyncResult.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimpleAsyncResult where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimpleIOStream.hs b/GI/Gio/Objects/SimpleIOStream.hs
--- a/GI/Gio/Objects/SimpleIOStream.hs
+++ b/GI/Gio/Objects/SimpleIOStream.hs
@@ -28,21 +28,23 @@
     SimpleIOStreamInputStreamPropertyInfo   ,
     constructSimpleIOStreamInputStream      ,
     getSimpleIOStreamInputStream            ,
+    simpleIOStreamInputStream               ,
 
 
 -- ** OutputStream
     SimpleIOStreamOutputStreamPropertyInfo  ,
     constructSimpleIOStreamOutputStream     ,
     getSimpleIOStreamOutputStream           ,
+    simpleIOStreamOutputStream              ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -116,56 +118,66 @@
 #endif
 
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleIOStream"} -> Property {propName = "input-stream", propType = TInterface "Gio" "InputStream", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "IOStream"} -> Property {propName = "input-stream", propType = TInterface "Gio" "InputStream", propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleIOStream"} -> Property {propName = "input-stream", propType = TInterface "Gio" "InputStream", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "IOStream"} -> Property {propName = "input-stream", propType = TInterface "Gio" "InputStream", propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 --- XXX Duplicated object with different types:
-  --- Name {namespace = "Gio", name = "SimpleIOStream"} -> Property {propName = "output-stream", propType = TInterface "Gio" "OutputStream", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propTransfer = TransferNothing, propDeprecated = Nothing}
-  --- Name {namespace = "Gio", name = "IOStream"} -> Property {propName = "output-stream", propType = TInterface "Gio" "OutputStream", propFlags = [PropertyReadable], propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "SimpleIOStream"} -> Property {propName = "output-stream", propType = TInterface "Gio" "OutputStream", propFlags = [PropertyReadable,PropertyWritable,PropertyConstructOnly], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
+  --- Name {namespace = "Gio", name = "IOStream"} -> Property {propName = "output-stream", propType = TInterface "Gio" "OutputStream", propFlags = [PropertyReadable], propReadNullable = Nothing, propWriteNullable = Nothing, propTransfer = TransferNothing, propDeprecated = Nothing}
 -- VVV Prop "input-stream"
    -- Type: TInterface "Gio" "InputStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleIOStreamInputStream :: (MonadIO m, SimpleIOStreamK o) => o -> m InputStream
+getSimpleIOStreamInputStream :: (MonadIO m, SimpleIOStreamK o) => o -> m (Maybe InputStream)
 getSimpleIOStreamInputStream obj = liftIO $ getObjectPropertyObject obj "input-stream" InputStream
 
 constructSimpleIOStreamInputStream :: (InputStreamK a) => a -> IO ([Char], GValue)
-constructSimpleIOStreamInputStream val = constructObjectPropertyObject "input-stream" val
+constructSimpleIOStreamInputStream val = constructObjectPropertyObject "input-stream" (Just val)
 
 data SimpleIOStreamInputStreamPropertyInfo
 instance AttrInfo SimpleIOStreamInputStreamPropertyInfo where
-    type AttrAllowedOps SimpleIOStreamInputStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SimpleIOStreamInputStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleIOStreamInputStreamPropertyInfo = InputStreamK
     type AttrBaseTypeConstraint SimpleIOStreamInputStreamPropertyInfo = SimpleIOStreamK
-    type AttrGetType SimpleIOStreamInputStreamPropertyInfo = InputStream
+    type AttrGetType SimpleIOStreamInputStreamPropertyInfo = (Maybe InputStream)
     type AttrLabel SimpleIOStreamInputStreamPropertyInfo = "input-stream"
     attrGet _ = getSimpleIOStreamInputStream
     attrSet _ = undefined
     attrConstruct _ = constructSimpleIOStreamInputStream
+    attrClear _ = undefined
 
 -- VVV Prop "output-stream"
    -- Type: TInterface "Gio" "OutputStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleIOStreamOutputStream :: (MonadIO m, SimpleIOStreamK o) => o -> m OutputStream
+getSimpleIOStreamOutputStream :: (MonadIO m, SimpleIOStreamK o) => o -> m (Maybe OutputStream)
 getSimpleIOStreamOutputStream obj = liftIO $ getObjectPropertyObject obj "output-stream" OutputStream
 
 constructSimpleIOStreamOutputStream :: (OutputStreamK a) => a -> IO ([Char], GValue)
-constructSimpleIOStreamOutputStream val = constructObjectPropertyObject "output-stream" val
+constructSimpleIOStreamOutputStream val = constructObjectPropertyObject "output-stream" (Just val)
 
 data SimpleIOStreamOutputStreamPropertyInfo
 instance AttrInfo SimpleIOStreamOutputStreamPropertyInfo where
-    type AttrAllowedOps SimpleIOStreamOutputStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SimpleIOStreamOutputStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleIOStreamOutputStreamPropertyInfo = OutputStreamK
     type AttrBaseTypeConstraint SimpleIOStreamOutputStreamPropertyInfo = SimpleIOStreamK
-    type AttrGetType SimpleIOStreamOutputStreamPropertyInfo = OutputStream
+    type AttrGetType SimpleIOStreamOutputStreamPropertyInfo = (Maybe OutputStream)
     type AttrLabel SimpleIOStreamOutputStreamPropertyInfo = "output-stream"
     attrGet _ = getSimpleIOStreamOutputStream
     attrSet _ = undefined
     attrConstruct _ = constructSimpleIOStreamOutputStream
+    attrClear _ = undefined
 
 type instance AttributeList SimpleIOStream = SimpleIOStreamAttributeList
 type SimpleIOStreamAttributeList = ('[ '("closed", IOStreamClosedPropertyInfo)] :: [(Symbol, *)])
 
+simpleIOStreamInputStream :: AttrLabelProxy "inputStream"
+simpleIOStreamInputStream = AttrLabelProxy
+
+simpleIOStreamOutputStream :: AttrLabelProxy "outputStream"
+simpleIOStreamOutputStream = AttrLabelProxy
+
 type instance SignalList SimpleIOStream = SimpleIOStreamSignalList
 type SimpleIOStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -173,7 +185,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "input_stream", argType = TInterface "Gio" "InputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "output_stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimpleIOStream"
+-- returnType : Just (TInterface "Gio" "SimpleIOStream")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SimpleIOStream.hs-boot b/GI/Gio/Objects/SimpleIOStream.hs-boot
--- a/GI/Gio/Objects/SimpleIOStream.hs-boot
+++ b/GI/Gio/Objects/SimpleIOStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimpleIOStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimplePermission.hs b/GI/Gio/Objects/SimplePermission.hs
--- a/GI/Gio/Objects/SimplePermission.hs
+++ b/GI/Gio/Objects/SimplePermission.hs
@@ -25,9 +25,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -110,7 +110,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "allowed", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SimplePermission"
+-- returnType : Just (TInterface "Gio" "SimplePermission")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SimplePermission.hs-boot b/GI/Gio/Objects/SimplePermission.hs-boot
--- a/GI/Gio/Objects/SimplePermission.hs-boot
+++ b/GI/Gio/Objects/SimplePermission.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimplePermission where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SimpleProxyResolver.hs b/GI/Gio/Objects/SimpleProxyResolver.hs
--- a/GI/Gio/Objects/SimpleProxyResolver.hs
+++ b/GI/Gio/Objects/SimpleProxyResolver.hs
@@ -44,22 +44,25 @@
     constructSimpleProxyResolverDefaultProxy,
     getSimpleProxyResolverDefaultProxy      ,
     setSimpleProxyResolverDefaultProxy      ,
+    simpleProxyResolverDefaultProxy         ,
 
 
 -- ** IgnoreHosts
     SimpleProxyResolverIgnoreHostsPropertyInfo,
+    clearSimpleProxyResolverIgnoreHosts     ,
     constructSimpleProxyResolverIgnoreHosts ,
     getSimpleProxyResolverIgnoreHosts       ,
     setSimpleProxyResolverIgnoreHosts       ,
+    simpleProxyResolverIgnoreHosts          ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -132,54 +135,67 @@
 -- VVV Prop "default-proxy"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
-getSimpleProxyResolverDefaultProxy :: (MonadIO m, SimpleProxyResolverK o) => o -> m T.Text
+getSimpleProxyResolverDefaultProxy :: (MonadIO m, SimpleProxyResolverK o) => o -> m (Maybe T.Text)
 getSimpleProxyResolverDefaultProxy obj = liftIO $ getObjectPropertyString obj "default-proxy"
 
 setSimpleProxyResolverDefaultProxy :: (MonadIO m, SimpleProxyResolverK o) => o -> T.Text -> m ()
-setSimpleProxyResolverDefaultProxy obj val = liftIO $ setObjectPropertyString obj "default-proxy" val
+setSimpleProxyResolverDefaultProxy obj val = liftIO $ setObjectPropertyString obj "default-proxy" (Just val)
 
 constructSimpleProxyResolverDefaultProxy :: T.Text -> IO ([Char], GValue)
-constructSimpleProxyResolverDefaultProxy val = constructObjectPropertyString "default-proxy" val
+constructSimpleProxyResolverDefaultProxy val = constructObjectPropertyString "default-proxy" (Just val)
 
 data SimpleProxyResolverDefaultProxyPropertyInfo
 instance AttrInfo SimpleProxyResolverDefaultProxyPropertyInfo where
     type AttrAllowedOps SimpleProxyResolverDefaultProxyPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
     type AttrSetTypeConstraint SimpleProxyResolverDefaultProxyPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint SimpleProxyResolverDefaultProxyPropertyInfo = SimpleProxyResolverK
-    type AttrGetType SimpleProxyResolverDefaultProxyPropertyInfo = T.Text
+    type AttrGetType SimpleProxyResolverDefaultProxyPropertyInfo = (Maybe T.Text)
     type AttrLabel SimpleProxyResolverDefaultProxyPropertyInfo = "default-proxy"
     attrGet _ = getSimpleProxyResolverDefaultProxy
     attrSet _ = setSimpleProxyResolverDefaultProxy
     attrConstruct _ = constructSimpleProxyResolverDefaultProxy
+    attrClear _ = undefined
 
 -- VVV Prop "ignore-hosts"
    -- Type: TCArray True (-1) (-1) (TBasicType TUTF8)
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
-getSimpleProxyResolverIgnoreHosts :: (MonadIO m, SimpleProxyResolverK o) => o -> m [T.Text]
+getSimpleProxyResolverIgnoreHosts :: (MonadIO m, SimpleProxyResolverK o) => o -> m (Maybe [T.Text])
 getSimpleProxyResolverIgnoreHosts obj = liftIO $ getObjectPropertyStringArray obj "ignore-hosts"
 
 setSimpleProxyResolverIgnoreHosts :: (MonadIO m, SimpleProxyResolverK o) => o -> [T.Text] -> m ()
-setSimpleProxyResolverIgnoreHosts obj val = liftIO $ setObjectPropertyStringArray obj "ignore-hosts" val
+setSimpleProxyResolverIgnoreHosts obj val = liftIO $ setObjectPropertyStringArray obj "ignore-hosts" (Just val)
 
 constructSimpleProxyResolverIgnoreHosts :: [T.Text] -> IO ([Char], GValue)
-constructSimpleProxyResolverIgnoreHosts val = constructObjectPropertyStringArray "ignore-hosts" val
+constructSimpleProxyResolverIgnoreHosts val = constructObjectPropertyStringArray "ignore-hosts" (Just val)
 
+clearSimpleProxyResolverIgnoreHosts :: (MonadIO m, SimpleProxyResolverK o) => o -> m ()
+clearSimpleProxyResolverIgnoreHosts obj = liftIO $ setObjectPropertyStringArray obj "ignore-hosts" (Nothing :: Maybe [T.Text])
+
 data SimpleProxyResolverIgnoreHostsPropertyInfo
 instance AttrInfo SimpleProxyResolverIgnoreHostsPropertyInfo where
-    type AttrAllowedOps SimpleProxyResolverIgnoreHostsPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SimpleProxyResolverIgnoreHostsPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SimpleProxyResolverIgnoreHostsPropertyInfo = (~) [T.Text]
     type AttrBaseTypeConstraint SimpleProxyResolverIgnoreHostsPropertyInfo = SimpleProxyResolverK
-    type AttrGetType SimpleProxyResolverIgnoreHostsPropertyInfo = [T.Text]
+    type AttrGetType SimpleProxyResolverIgnoreHostsPropertyInfo = (Maybe [T.Text])
     type AttrLabel SimpleProxyResolverIgnoreHostsPropertyInfo = "ignore-hosts"
     attrGet _ = getSimpleProxyResolverIgnoreHosts
     attrSet _ = setSimpleProxyResolverIgnoreHosts
     attrConstruct _ = constructSimpleProxyResolverIgnoreHosts
+    attrClear _ = clearSimpleProxyResolverIgnoreHosts
 
 type instance AttributeList SimpleProxyResolver = SimpleProxyResolverAttributeList
 type SimpleProxyResolverAttributeList = ('[ '("defaultProxy", SimpleProxyResolverDefaultProxyPropertyInfo), '("ignoreHosts", SimpleProxyResolverIgnoreHostsPropertyInfo)] :: [(Symbol, *)])
 
+simpleProxyResolverDefaultProxy :: AttrLabelProxy "defaultProxy"
+simpleProxyResolverDefaultProxy = AttrLabelProxy
+
+simpleProxyResolverIgnoreHosts :: AttrLabelProxy "ignoreHosts"
+simpleProxyResolverIgnoreHosts = AttrLabelProxy
+
 type instance SignalList SimpleProxyResolver = SimpleProxyResolverSignalList
 type SimpleProxyResolverSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -187,7 +203,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_proxy", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -218,7 +234,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ignore_hosts", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -249,7 +265,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SimpleProxyResolver", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri_scheme", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "proxy", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -284,7 +300,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "default_proxy", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ignore_hosts", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ProxyResolver"
+-- returnType : Just (TInterface "Gio" "ProxyResolver")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SimpleProxyResolver.hs-boot b/GI/Gio/Objects/SimpleProxyResolver.hs-boot
--- a/GI/Gio/Objects/SimpleProxyResolver.hs-boot
+++ b/GI/Gio/Objects/SimpleProxyResolver.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SimpleProxyResolver where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Socket.hs b/GI/Gio/Objects/Socket.hs
--- a/GI/Gio/Objects/Socket.hs
+++ b/GI/Gio/Objects/Socket.hs
@@ -288,6 +288,7 @@
     constructSocketBlocking                 ,
     getSocketBlocking                       ,
     setSocketBlocking                       ,
+    socketBlocking                          ,
 
 
 -- ** Broadcast
@@ -295,18 +296,21 @@
     constructSocketBroadcast                ,
     getSocketBroadcast                      ,
     setSocketBroadcast                      ,
+    socketBroadcast                         ,
 
 
 -- ** Family
     SocketFamilyPropertyInfo                ,
     constructSocketFamily                   ,
     getSocketFamily                         ,
+    socketFamily                            ,
 
 
 -- ** Fd
     SocketFdPropertyInfo                    ,
     constructSocketFd                       ,
     getSocketFd                             ,
+    socketFd                                ,
 
 
 -- ** Keepalive
@@ -314,6 +318,7 @@
     constructSocketKeepalive                ,
     getSocketKeepalive                      ,
     setSocketKeepalive                      ,
+    socketKeepalive                         ,
 
 
 -- ** ListenBacklog
@@ -321,11 +326,13 @@
     constructSocketListenBacklog            ,
     getSocketListenBacklog                  ,
     setSocketListenBacklog                  ,
+    socketListenBacklog                     ,
 
 
 -- ** LocalAddress
     SocketLocalAddressPropertyInfo          ,
     getSocketLocalAddress                   ,
+    socketLocalAddress                      ,
 
 
 -- ** MulticastLoopback
@@ -333,6 +340,7 @@
     constructSocketMulticastLoopback        ,
     getSocketMulticastLoopback              ,
     setSocketMulticastLoopback              ,
+    socketMulticastLoopback                 ,
 
 
 -- ** MulticastTtl
@@ -340,17 +348,20 @@
     constructSocketMulticastTtl             ,
     getSocketMulticastTtl                   ,
     setSocketMulticastTtl                   ,
+    socketMulticastTtl                      ,
 
 
 -- ** Protocol
     SocketProtocolPropertyInfo              ,
     constructSocketProtocol                 ,
     getSocketProtocol                       ,
+    socketProtocol                          ,
 
 
 -- ** RemoteAddress
     SocketRemoteAddressPropertyInfo         ,
     getSocketRemoteAddress                  ,
+    socketRemoteAddress                     ,
 
 
 -- ** Timeout
@@ -358,6 +369,7 @@
     constructSocketTimeout                  ,
     getSocketTimeout                        ,
     setSocketTimeout                        ,
+    socketTimeout                           ,
 
 
 -- ** Ttl
@@ -365,21 +377,23 @@
     constructSocketTtl                      ,
     getSocketTtl                            ,
     setSocketTtl                            ,
+    socketTtl                               ,
 
 
 -- ** Type
     SocketTypePropertyInfo                  ,
     constructSocketType                     ,
     getSocketType                           ,
+    socketType                              ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -498,6 +512,7 @@
 -- VVV Prop "blocking"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketBlocking :: (MonadIO m, SocketK o) => o -> m Bool
 getSocketBlocking obj = liftIO $ getObjectPropertyBool obj "blocking"
@@ -518,10 +533,12 @@
     attrGet _ = getSocketBlocking
     attrSet _ = setSocketBlocking
     attrConstruct _ = constructSocketBlocking
+    attrClear _ = undefined
 
 -- VVV Prop "broadcast"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketBroadcast :: (MonadIO m, SocketK o) => o -> m Bool
 getSocketBroadcast obj = liftIO $ getObjectPropertyBool obj "broadcast"
@@ -542,10 +559,12 @@
     attrGet _ = getSocketBroadcast
     attrSet _ = setSocketBroadcast
     attrConstruct _ = constructSocketBroadcast
+    attrClear _ = undefined
 
 -- VVV Prop "family"
    -- Type: TInterface "Gio" "SocketFamily"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getSocketFamily :: (MonadIO m, SocketK o) => o -> m SocketFamily
 getSocketFamily obj = liftIO $ getObjectPropertyEnum obj "family"
@@ -563,16 +582,18 @@
     attrGet _ = getSocketFamily
     attrSet _ = undefined
     attrConstruct _ = constructSocketFamily
+    attrClear _ = undefined
 
 -- VVV Prop "fd"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getSocketFd :: (MonadIO m, SocketK o) => o -> m Int32
-getSocketFd obj = liftIO $ getObjectPropertyCInt obj "fd"
+getSocketFd obj = liftIO $ getObjectPropertyInt32 obj "fd"
 
 constructSocketFd :: Int32 -> IO ([Char], GValue)
-constructSocketFd val = constructObjectPropertyCInt "fd" val
+constructSocketFd val = constructObjectPropertyInt32 "fd" val
 
 data SocketFdPropertyInfo
 instance AttrInfo SocketFdPropertyInfo where
@@ -584,10 +605,12 @@
     attrGet _ = getSocketFd
     attrSet _ = undefined
     attrConstruct _ = constructSocketFd
+    attrClear _ = undefined
 
 -- VVV Prop "keepalive"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketKeepalive :: (MonadIO m, SocketK o) => o -> m Bool
 getSocketKeepalive obj = liftIO $ getObjectPropertyBool obj "keepalive"
@@ -608,19 +631,21 @@
     attrGet _ = getSocketKeepalive
     attrSet _ = setSocketKeepalive
     attrConstruct _ = constructSocketKeepalive
+    attrClear _ = undefined
 
 -- VVV Prop "listen-backlog"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketListenBacklog :: (MonadIO m, SocketK o) => o -> m Int32
-getSocketListenBacklog obj = liftIO $ getObjectPropertyCInt obj "listen-backlog"
+getSocketListenBacklog obj = liftIO $ getObjectPropertyInt32 obj "listen-backlog"
 
 setSocketListenBacklog :: (MonadIO m, SocketK o) => o -> Int32 -> m ()
-setSocketListenBacklog obj val = liftIO $ setObjectPropertyCInt obj "listen-backlog" val
+setSocketListenBacklog obj val = liftIO $ setObjectPropertyInt32 obj "listen-backlog" val
 
 constructSocketListenBacklog :: Int32 -> IO ([Char], GValue)
-constructSocketListenBacklog val = constructObjectPropertyCInt "listen-backlog" val
+constructSocketListenBacklog val = constructObjectPropertyInt32 "listen-backlog" val
 
 data SocketListenBacklogPropertyInfo
 instance AttrInfo SocketListenBacklogPropertyInfo where
@@ -632,28 +657,32 @@
     attrGet _ = getSocketListenBacklog
     attrSet _ = setSocketListenBacklog
     attrConstruct _ = constructSocketListenBacklog
+    attrClear _ = undefined
 
 -- VVV Prop "local-address"
    -- Type: TInterface "Gio" "SocketAddress"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getSocketLocalAddress :: (MonadIO m, SocketK o) => o -> m SocketAddress
+getSocketLocalAddress :: (MonadIO m, SocketK o) => o -> m (Maybe SocketAddress)
 getSocketLocalAddress obj = liftIO $ getObjectPropertyObject obj "local-address" SocketAddress
 
 data SocketLocalAddressPropertyInfo
 instance AttrInfo SocketLocalAddressPropertyInfo where
-    type AttrAllowedOps SocketLocalAddressPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps SocketLocalAddressPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SocketLocalAddressPropertyInfo = (~) ()
     type AttrBaseTypeConstraint SocketLocalAddressPropertyInfo = SocketK
-    type AttrGetType SocketLocalAddressPropertyInfo = SocketAddress
+    type AttrGetType SocketLocalAddressPropertyInfo = (Maybe SocketAddress)
     type AttrLabel SocketLocalAddressPropertyInfo = "local-address"
     attrGet _ = getSocketLocalAddress
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "multicast-loopback"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketMulticastLoopback :: (MonadIO m, SocketK o) => o -> m Bool
 getSocketMulticastLoopback obj = liftIO $ getObjectPropertyBool obj "multicast-loopback"
@@ -674,19 +703,21 @@
     attrGet _ = getSocketMulticastLoopback
     attrSet _ = setSocketMulticastLoopback
     attrConstruct _ = constructSocketMulticastLoopback
+    attrClear _ = undefined
 
 -- VVV Prop "multicast-ttl"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketMulticastTtl :: (MonadIO m, SocketK o) => o -> m Word32
-getSocketMulticastTtl obj = liftIO $ getObjectPropertyCUInt obj "multicast-ttl"
+getSocketMulticastTtl obj = liftIO $ getObjectPropertyUInt32 obj "multicast-ttl"
 
 setSocketMulticastTtl :: (MonadIO m, SocketK o) => o -> Word32 -> m ()
-setSocketMulticastTtl obj val = liftIO $ setObjectPropertyCUInt obj "multicast-ttl" val
+setSocketMulticastTtl obj val = liftIO $ setObjectPropertyUInt32 obj "multicast-ttl" val
 
 constructSocketMulticastTtl :: Word32 -> IO ([Char], GValue)
-constructSocketMulticastTtl val = constructObjectPropertyCUInt "multicast-ttl" val
+constructSocketMulticastTtl val = constructObjectPropertyUInt32 "multicast-ttl" val
 
 data SocketMulticastTtlPropertyInfo
 instance AttrInfo SocketMulticastTtlPropertyInfo where
@@ -698,10 +729,12 @@
     attrGet _ = getSocketMulticastTtl
     attrSet _ = setSocketMulticastTtl
     attrConstruct _ = constructSocketMulticastTtl
+    attrClear _ = undefined
 
 -- VVV Prop "protocol"
    -- Type: TInterface "Gio" "SocketProtocol"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getSocketProtocol :: (MonadIO m, SocketK o) => o -> m SocketProtocol
 getSocketProtocol obj = liftIO $ getObjectPropertyEnum obj "protocol"
@@ -719,37 +752,41 @@
     attrGet _ = getSocketProtocol
     attrSet _ = undefined
     attrConstruct _ = constructSocketProtocol
+    attrClear _ = undefined
 
 -- VVV Prop "remote-address"
    -- Type: TInterface "Gio" "SocketAddress"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Nothing,Nothing)
 
-getSocketRemoteAddress :: (MonadIO m, SocketK o) => o -> m SocketAddress
+getSocketRemoteAddress :: (MonadIO m, SocketK o) => o -> m (Maybe SocketAddress)
 getSocketRemoteAddress obj = liftIO $ getObjectPropertyObject obj "remote-address" SocketAddress
 
 data SocketRemoteAddressPropertyInfo
 instance AttrInfo SocketRemoteAddressPropertyInfo where
-    type AttrAllowedOps SocketRemoteAddressPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps SocketRemoteAddressPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SocketRemoteAddressPropertyInfo = (~) ()
     type AttrBaseTypeConstraint SocketRemoteAddressPropertyInfo = SocketK
-    type AttrGetType SocketRemoteAddressPropertyInfo = SocketAddress
+    type AttrGetType SocketRemoteAddressPropertyInfo = (Maybe SocketAddress)
     type AttrLabel SocketRemoteAddressPropertyInfo = "remote-address"
     attrGet _ = getSocketRemoteAddress
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "timeout"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketTimeout :: (MonadIO m, SocketK o) => o -> m Word32
-getSocketTimeout obj = liftIO $ getObjectPropertyCUInt obj "timeout"
+getSocketTimeout obj = liftIO $ getObjectPropertyUInt32 obj "timeout"
 
 setSocketTimeout :: (MonadIO m, SocketK o) => o -> Word32 -> m ()
-setSocketTimeout obj val = liftIO $ setObjectPropertyCUInt obj "timeout" val
+setSocketTimeout obj val = liftIO $ setObjectPropertyUInt32 obj "timeout" val
 
 constructSocketTimeout :: Word32 -> IO ([Char], GValue)
-constructSocketTimeout val = constructObjectPropertyCUInt "timeout" val
+constructSocketTimeout val = constructObjectPropertyUInt32 "timeout" val
 
 data SocketTimeoutPropertyInfo
 instance AttrInfo SocketTimeoutPropertyInfo where
@@ -761,19 +798,21 @@
     attrGet _ = getSocketTimeout
     attrSet _ = setSocketTimeout
     attrConstruct _ = constructSocketTimeout
+    attrClear _ = undefined
 
 -- VVV Prop "ttl"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getSocketTtl :: (MonadIO m, SocketK o) => o -> m Word32
-getSocketTtl obj = liftIO $ getObjectPropertyCUInt obj "ttl"
+getSocketTtl obj = liftIO $ getObjectPropertyUInt32 obj "ttl"
 
 setSocketTtl :: (MonadIO m, SocketK o) => o -> Word32 -> m ()
-setSocketTtl obj val = liftIO $ setObjectPropertyCUInt obj "ttl" val
+setSocketTtl obj val = liftIO $ setObjectPropertyUInt32 obj "ttl" val
 
 constructSocketTtl :: Word32 -> IO ([Char], GValue)
-constructSocketTtl val = constructObjectPropertyCUInt "ttl" val
+constructSocketTtl val = constructObjectPropertyUInt32 "ttl" val
 
 data SocketTtlPropertyInfo
 instance AttrInfo SocketTtlPropertyInfo where
@@ -785,10 +824,12 @@
     attrGet _ = getSocketTtl
     attrSet _ = setSocketTtl
     attrConstruct _ = constructSocketTtl
+    attrClear _ = undefined
 
 -- VVV Prop "type"
    -- Type: TInterface "Gio" "SocketType"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getSocketType :: (MonadIO m, SocketK o) => o -> m SocketType
 getSocketType obj = liftIO $ getObjectPropertyEnum obj "type"
@@ -806,10 +847,53 @@
     attrGet _ = getSocketType
     attrSet _ = undefined
     attrConstruct _ = constructSocketType
+    attrClear _ = undefined
 
 type instance AttributeList Socket = SocketAttributeList
 type SocketAttributeList = ('[ '("blocking", SocketBlockingPropertyInfo), '("broadcast", SocketBroadcastPropertyInfo), '("family", SocketFamilyPropertyInfo), '("fd", SocketFdPropertyInfo), '("keepalive", SocketKeepalivePropertyInfo), '("listenBacklog", SocketListenBacklogPropertyInfo), '("localAddress", SocketLocalAddressPropertyInfo), '("multicastLoopback", SocketMulticastLoopbackPropertyInfo), '("multicastTtl", SocketMulticastTtlPropertyInfo), '("protocol", SocketProtocolPropertyInfo), '("remoteAddress", SocketRemoteAddressPropertyInfo), '("timeout", SocketTimeoutPropertyInfo), '("ttl", SocketTtlPropertyInfo), '("type", SocketTypePropertyInfo)] :: [(Symbol, *)])
 
+socketBlocking :: AttrLabelProxy "blocking"
+socketBlocking = AttrLabelProxy
+
+socketBroadcast :: AttrLabelProxy "broadcast"
+socketBroadcast = AttrLabelProxy
+
+socketFamily :: AttrLabelProxy "family"
+socketFamily = AttrLabelProxy
+
+socketFd :: AttrLabelProxy "fd"
+socketFd = AttrLabelProxy
+
+socketKeepalive :: AttrLabelProxy "keepalive"
+socketKeepalive = AttrLabelProxy
+
+socketListenBacklog :: AttrLabelProxy "listenBacklog"
+socketListenBacklog = AttrLabelProxy
+
+socketLocalAddress :: AttrLabelProxy "localAddress"
+socketLocalAddress = AttrLabelProxy
+
+socketMulticastLoopback :: AttrLabelProxy "multicastLoopback"
+socketMulticastLoopback = AttrLabelProxy
+
+socketMulticastTtl :: AttrLabelProxy "multicastTtl"
+socketMulticastTtl = AttrLabelProxy
+
+socketProtocol :: AttrLabelProxy "protocol"
+socketProtocol = AttrLabelProxy
+
+socketRemoteAddress :: AttrLabelProxy "remoteAddress"
+socketRemoteAddress = AttrLabelProxy
+
+socketTimeout :: AttrLabelProxy "timeout"
+socketTimeout = AttrLabelProxy
+
+socketTtl :: AttrLabelProxy "ttl"
+socketTtl = AttrLabelProxy
+
+socketType :: AttrLabelProxy "type"
+socketType = AttrLabelProxy
+
 type instance SignalList Socket = SocketSignalList
 type SocketSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -817,7 +901,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TInterface "Gio" "SocketProtocol", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : True
 -- Skip return : False
 
@@ -850,14 +934,14 @@
 
 -- method Socket::new_from_fd
 -- method type : Constructor
--- Args : [Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_socket_new_from_fd" g_socket_new_from_fd :: 
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO (Ptr Socket)
 
@@ -880,7 +964,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : True
 -- Skip return : False
 
@@ -922,7 +1006,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "allow_reuse", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -961,7 +1045,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -993,7 +1077,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1025,7 +1109,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "condition", argType = TInterface "GLib" "IOCondition", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "IOCondition"
+-- returnType : Just (TInterface "GLib" "IOCondition")
 -- throws : False
 -- Skip return : False
 
@@ -1056,7 +1140,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "condition", argType = TInterface "GLib" "IOCondition", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1101,7 +1185,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "condition", argType = TInterface "GLib" "IOCondition", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1144,7 +1228,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1188,7 +1272,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : False
 -- Skip return : False
 
@@ -1217,7 +1301,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -1244,7 +1328,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1272,7 +1356,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1300,7 +1384,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : True
 -- Skip return : False
 
@@ -1334,7 +1418,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketFamily"
+-- returnType : Just (TInterface "Gio" "SocketFamily")
 -- throws : False
 -- Skip return : False
 
@@ -1362,7 +1446,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -1389,7 +1473,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1417,7 +1501,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -1444,7 +1528,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
@@ -1478,7 +1562,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1506,7 +1590,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1531,17 +1615,17 @@
 
 -- method Socket::get_option
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "optname", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "optname", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_socket_get_option" g_socket_get_option :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Int32 ->                                -- level : TBasicType TInt32
-    Int32 ->                                -- optname : TBasicType TInt32
-    Ptr Int32 ->                            -- value : TBasicType TInt32
+    Int32 ->                                -- level : TBasicType TInt
+    Int32 ->                                -- optname : TBasicType TInt
+    Ptr Int32 ->                            -- value : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -1573,7 +1657,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketProtocol"
+-- returnType : Just (TInterface "Gio" "SocketProtocol")
 -- throws : False
 -- Skip return : False
 
@@ -1601,7 +1685,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
@@ -1635,7 +1719,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketType"
+-- returnType : Just (TInterface "Gio" "SocketType")
 -- throws : False
 -- Skip return : False
 
@@ -1663,7 +1747,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1690,7 +1774,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1717,7 +1801,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1745,7 +1829,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1773,7 +1857,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "group", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_specific", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "iface", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1820,7 +1904,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "group", argType = TInterface "Gio" "InetAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_specific", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "iface", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1867,7 +1951,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1899,7 +1983,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1945,7 +2029,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "buffer", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -1995,9 +2079,9 @@
 
 -- method Socket::receive_message
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "vectors", argType = TCArray False (-1) 3 (TInterface "Gio" "InputVector"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "vectors", argType = TCArray False (-1) 3 (TInterface "Gio" "InputVector"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2005,10 +2089,10 @@
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
     Ptr (Ptr SocketAddress) ->              -- address : TInterface "Gio" "SocketAddress"
     Ptr InputVector ->                      -- vectors : TCArray False (-1) 3 (TInterface "Gio" "InputVector")
-    Int32 ->                                -- num_vectors : TBasicType TInt32
+    Int32 ->                                -- num_vectors : TBasicType TInt
     Ptr (Ptr SocketControlMessage) ->       -- messages : TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage")
-    Int32 ->                                -- num_messages : TBasicType TInt32
-    Int32 ->                                -- flags : TBasicType TInt32
+    Int32 ->                                -- num_messages : TBasicType TInt
+    Int32 ->                                -- flags : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO Int64
@@ -2068,7 +2152,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2117,7 +2201,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2161,9 +2245,9 @@
 
 -- method Socket::send_message
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "vectors", argType = TCArray False (-1) 3 (TInterface "Gio" "OutputVector"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "vectors", argType = TCArray False (-1) 3 (TInterface "Gio" "OutputVector"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_vectors", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2171,10 +2255,10 @@
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
     Ptr SocketAddress ->                    -- address : TInterface "Gio" "SocketAddress"
     Ptr OutputVector ->                     -- vectors : TCArray False (-1) 3 (TInterface "Gio" "OutputVector")
-    Int32 ->                                -- num_vectors : TBasicType TInt32
+    Int32 ->                                -- num_vectors : TBasicType TInt
     Ptr (Ptr SocketControlMessage) ->       -- messages : TCArray False (-1) 5 (TInterface "Gio" "SocketControlMessage")
-    Int32 ->                                -- num_messages : TBasicType TInt32
-    Int32 ->                                -- flags : TBasicType TInt32
+    Int32 ->                                -- num_messages : TBasicType TInt
+    Int32 ->                                -- flags : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO Int64
@@ -2234,17 +2318,17 @@
 
 -- method Socket::send_messages
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 2 (TInterface "Gio" "OutputMessage"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt32
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "messages", argType = TCArray False (-1) 2 (TInterface "Gio" "OutputMessage"), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "num_messages", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "num_messages", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_socket_send_messages" g_socket_send_messages :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
     Ptr OutputMessage ->                    -- messages : TCArray False (-1) 2 (TInterface "Gio" "OutputMessage")
-    Word32 ->                               -- num_messages : TBasicType TUInt32
-    Int32 ->                                -- flags : TBasicType TInt32
+    Word32 ->                               -- num_messages : TBasicType TUInt
+    Int32 ->                                -- flags : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO Int32
@@ -2286,7 +2370,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 3 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2340,7 +2424,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "buffer", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -2389,7 +2473,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "blocking", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2419,7 +2503,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "broadcast", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2449,7 +2533,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "keepalive", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2477,15 +2561,15 @@
 
 -- method Socket::set_listen_backlog
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "backlog", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "backlog", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_set_listen_backlog" g_socket_set_listen_backlog :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Int32 ->                                -- backlog : TBasicType TInt32
+    Int32 ->                                -- backlog : TBasicType TInt
     IO ()
 
 
@@ -2508,7 +2592,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "loopback", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -2536,15 +2620,15 @@
 
 -- method Socket::set_multicast_ttl
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ttl", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ttl", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_set_multicast_ttl" g_socket_set_multicast_ttl :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Word32 ->                               -- ttl : TBasicType TUInt32
+    Word32 ->                               -- ttl : TBasicType TUInt
     IO ()
 
 
@@ -2565,17 +2649,17 @@
 
 -- method Socket::set_option
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "optname", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "optname", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_socket_set_option" g_socket_set_option :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Int32 ->                                -- level : TBasicType TInt32
-    Int32 ->                                -- optname : TBasicType TInt32
-    Int32 ->                                -- value : TBasicType TInt32
+    Int32 ->                                -- level : TBasicType TInt
+    Int32 ->                                -- optname : TBasicType TInt
+    Int32 ->                                -- value : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -2603,15 +2687,15 @@
 
 -- method Socket::set_timeout
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_set_timeout" g_socket_set_timeout :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Word32 ->                               -- timeout : TBasicType TUInt32
+    Word32 ->                               -- timeout : TBasicType TUInt
     IO ()
 
 
@@ -2632,15 +2716,15 @@
 
 -- method Socket::set_ttl
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ttl", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ttl", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_set_ttl" g_socket_set_ttl :: 
     Ptr Socket ->                           -- _obj : TInterface "Gio" "Socket"
-    Word32 ->                               -- ttl : TBasicType TUInt32
+    Word32 ->                               -- ttl : TBasicType TUInt
     IO ()
 
 
@@ -2663,7 +2747,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "shutdown_read", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "shutdown_write", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -2701,7 +2785,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Socket.hs-boot b/GI/Gio/Objects/Socket.hs-boot
--- a/GI/Gio/Objects/Socket.hs-boot
+++ b/GI/Gio/Objects/Socket.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Socket where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketAddress.hs b/GI/Gio/Objects/SocketAddress.hs
--- a/GI/Gio/Objects/SocketAddress.hs
+++ b/GI/Gio/Objects/SocketAddress.hs
@@ -42,15 +42,16 @@
 -- ** Family
     SocketAddressFamilyPropertyInfo         ,
     getSocketAddressFamily                  ,
+    socketAddressFamily                     ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -121,6 +122,7 @@
 -- VVV Prop "family"
    -- Type: TInterface "Gio" "SocketFamily"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getSocketAddressFamily :: (MonadIO m, SocketAddressK o) => o -> m SocketFamily
 getSocketAddressFamily obj = liftIO $ getObjectPropertyEnum obj "family"
@@ -135,23 +137,27 @@
     attrGet _ = getSocketAddressFamily
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList SocketAddress = SocketAddressAttributeList
 type SocketAddressAttributeList = ('[ '("family", SocketAddressFamilyPropertyInfo)] :: [(Symbol, *)])
 
+socketAddressFamily :: AttrLabelProxy "family"
+socketAddressFamily = AttrLabelProxy
+
 type instance SignalList SocketAddress = SocketAddressSignalList
 type SocketAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method SocketAddress::new_from_native
 -- method type : Constructor
--- Args : [Arg {argCName = "native", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "native", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "len", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_address_new_from_native" g_socket_address_new_from_native :: 
-    Ptr () ->                               -- native : TBasicType TVoid
+    Ptr () ->                               -- native : TBasicType TPtr
     Word64 ->                               -- len : TBasicType TUInt64
     IO (Ptr SocketAddress)
 
@@ -171,7 +177,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketFamily"
+-- returnType : Just (TInterface "Gio" "SocketFamily")
 -- throws : False
 -- Skip return : False
 
@@ -199,7 +205,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : False
 -- Skip return : False
 
@@ -224,15 +230,15 @@
 
 -- method SocketAddress::to_native
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dest", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destlen", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "dest", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destlen", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_socket_address_to_native" g_socket_address_to_native :: 
     Ptr SocketAddress ->                    -- _obj : TInterface "Gio" "SocketAddress"
-    Ptr () ->                               -- dest : TBasicType TVoid
+    Ptr () ->                               -- dest : TBasicType TPtr
     Word64 ->                               -- destlen : TBasicType TUInt64
     Ptr (Ptr GError) ->                     -- error
     IO CInt
diff --git a/GI/Gio/Objects/SocketAddress.hs-boot b/GI/Gio/Objects/SocketAddress.hs-boot
--- a/GI/Gio/Objects/SocketAddress.hs-boot
+++ b/GI/Gio/Objects/SocketAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketAddressEnumerator.hs b/GI/Gio/Objects/SocketAddressEnumerator.hs
--- a/GI/Gio/Objects/SocketAddressEnumerator.hs
+++ b/GI/Gio/Objects/SocketAddressEnumerator.hs
@@ -36,9 +36,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -114,7 +114,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddressEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
@@ -154,9 +154,9 @@
 
 -- method SocketAddressEnumerator::next_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddressEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddressEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -164,7 +164,7 @@
     Ptr SocketAddressEnumerator ->          -- _obj : TInterface "Gio" "SocketAddressEnumerator"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -202,7 +202,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketAddressEnumerator", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SocketAddressEnumerator.hs-boot b/GI/Gio/Objects/SocketAddressEnumerator.hs-boot
--- a/GI/Gio/Objects/SocketAddressEnumerator.hs-boot
+++ b/GI/Gio/Objects/SocketAddressEnumerator.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketAddressEnumerator where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketClient.hs b/GI/Gio/Objects/SocketClient.hs
--- a/GI/Gio/Objects/SocketClient.hs
+++ b/GI/Gio/Objects/SocketClient.hs
@@ -184,6 +184,7 @@
     constructSocketClientEnableProxy        ,
     getSocketClientEnableProxy              ,
     setSocketClientEnableProxy              ,
+    socketClientEnableProxy                 ,
 
 
 -- ** Family
@@ -191,13 +192,16 @@
     constructSocketClientFamily             ,
     getSocketClientFamily                   ,
     setSocketClientFamily                   ,
+    socketClientFamily                      ,
 
 
 -- ** LocalAddress
     SocketClientLocalAddressPropertyInfo    ,
+    clearSocketClientLocalAddress           ,
     constructSocketClientLocalAddress       ,
     getSocketClientLocalAddress             ,
     setSocketClientLocalAddress             ,
+    socketClientLocalAddress                ,
 
 
 -- ** Protocol
@@ -205,13 +209,16 @@
     constructSocketClientProtocol           ,
     getSocketClientProtocol                 ,
     setSocketClientProtocol                 ,
+    socketClientProtocol                    ,
 
 
 -- ** ProxyResolver
     SocketClientProxyResolverPropertyInfo   ,
+    clearSocketClientProxyResolver          ,
     constructSocketClientProxyResolver      ,
     getSocketClientProxyResolver            ,
     setSocketClientProxyResolver            ,
+    socketClientProxyResolver               ,
 
 
 -- ** Timeout
@@ -219,6 +226,7 @@
     constructSocketClientTimeout            ,
     getSocketClientTimeout                  ,
     setSocketClientTimeout                  ,
+    socketClientTimeout                     ,
 
 
 -- ** Tls
@@ -226,6 +234,7 @@
     constructSocketClientTls                ,
     getSocketClientTls                      ,
     setSocketClientTls                      ,
+    socketClientTls                         ,
 
 
 -- ** TlsValidationFlags
@@ -233,6 +242,7 @@
     constructSocketClientTlsValidationFlags ,
     getSocketClientTlsValidationFlags       ,
     setSocketClientTlsValidationFlags       ,
+    socketClientTlsValidationFlags          ,
 
 
 -- ** Type
@@ -240,6 +250,7 @@
     constructSocketClientType               ,
     getSocketClientType                     ,
     setSocketClientType                     ,
+    socketClientType                        ,
 
 
 
@@ -261,9 +272,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -415,6 +426,7 @@
 -- VVV Prop "enable-proxy"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientEnableProxy :: (MonadIO m, SocketClientK o) => o -> m Bool
 getSocketClientEnableProxy obj = liftIO $ getObjectPropertyBool obj "enable-proxy"
@@ -435,10 +447,12 @@
     attrGet _ = getSocketClientEnableProxy
     attrSet _ = setSocketClientEnableProxy
     attrConstruct _ = constructSocketClientEnableProxy
+    attrClear _ = undefined
 
 -- VVV Prop "family"
    -- Type: TInterface "Gio" "SocketFamily"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientFamily :: (MonadIO m, SocketClientK o) => o -> m SocketFamily
 getSocketClientFamily obj = liftIO $ getObjectPropertyEnum obj "family"
@@ -459,23 +473,28 @@
     attrGet _ = getSocketClientFamily
     attrSet _ = setSocketClientFamily
     attrConstruct _ = constructSocketClientFamily
+    attrClear _ = undefined
 
 -- VVV Prop "local-address"
    -- Type: TInterface "Gio" "SocketAddress"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just True)
 
 getSocketClientLocalAddress :: (MonadIO m, SocketClientK o) => o -> m SocketAddress
-getSocketClientLocalAddress obj = liftIO $ getObjectPropertyObject obj "local-address" SocketAddress
+getSocketClientLocalAddress obj = liftIO $ checkUnexpectedNothing "getSocketClientLocalAddress" $ getObjectPropertyObject obj "local-address" SocketAddress
 
 setSocketClientLocalAddress :: (MonadIO m, SocketClientK o, SocketAddressK a) => o -> a -> m ()
-setSocketClientLocalAddress obj val = liftIO $ setObjectPropertyObject obj "local-address" val
+setSocketClientLocalAddress obj val = liftIO $ setObjectPropertyObject obj "local-address" (Just val)
 
 constructSocketClientLocalAddress :: (SocketAddressK a) => a -> IO ([Char], GValue)
-constructSocketClientLocalAddress val = constructObjectPropertyObject "local-address" val
+constructSocketClientLocalAddress val = constructObjectPropertyObject "local-address" (Just val)
 
+clearSocketClientLocalAddress :: (MonadIO m, SocketClientK o) => o -> m ()
+clearSocketClientLocalAddress obj = liftIO $ setObjectPropertyObject obj "local-address" (Nothing :: Maybe SocketAddress)
+
 data SocketClientLocalAddressPropertyInfo
 instance AttrInfo SocketClientLocalAddressPropertyInfo where
-    type AttrAllowedOps SocketClientLocalAddressPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SocketClientLocalAddressPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SocketClientLocalAddressPropertyInfo = SocketAddressK
     type AttrBaseTypeConstraint SocketClientLocalAddressPropertyInfo = SocketClientK
     type AttrGetType SocketClientLocalAddressPropertyInfo = SocketAddress
@@ -483,10 +502,12 @@
     attrGet _ = getSocketClientLocalAddress
     attrSet _ = setSocketClientLocalAddress
     attrConstruct _ = constructSocketClientLocalAddress
+    attrClear _ = clearSocketClientLocalAddress
 
 -- VVV Prop "protocol"
    -- Type: TInterface "Gio" "SocketProtocol"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientProtocol :: (MonadIO m, SocketClientK o) => o -> m SocketProtocol
 getSocketClientProtocol obj = liftIO $ getObjectPropertyEnum obj "protocol"
@@ -507,23 +528,28 @@
     attrGet _ = getSocketClientProtocol
     attrSet _ = setSocketClientProtocol
     attrConstruct _ = constructSocketClientProtocol
+    attrClear _ = undefined
 
 -- VVV Prop "proxy-resolver"
    -- Type: TInterface "Gio" "ProxyResolver"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just True)
 
 getSocketClientProxyResolver :: (MonadIO m, SocketClientK o) => o -> m ProxyResolver
-getSocketClientProxyResolver obj = liftIO $ getObjectPropertyObject obj "proxy-resolver" ProxyResolver
+getSocketClientProxyResolver obj = liftIO $ checkUnexpectedNothing "getSocketClientProxyResolver" $ getObjectPropertyObject obj "proxy-resolver" ProxyResolver
 
 setSocketClientProxyResolver :: (MonadIO m, SocketClientK o, ProxyResolverK a) => o -> a -> m ()
-setSocketClientProxyResolver obj val = liftIO $ setObjectPropertyObject obj "proxy-resolver" val
+setSocketClientProxyResolver obj val = liftIO $ setObjectPropertyObject obj "proxy-resolver" (Just val)
 
 constructSocketClientProxyResolver :: (ProxyResolverK a) => a -> IO ([Char], GValue)
-constructSocketClientProxyResolver val = constructObjectPropertyObject "proxy-resolver" val
+constructSocketClientProxyResolver val = constructObjectPropertyObject "proxy-resolver" (Just val)
 
+clearSocketClientProxyResolver :: (MonadIO m, SocketClientK o) => o -> m ()
+clearSocketClientProxyResolver obj = liftIO $ setObjectPropertyObject obj "proxy-resolver" (Nothing :: Maybe ProxyResolver)
+
 data SocketClientProxyResolverPropertyInfo
 instance AttrInfo SocketClientProxyResolverPropertyInfo where
-    type AttrAllowedOps SocketClientProxyResolverPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SocketClientProxyResolverPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SocketClientProxyResolverPropertyInfo = ProxyResolverK
     type AttrBaseTypeConstraint SocketClientProxyResolverPropertyInfo = SocketClientK
     type AttrGetType SocketClientProxyResolverPropertyInfo = ProxyResolver
@@ -531,19 +557,21 @@
     attrGet _ = getSocketClientProxyResolver
     attrSet _ = setSocketClientProxyResolver
     attrConstruct _ = constructSocketClientProxyResolver
+    attrClear _ = clearSocketClientProxyResolver
 
 -- VVV Prop "timeout"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientTimeout :: (MonadIO m, SocketClientK o) => o -> m Word32
-getSocketClientTimeout obj = liftIO $ getObjectPropertyCUInt obj "timeout"
+getSocketClientTimeout obj = liftIO $ getObjectPropertyUInt32 obj "timeout"
 
 setSocketClientTimeout :: (MonadIO m, SocketClientK o) => o -> Word32 -> m ()
-setSocketClientTimeout obj val = liftIO $ setObjectPropertyCUInt obj "timeout" val
+setSocketClientTimeout obj val = liftIO $ setObjectPropertyUInt32 obj "timeout" val
 
 constructSocketClientTimeout :: Word32 -> IO ([Char], GValue)
-constructSocketClientTimeout val = constructObjectPropertyCUInt "timeout" val
+constructSocketClientTimeout val = constructObjectPropertyUInt32 "timeout" val
 
 data SocketClientTimeoutPropertyInfo
 instance AttrInfo SocketClientTimeoutPropertyInfo where
@@ -555,10 +583,12 @@
     attrGet _ = getSocketClientTimeout
     attrSet _ = setSocketClientTimeout
     attrConstruct _ = constructSocketClientTimeout
+    attrClear _ = undefined
 
 -- VVV Prop "tls"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientTls :: (MonadIO m, SocketClientK o) => o -> m Bool
 getSocketClientTls obj = liftIO $ getObjectPropertyBool obj "tls"
@@ -579,10 +609,12 @@
     attrGet _ = getSocketClientTls
     attrSet _ = setSocketClientTls
     attrConstruct _ = constructSocketClientTls
+    attrClear _ = undefined
 
 -- VVV Prop "tls-validation-flags"
    -- Type: TInterface "Gio" "TlsCertificateFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getSocketClientTlsValidationFlags :: (MonadIO m, SocketClientK o) => o -> m [TlsCertificateFlags]
 getSocketClientTlsValidationFlags obj = liftIO $ getObjectPropertyFlags obj "tls-validation-flags"
@@ -603,10 +635,12 @@
     attrGet _ = getSocketClientTlsValidationFlags
     attrSet _ = setSocketClientTlsValidationFlags
     attrConstruct _ = constructSocketClientTlsValidationFlags
+    attrClear _ = undefined
 
 -- VVV Prop "type"
    -- Type: TInterface "Gio" "SocketType"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getSocketClientType :: (MonadIO m, SocketClientK o) => o -> m SocketType
 getSocketClientType obj = liftIO $ getObjectPropertyEnum obj "type"
@@ -627,10 +661,38 @@
     attrGet _ = getSocketClientType
     attrSet _ = setSocketClientType
     attrConstruct _ = constructSocketClientType
+    attrClear _ = undefined
 
 type instance AttributeList SocketClient = SocketClientAttributeList
 type SocketClientAttributeList = ('[ '("enableProxy", SocketClientEnableProxyPropertyInfo), '("family", SocketClientFamilyPropertyInfo), '("localAddress", SocketClientLocalAddressPropertyInfo), '("protocol", SocketClientProtocolPropertyInfo), '("proxyResolver", SocketClientProxyResolverPropertyInfo), '("timeout", SocketClientTimeoutPropertyInfo), '("tls", SocketClientTlsPropertyInfo), '("tlsValidationFlags", SocketClientTlsValidationFlagsPropertyInfo), '("type", SocketClientTypePropertyInfo)] :: [(Symbol, *)])
 
+socketClientEnableProxy :: AttrLabelProxy "enableProxy"
+socketClientEnableProxy = AttrLabelProxy
+
+socketClientFamily :: AttrLabelProxy "family"
+socketClientFamily = AttrLabelProxy
+
+socketClientLocalAddress :: AttrLabelProxy "localAddress"
+socketClientLocalAddress = AttrLabelProxy
+
+socketClientProtocol :: AttrLabelProxy "protocol"
+socketClientProtocol = AttrLabelProxy
+
+socketClientProxyResolver :: AttrLabelProxy "proxyResolver"
+socketClientProxyResolver = AttrLabelProxy
+
+socketClientTimeout :: AttrLabelProxy "timeout"
+socketClientTimeout = AttrLabelProxy
+
+socketClientTls :: AttrLabelProxy "tls"
+socketClientTls = AttrLabelProxy
+
+socketClientTlsValidationFlags :: AttrLabelProxy "tlsValidationFlags"
+socketClientTlsValidationFlags = AttrLabelProxy
+
+socketClientType :: AttrLabelProxy "type"
+socketClientType = AttrLabelProxy
+
 data SocketClientEventSignalInfo
 instance SignalInfo SocketClientEventSignalInfo where
     type HaskellCallbackType SocketClientEventSignalInfo = SocketClientEventCallback
@@ -643,7 +705,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketClient"
+-- returnType : Just (TInterface "Gio" "SocketClient")
 -- throws : False
 -- Skip return : False
 
@@ -664,7 +726,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -695,7 +757,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -739,9 +801,9 @@
 
 -- method SocketClient::connect_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connectable", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -750,7 +812,7 @@
     Ptr SocketConnectable ->                -- connectable : TInterface "Gio" "SocketConnectable"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -791,7 +853,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -829,7 +891,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "host_and_port", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -875,9 +937,9 @@
 
 -- method SocketClient::connect_to_host_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "host_and_port", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "host_and_port", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -887,7 +949,7 @@
     Word16 ->                               -- default_port : TBasicType TUInt16
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -929,7 +991,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -967,7 +1029,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -1016,9 +1078,9 @@
 
 -- method SocketClient::connect_to_service_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "domain", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "service", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1028,7 +1090,7 @@
     CString ->                              -- service : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1072,7 +1134,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -1110,7 +1172,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -1156,9 +1218,9 @@
 
 -- method SocketClient::connect_to_uri_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "default_port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1168,7 +1230,7 @@
     Word16 ->                               -- default_port : TBasicType TUInt16
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1210,7 +1272,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -1248,7 +1310,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1276,7 +1338,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketFamily"
+-- returnType : Just (TInterface "Gio" "SocketFamily")
 -- throws : False
 -- Skip return : False
 
@@ -1304,7 +1366,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : False
 -- Skip return : False
 
@@ -1333,7 +1395,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketProtocol"
+-- returnType : Just (TInterface "Gio" "SocketProtocol")
 -- throws : False
 -- Skip return : False
 
@@ -1361,7 +1423,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ProxyResolver"
+-- returnType : Just (TInterface "Gio" "ProxyResolver")
 -- throws : False
 -- Skip return : False
 
@@ -1390,7 +1452,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketType"
+-- returnType : Just (TInterface "Gio" "SocketType")
 -- throws : False
 -- Skip return : False
 
@@ -1418,7 +1480,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -1445,7 +1507,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1473,7 +1535,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : False
 -- Skip return : False
 
@@ -1501,7 +1563,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "enable", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1531,7 +1593,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1561,7 +1623,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1596,7 +1658,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TInterface "Gio" "SocketProtocol", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1626,7 +1688,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "proxy_resolver", argType = TInterface "Gio" "ProxyResolver", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1661,7 +1723,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1689,15 +1751,15 @@
 
 -- method SocketClient::set_timeout
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_client_set_timeout" g_socket_client_set_timeout :: 
     Ptr SocketClient ->                     -- _obj : TInterface "Gio" "SocketClient"
-    Word32 ->                               -- timeout : TBasicType TUInt32
+    Word32 ->                               -- timeout : TBasicType TUInt
     IO ()
 
 
@@ -1720,7 +1782,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tls", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1750,7 +1812,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketClient", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SocketClient.hs-boot b/GI/Gio/Objects/SocketClient.hs-boot
--- a/GI/Gio/Objects/SocketClient.hs-boot
+++ b/GI/Gio/Objects/SocketClient.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketClient where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketConnection.hs b/GI/Gio/Objects/SocketConnection.hs
--- a/GI/Gio/Objects/SocketConnection.hs
+++ b/GI/Gio/Objects/SocketConnection.hs
@@ -67,15 +67,16 @@
     SocketConnectionSocketPropertyInfo      ,
     constructSocketConnectionSocket         ,
     getSocketConnectionSocket               ,
+    socketConnectionSocket                  ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -158,16 +159,17 @@
 -- VVV Prop "socket"
    -- Type: TInterface "Gio" "Socket"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getSocketConnectionSocket :: (MonadIO m, SocketConnectionK o) => o -> m Socket
-getSocketConnectionSocket obj = liftIO $ getObjectPropertyObject obj "socket" Socket
+getSocketConnectionSocket obj = liftIO $ checkUnexpectedNothing "getSocketConnectionSocket" $ getObjectPropertyObject obj "socket" Socket
 
 constructSocketConnectionSocket :: (SocketK a) => a -> IO ([Char], GValue)
-constructSocketConnectionSocket val = constructObjectPropertyObject "socket" val
+constructSocketConnectionSocket val = constructObjectPropertyObject "socket" (Just val)
 
 data SocketConnectionSocketPropertyInfo
 instance AttrInfo SocketConnectionSocketPropertyInfo where
-    type AttrAllowedOps SocketConnectionSocketPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps SocketConnectionSocketPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint SocketConnectionSocketPropertyInfo = SocketK
     type AttrBaseTypeConstraint SocketConnectionSocketPropertyInfo = SocketConnectionK
     type AttrGetType SocketConnectionSocketPropertyInfo = Socket
@@ -175,10 +177,14 @@
     attrGet _ = getSocketConnectionSocket
     attrSet _ = undefined
     attrConstruct _ = constructSocketConnectionSocket
+    attrClear _ = undefined
 
 type instance AttributeList SocketConnection = SocketConnectionAttributeList
 type SocketConnectionAttributeList = ('[ '("closed", IOStreamClosedPropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("socket", SocketConnectionSocketPropertyInfo)] :: [(Symbol, *)])
 
+socketConnectionSocket :: AttrLabelProxy "socket"
+socketConnectionSocket = AttrLabelProxy
+
 type instance SignalList SocketConnection = SocketConnectionSignalList
 type SocketConnectionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -186,7 +192,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -228,9 +234,9 @@
 
 -- method SocketConnection::connect_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -239,7 +245,7 @@
     Ptr SocketAddress ->                    -- address : TInterface "Gio" "SocketAddress"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -280,7 +286,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -316,7 +322,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
@@ -350,7 +356,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketAddress"
+-- returnType : Just (TInterface "Gio" "SocketAddress")
 -- throws : True
 -- Skip return : False
 
@@ -384,7 +390,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : False
 -- Skip return : False
 
@@ -413,7 +419,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -439,16 +445,16 @@
 
 -- method SocketConnection::factory_lookup_type
 -- method type : MemberFunction
--- Args : [Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol_id", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol_id", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_connection_factory_lookup_type" g_socket_connection_factory_lookup_type :: 
     CUInt ->                                -- family : TInterface "Gio" "SocketFamily"
     CUInt ->                                -- type : TInterface "Gio" "SocketType"
-    Int32 ->                                -- protocol_id : TBasicType TInt32
+    Int32 ->                                -- protocol_id : TBasicType TInt
     IO CGType
 
 
@@ -467,9 +473,9 @@
 
 -- method SocketConnection::factory_register_type
 -- method type : MemberFunction
--- Args : [Arg {argCName = "g_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "g_type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "family", argType = TInterface "Gio" "SocketFamily", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -477,7 +483,7 @@
     CGType ->                               -- g_type : TBasicType TGType
     CUInt ->                                -- family : TInterface "Gio" "SocketFamily"
     CUInt ->                                -- type : TInterface "Gio" "SocketType"
-    Int32 ->                                -- protocol : TBasicType TInt32
+    Int32 ->                                -- protocol : TBasicType TInt
     IO ()
 
 
diff --git a/GI/Gio/Objects/SocketConnection.hs-boot b/GI/Gio/Objects/SocketConnection.hs-boot
--- a/GI/Gio/Objects/SocketConnection.hs-boot
+++ b/GI/Gio/Objects/SocketConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketControlMessage.hs b/GI/Gio/Objects/SocketControlMessage.hs
--- a/GI/Gio/Objects/SocketControlMessage.hs
+++ b/GI/Gio/Objects/SocketControlMessage.hs
@@ -45,9 +45,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -124,7 +124,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketControlMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -151,7 +151,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketControlMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -178,7 +178,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketControlMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -203,15 +203,15 @@
 
 -- method SocketControlMessage::serialize
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketControlMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketControlMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_control_message_serialize" g_socket_control_message_serialize :: 
     Ptr SocketControlMessage ->             -- _obj : TInterface "Gio" "SocketControlMessage"
-    Ptr () ->                               -- data : TBasicType TVoid
+    Ptr () ->                               -- data : TBasicType TPtr
     IO ()
 
 
@@ -232,15 +232,15 @@
 
 -- method SocketControlMessage::deserialize
 -- method type : MemberFunction
--- Args : [Arg {argCName = "level", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "level", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "SocketControlMessage"
+-- returnType : Just (TInterface "Gio" "SocketControlMessage")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_control_message_deserialize" g_socket_control_message_deserialize :: 
-    Int32 ->                                -- level : TBasicType TInt32
-    Int32 ->                                -- type : TBasicType TInt32
+    Int32 ->                                -- level : TBasicType TInt
+    Int32 ->                                -- type : TBasicType TInt
     Word64 ->                               -- size : TBasicType TUInt64
     Ptr Word8 ->                            -- data : TCArray False (-1) 2 (TBasicType TUInt8)
     IO (Ptr SocketControlMessage)
diff --git a/GI/Gio/Objects/SocketControlMessage.hs-boot b/GI/Gio/Objects/SocketControlMessage.hs-boot
--- a/GI/Gio/Objects/SocketControlMessage.hs-boot
+++ b/GI/Gio/Objects/SocketControlMessage.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketControlMessage where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketListener.hs b/GI/Gio/Objects/SocketListener.hs
--- a/GI/Gio/Objects/SocketListener.hs
+++ b/GI/Gio/Objects/SocketListener.hs
@@ -89,6 +89,7 @@
     constructSocketListenerListenBacklog    ,
     getSocketListenerListenBacklog          ,
     setSocketListenerListenBacklog          ,
+    socketListenerListenBacklog             ,
 
 
 
@@ -110,9 +111,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -234,17 +235,18 @@
     connectSignalFunPtr obj "event" cb' after
 
 -- VVV Prop "listen-backlog"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getSocketListenerListenBacklog :: (MonadIO m, SocketListenerK o) => o -> m Int32
-getSocketListenerListenBacklog obj = liftIO $ getObjectPropertyCInt obj "listen-backlog"
+getSocketListenerListenBacklog obj = liftIO $ getObjectPropertyInt32 obj "listen-backlog"
 
 setSocketListenerListenBacklog :: (MonadIO m, SocketListenerK o) => o -> Int32 -> m ()
-setSocketListenerListenBacklog obj val = liftIO $ setObjectPropertyCInt obj "listen-backlog" val
+setSocketListenerListenBacklog obj val = liftIO $ setObjectPropertyInt32 obj "listen-backlog" val
 
 constructSocketListenerListenBacklog :: Int32 -> IO ([Char], GValue)
-constructSocketListenerListenBacklog val = constructObjectPropertyCInt "listen-backlog" val
+constructSocketListenerListenBacklog val = constructObjectPropertyInt32 "listen-backlog" val
 
 data SocketListenerListenBacklogPropertyInfo
 instance AttrInfo SocketListenerListenBacklogPropertyInfo where
@@ -256,10 +258,14 @@
     attrGet _ = getSocketListenerListenBacklog
     attrSet _ = setSocketListenerListenBacklog
     attrConstruct _ = constructSocketListenerListenBacklog
+    attrClear _ = undefined
 
 type instance AttributeList SocketListener = SocketListenerAttributeList
 type SocketListenerAttributeList = ('[ '("listenBacklog", SocketListenerListenBacklogPropertyInfo)] :: [(Symbol, *)])
 
+socketListenerListenBacklog :: AttrLabelProxy "listenBacklog"
+socketListenerListenBacklog = AttrLabelProxy
+
 data SocketListenerEventSignalInfo
 instance SignalInfo SocketListenerEventSignalInfo where
     type HaskellCallbackType SocketListenerEventSignalInfo = SocketListenerEventCallback
@@ -272,7 +278,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketListener"
+-- returnType : Just (TInterface "Gio" "SocketListener")
 -- throws : False
 -- Skip return : False
 
@@ -293,7 +299,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -338,9 +344,9 @@
 
 -- method SocketListener::accept_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -348,7 +354,7 @@
     Ptr SocketListener ->                   -- _obj : TInterface "Gio" "SocketListener"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -386,7 +392,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketConnection"
+-- returnType : Just (TInterface "Gio" "SocketConnection")
 -- throws : True
 -- Skip return : False
 
@@ -429,7 +435,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : True
 -- Skip return : False
 
@@ -474,9 +480,9 @@
 
 -- method SocketListener::accept_socket_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -484,7 +490,7 @@
     Ptr SocketListener ->                   -- _obj : TInterface "Gio" "SocketListener"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -522,7 +528,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Socket"
+-- returnType : Just (TInterface "Gio" "Socket")
 -- throws : True
 -- Skip return : False
 
@@ -565,7 +571,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "address", argType = TInterface "Gio" "SocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "SocketType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "protocol", argType = TInterface "Gio" "SocketProtocol", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "effective_address", argType = TInterface "Gio" "SocketAddress", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -620,7 +626,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : True
 -- Skip return : False
 
@@ -660,7 +666,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -702,7 +708,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "socket", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -746,7 +752,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -771,15 +777,15 @@
 
 -- method SocketListener::set_backlog
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "listen_backlog", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketListener", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "listen_backlog", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_socket_listener_set_backlog" g_socket_listener_set_backlog :: 
     Ptr SocketListener ->                   -- _obj : TInterface "Gio" "SocketListener"
-    Int32 ->                                -- listen_backlog : TBasicType TInt32
+    Int32 ->                                -- listen_backlog : TBasicType TInt
     IO ()
 
 
diff --git a/GI/Gio/Objects/SocketListener.hs-boot b/GI/Gio/Objects/SocketListener.hs-boot
--- a/GI/Gio/Objects/SocketListener.hs-boot
+++ b/GI/Gio/Objects/SocketListener.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketListener where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SocketService.hs b/GI/Gio/Objects/SocketService.hs
--- a/GI/Gio/Objects/SocketService.hs
+++ b/GI/Gio/Objects/SocketService.hs
@@ -44,6 +44,7 @@
     constructSocketServiceActive            ,
     getSocketServiceActive                  ,
     setSocketServiceActive                  ,
+    socketServiceActive                     ,
 
 
 
@@ -65,9 +66,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -201,6 +202,7 @@
 -- VVV Prop "active"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getSocketServiceActive :: (MonadIO m, SocketServiceK o) => o -> m Bool
 getSocketServiceActive obj = liftIO $ getObjectPropertyBool obj "active"
@@ -221,10 +223,14 @@
     attrGet _ = getSocketServiceActive
     attrSet _ = setSocketServiceActive
     attrConstruct _ = constructSocketServiceActive
+    attrClear _ = undefined
 
 type instance AttributeList SocketService = SocketServiceAttributeList
 type SocketServiceAttributeList = ('[ '("active", SocketServiceActivePropertyInfo), '("listenBacklog", SocketListenerListenBacklogPropertyInfo)] :: [(Symbol, *)])
 
+socketServiceActive :: AttrLabelProxy "active"
+socketServiceActive = AttrLabelProxy
+
 data SocketServiceIncomingSignalInfo
 instance SignalInfo SocketServiceIncomingSignalInfo where
     type HaskellCallbackType SocketServiceIncomingSignalInfo = SocketServiceIncomingCallback
@@ -237,7 +243,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "SocketService"
+-- returnType : Just (TInterface "Gio" "SocketService")
 -- throws : False
 -- Skip return : False
 
@@ -258,7 +264,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -286,7 +292,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -313,7 +319,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SocketService", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SocketService.hs-boot b/GI/Gio/Objects/SocketService.hs-boot
--- a/GI/Gio/Objects/SocketService.hs-boot
+++ b/GI/Gio/Objects/SocketService.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SocketService where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Subprocess.hs b/GI/Gio/Objects/Subprocess.hs
--- a/GI/Gio/Objects/Subprocess.hs
+++ b/GI/Gio/Objects/Subprocess.hs
@@ -147,20 +147,22 @@
 -- ** Argv
     SubprocessArgvPropertyInfo              ,
     constructSubprocessArgv                 ,
+    subprocessArgv                          ,
 
 
 -- ** Flags
     SubprocessFlagsPropertyInfo             ,
     constructSubprocessFlags                ,
+    subprocessFlags                         ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -252,13 +254,14 @@
 -- VVV Prop "argv"
    -- Type: TCArray True (-1) (-1) (TBasicType TUTF8)
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructSubprocessArgv :: [T.Text] -> IO ([Char], GValue)
-constructSubprocessArgv val = constructObjectPropertyStringArray "argv" val
+constructSubprocessArgv val = constructObjectPropertyStringArray "argv" (Just val)
 
 data SubprocessArgvPropertyInfo
 instance AttrInfo SubprocessArgvPropertyInfo where
-    type AttrAllowedOps SubprocessArgvPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps SubprocessArgvPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint SubprocessArgvPropertyInfo = (~) [T.Text]
     type AttrBaseTypeConstraint SubprocessArgvPropertyInfo = SubprocessK
     type AttrGetType SubprocessArgvPropertyInfo = ()
@@ -266,10 +269,12 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructSubprocessArgv
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "SubprocessFlags"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructSubprocessFlags :: [SubprocessFlags] -> IO ([Char], GValue)
 constructSubprocessFlags val = constructObjectPropertyFlags "flags" val
@@ -284,10 +289,17 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructSubprocessFlags
+    attrClear _ = undefined
 
 type instance AttributeList Subprocess = SubprocessAttributeList
 type SubprocessAttributeList = ('[ '("argv", SubprocessArgvPropertyInfo), '("flags", SubprocessFlagsPropertyInfo)] :: [(Symbol, *)])
 
+subprocessArgv :: AttrLabelProxy "argv"
+subprocessArgv = AttrLabelProxy
+
+subprocessFlags :: AttrLabelProxy "flags"
+subprocessFlags = AttrLabelProxy
+
 type instance SignalList Subprocess = SubprocessSignalList
 type SubprocessSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -295,7 +307,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "argv", argType = TCArray True (-1) (-1) (TBasicType TUTF8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "SubprocessFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Subprocess"
+-- returnType : Just (TInterface "Gio" "Subprocess")
 -- throws : True
 -- Skip return : False
 
@@ -330,7 +342,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdout_buf", argType = TInterface "GLib" "Bytes", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "stderr_buf", argType = TInterface "GLib" "Bytes", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -387,9 +399,9 @@
 
 -- method Subprocess::communicate_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -398,7 +410,7 @@
     Ptr GLib.Bytes ->                       -- stdin_buf : TInterface "GLib" "Bytes"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -443,7 +455,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdout_buf", argType = TInterface "GLib" "Bytes", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "stderr_buf", argType = TInterface "GLib" "Bytes", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -490,7 +502,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdout_buf", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "stderr_buf", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -550,9 +562,9 @@
 
 -- method Subprocess::communicate_utf8_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdin_buf", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -561,7 +573,7 @@
     CString ->                              -- stdin_buf : TBasicType TUTF8
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -606,7 +618,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stdout_buf", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "stderr_buf", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -655,7 +667,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -682,7 +694,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -709,7 +721,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -738,7 +750,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -766,7 +778,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -794,7 +806,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -821,7 +833,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : False
 -- Skip return : False
 
@@ -850,7 +862,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "OutputStream"
+-- returnType : Just (TInterface "Gio" "OutputStream")
 -- throws : False
 -- Skip return : False
 
@@ -879,7 +891,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : False
 -- Skip return : False
 
@@ -908,7 +920,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -936,7 +948,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -961,15 +973,15 @@
 
 -- method Subprocess::send_signal
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "signal_num", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "signal_num", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_send_signal" g_subprocess_send_signal :: 
     Ptr Subprocess ->                       -- _obj : TInterface "Gio" "Subprocess"
-    Int32 ->                                -- signal_num : TBasicType TInt32
+    Int32 ->                                -- signal_num : TBasicType TInt
     IO ()
 
 
@@ -992,7 +1004,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1030,9 +1042,9 @@
 
 -- method Subprocess::wait_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1040,7 +1052,7 @@
     Ptr Subprocess ->                       -- _obj : TInterface "Gio" "Subprocess"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1078,7 +1090,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1116,9 +1128,9 @@
 
 -- method Subprocess::wait_check_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1126,7 +1138,7 @@
     Ptr Subprocess ->                       -- _obj : TInterface "Gio" "Subprocess"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -1164,7 +1176,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -1200,7 +1212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Subprocess", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Subprocess.hs-boot b/GI/Gio/Objects/Subprocess.hs-boot
--- a/GI/Gio/Objects/Subprocess.hs-boot
+++ b/GI/Gio/Objects/Subprocess.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Subprocess where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/SubprocessLauncher.hs b/GI/Gio/Objects/SubprocessLauncher.hs
--- a/GI/Gio/Objects/SubprocessLauncher.hs
+++ b/GI/Gio/Objects/SubprocessLauncher.hs
@@ -102,15 +102,16 @@
 -- ** Flags
     SubprocessLauncherFlagsPropertyInfo     ,
     constructSubprocessLauncherFlags        ,
+    subprocessLauncherFlags                 ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -192,6 +193,7 @@
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "SubprocessFlags"
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Just False)
 
 constructSubprocessLauncherFlags :: [SubprocessFlags] -> IO ([Char], GValue)
 constructSubprocessLauncherFlags val = constructObjectPropertyFlags "flags" val
@@ -206,10 +208,14 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructSubprocessLauncherFlags
+    attrClear _ = undefined
 
 type instance AttributeList SubprocessLauncher = SubprocessLauncherAttributeList
 type SubprocessLauncherAttributeList = ('[ '("flags", SubprocessLauncherFlagsPropertyInfo)] :: [(Symbol, *)])
 
+subprocessLauncherFlags :: AttrLabelProxy "flags"
+subprocessLauncherFlags = AttrLabelProxy
+
 type instance SignalList SubprocessLauncher = SubprocessLauncherSignalList
 type SubprocessLauncherSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -217,7 +223,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "flags", argType = TInterface "Gio" "SubprocessFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SubprocessLauncher"
+-- returnType : Just (TInterface "Gio" "SubprocessLauncher")
 -- throws : False
 -- Skip return : False
 
@@ -241,7 +247,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "variable", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -272,16 +278,16 @@
 
 -- method SubprocessLauncher::set_child_setup
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup", argType = TInterface "GLib" "SpawnChildSetupFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup", argType = TInterface "GLib" "SpawnChildSetupFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destroy_notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_launcher_set_child_setup" g_subprocess_launcher_set_child_setup :: 
     Ptr SubprocessLauncher ->               -- _obj : TInterface "Gio" "SubprocessLauncher"
     FunPtr GLib.SpawnChildSetupFuncC ->     -- child_setup : TInterface "GLib" "SpawnChildSetupFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- destroy_notify : TInterface "GLib" "DestroyNotify"
     IO ()
 
@@ -308,7 +314,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cwd", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -339,7 +345,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "env", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -370,7 +376,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "SubprocessFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -400,7 +406,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -431,7 +437,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -462,7 +468,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -493,7 +499,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "variable", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "overwrite", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -531,7 +537,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argv", argType = TCArray True (-1) (-1) (TBasicType TUTF8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Subprocess"
+-- returnType : Just (TInterface "Gio" "Subprocess")
 -- throws : True
 -- Skip return : False
 
@@ -569,16 +575,16 @@
 
 -- method SubprocessLauncher::take_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target_fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "target_fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_launcher_take_fd" g_subprocess_launcher_take_fd :: 
     Ptr SubprocessLauncher ->               -- _obj : TInterface "Gio" "SubprocessLauncher"
-    Int32 ->                                -- source_fd : TBasicType TInt32
-    Int32 ->                                -- target_fd : TBasicType TInt32
+    Int32 ->                                -- source_fd : TBasicType TInt
+    Int32 ->                                -- target_fd : TBasicType TInt
     IO ()
 
 
@@ -600,15 +606,15 @@
 
 -- method SubprocessLauncher::take_stderr_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_launcher_take_stderr_fd" g_subprocess_launcher_take_stderr_fd :: 
     Ptr SubprocessLauncher ->               -- _obj : TInterface "Gio" "SubprocessLauncher"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     IO ()
 
 
@@ -629,15 +635,15 @@
 
 -- method SubprocessLauncher::take_stdin_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_launcher_take_stdin_fd" g_subprocess_launcher_take_stdin_fd :: 
     Ptr SubprocessLauncher ->               -- _obj : TInterface "Gio" "SubprocessLauncher"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     IO ()
 
 
@@ -658,15 +664,15 @@
 
 -- method SubprocessLauncher::take_stdout_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_subprocess_launcher_take_stdout_fd" g_subprocess_launcher_take_stdout_fd :: 
     Ptr SubprocessLauncher ->               -- _obj : TInterface "Gio" "SubprocessLauncher"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     IO ()
 
 
@@ -689,7 +695,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SubprocessLauncher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "variable", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/SubprocessLauncher.hs-boot b/GI/Gio/Objects/SubprocessLauncher.hs-boot
--- a/GI/Gio/Objects/SubprocessLauncher.hs-boot
+++ b/GI/Gio/Objects/SubprocessLauncher.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.SubprocessLauncher where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Task.hs b/GI/Gio/Objects/Task.hs
--- a/GI/Gio/Objects/Task.hs
+++ b/GI/Gio/Objects/Task.hs
@@ -150,15 +150,16 @@
 -- ** Completed
     TaskCompletedPropertyInfo               ,
     getTaskCompleted                        ,
+    taskCompleted                           ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -250,6 +251,7 @@
 -- VVV Prop "completed"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTaskCompleted :: (MonadIO m, TaskK o) => o -> m Bool
 getTaskCompleted obj = liftIO $ getObjectPropertyBool obj "completed"
@@ -264,18 +266,22 @@
     attrGet _ = getTaskCompleted
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList Task = TaskAttributeList
 type TaskAttributeList = ('[ '("completed", TaskCompletedPropertyInfo)] :: [(Symbol, *)])
 
+taskCompleted :: AttrLabelProxy "completed"
+taskCompleted = AttrLabelProxy
+
 type instance SignalList Task = TaskSignalList
 type TaskSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method Task::new
 -- method type : Constructor
--- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Task"
+-- returnType : Just (TInterface "Gio" "Task")
 -- throws : False
 -- Skip return : False
 
@@ -283,7 +289,7 @@
     Ptr GObject.Object ->                   -- source_object : TInterface "GObject" "Object"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- callback_data : TBasicType TVoid
+    Ptr () ->                               -- callback_data : TBasicType TPtr
     IO (Ptr Task)
 
 
@@ -323,7 +329,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Cancellable"
+-- returnType : Just (TInterface "Gio" "Cancellable")
 -- throws : False
 -- Skip return : False
 
@@ -352,7 +358,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -380,7 +386,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -408,7 +414,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "MainContext"
+-- returnType : Just (TInterface "GLib" "MainContext")
 -- throws : False
 -- Skip return : False
 
@@ -437,7 +443,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -464,7 +470,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -492,7 +498,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GObject" "Object"
+-- returnType : Just (TInterface "GObject" "Object")
 -- throws : False
 -- Skip return : False
 
@@ -521,61 +527,61 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_get_source_tag" g_task_get_source_tag :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    IO ()
+    IO (Ptr ())
 
 
 taskGetSourceTag ::
     (MonadIO m, TaskK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 taskGetSourceTag _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    g_task_get_source_tag _obj'
+    result <- g_task_get_source_tag _obj'
     touchManagedPtr _obj
-    return ()
+    return result
 
 data TaskGetSourceTagMethodInfo
-instance (signature ~ (m ()), MonadIO m, TaskK a) => MethodInfo TaskGetSourceTagMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, TaskK a) => MethodInfo TaskGetSourceTagMethodInfo a signature where
     overloadedMethod _ = taskGetSourceTag
 
 -- method Task::get_task_data
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_get_task_data" g_task_get_task_data :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    IO ()
+    IO (Ptr ())
 
 
 taskGetTaskData ::
     (MonadIO m, TaskK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 taskGetTaskData _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    g_task_get_task_data _obj'
+    result <- g_task_get_task_data _obj'
     touchManagedPtr _obj
-    return ()
+    return result
 
 data TaskGetTaskDataMethodInfo
-instance (signature ~ (m ()), MonadIO m, TaskK a) => MethodInfo TaskGetTaskDataMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, TaskK a) => MethodInfo TaskGetTaskDataMethodInfo a signature where
     overloadedMethod _ = taskGetTaskData
 
 -- method Task::had_error
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -603,7 +609,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -635,7 +641,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TInt64)
 -- throws : True
 -- Skip return : False
 
@@ -667,39 +673,39 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Just (TBasicType TPtr)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_task_propagate_pointer" g_task_propagate_pointer :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
     Ptr (Ptr GError) ->                     -- error
-    IO ()
+    IO (Ptr ())
 
 
 taskPropagatePointer ::
     (MonadIO m, TaskK a) =>
     a                                       -- _obj
-    -> m ()                                 -- result
+    -> m (Ptr ())                           -- result
 taskPropagatePointer _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     onException (do
-        propagateGError $ g_task_propagate_pointer _obj'
+        result <- propagateGError $ g_task_propagate_pointer _obj'
         touchManagedPtr _obj
-        return ()
+        return result
      ) (do
         return ()
      )
 
 data TaskPropagatePointerMethodInfo
-instance (signature ~ (m ()), MonadIO m, TaskK a) => MethodInfo TaskPropagatePointerMethodInfo a signature where
+instance (signature ~ (m (Ptr ())), MonadIO m, TaskK a) => MethodInfo TaskPropagatePointerMethodInfo a signature where
     overloadedMethod _ = taskPropagatePointer
 
 -- method Task::return_boolean
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -729,7 +735,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -760,7 +766,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -788,7 +794,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -815,15 +821,15 @@
 
 -- method Task::return_pointer
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "result_destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "result_destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_return_pointer" g_task_return_pointer :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    Ptr () ->                               -- result : TBasicType TVoid
+    Ptr () ->                               -- result : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- result_destroy : TInterface "GLib" "DestroyNotify"
     IO ()
 
@@ -831,15 +837,11 @@
 taskReturnPointer ::
     (MonadIO m, TaskK a) =>
     a                                       -- _obj
-    -> Maybe (Ptr ())                       -- result_
+    -> Ptr ()                               -- result_
     -> Maybe (GLib.DestroyNotify)           -- resultDestroy
     -> m ()                                 -- result
 taskReturnPointer _obj result_ resultDestroy = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    maybeResult_ <- case result_ of
-        Nothing -> return nullPtr
-        Just jResult_ -> do
-            return jResult_
     ptrresultDestroy <- callocMem :: IO (Ptr (FunPtr GLib.DestroyNotifyC))
     maybeResultDestroy <- case resultDestroy of
         Nothing -> return (castPtrToFunPtr nullPtr)
@@ -847,19 +849,19 @@
             jResultDestroy' <- GLib.mkDestroyNotify (GLib.destroyNotifyWrapper (Just ptrresultDestroy) jResultDestroy)
             poke ptrresultDestroy jResultDestroy'
             return jResultDestroy'
-    g_task_return_pointer _obj' maybeResult_ maybeResultDestroy
+    g_task_return_pointer _obj' result_ maybeResultDestroy
     touchManagedPtr _obj
     return ()
 
 data TaskReturnPointerMethodInfo
-instance (signature ~ (Maybe (Ptr ()) -> Maybe (GLib.DestroyNotify) -> m ()), MonadIO m, TaskK a) => MethodInfo TaskReturnPointerMethodInfo a signature where
+instance (signature ~ (Ptr () -> Maybe (GLib.DestroyNotify) -> m ()), MonadIO m, TaskK a) => MethodInfo TaskReturnPointerMethodInfo a signature where
     overloadedMethod _ = taskReturnPointer
 
 -- method Task::set_check_cancellable
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "check_cancellable", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -887,15 +889,15 @@
 
 -- method Task::set_priority
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_set_priority" g_task_set_priority :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    Int32 ->                                -- priority : TBasicType TInt32
+    Int32 ->                                -- priority : TBasicType TInt
     IO ()
 
 
@@ -918,7 +920,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "return_on_cancel", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -947,15 +949,15 @@
 
 -- method Task::set_source_tag
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_set_source_tag" g_task_set_source_tag :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    Ptr () ->                               -- source_tag : TBasicType TVoid
+    Ptr () ->                               -- source_tag : TBasicType TPtr
     IO ()
 
 
@@ -976,15 +978,15 @@
 
 -- method Task::set_task_data
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "task_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "task_data_destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Task", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "task_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "task_data_destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_set_task_data" g_task_set_task_data :: 
     Ptr Task ->                             -- _obj : TInterface "Gio" "Task"
-    Ptr () ->                               -- task_data : TBasicType TVoid
+    Ptr () ->                               -- task_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- task_data_destroy : TInterface "GLib" "DestroyNotify"
     IO ()
 
@@ -992,15 +994,11 @@
 taskSetTaskData ::
     (MonadIO m, TaskK a) =>
     a                                       -- _obj
-    -> Maybe (Ptr ())                       -- taskData
+    -> Ptr ()                               -- taskData
     -> Maybe (GLib.DestroyNotify)           -- taskDataDestroy
     -> m ()                                 -- result
 taskSetTaskData _obj taskData taskDataDestroy = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    maybeTaskData <- case taskData of
-        Nothing -> return nullPtr
-        Just jTaskData -> do
-            return jTaskData
     ptrtaskDataDestroy <- callocMem :: IO (Ptr (FunPtr GLib.DestroyNotifyC))
     maybeTaskDataDestroy <- case taskDataDestroy of
         Nothing -> return (castPtrToFunPtr nullPtr)
@@ -1008,19 +1006,19 @@
             jTaskDataDestroy' <- GLib.mkDestroyNotify (GLib.destroyNotifyWrapper (Just ptrtaskDataDestroy) jTaskDataDestroy)
             poke ptrtaskDataDestroy jTaskDataDestroy'
             return jTaskDataDestroy'
-    g_task_set_task_data _obj' maybeTaskData maybeTaskDataDestroy
+    g_task_set_task_data _obj' taskData maybeTaskDataDestroy
     touchManagedPtr _obj
     return ()
 
 data TaskSetTaskDataMethodInfo
-instance (signature ~ (Maybe (Ptr ()) -> Maybe (GLib.DestroyNotify) -> m ()), MonadIO m, TaskK a) => MethodInfo TaskSetTaskDataMethodInfo a signature where
+instance (signature ~ (Ptr () -> Maybe (GLib.DestroyNotify) -> m ()), MonadIO m, TaskK a) => MethodInfo TaskSetTaskDataMethodInfo a signature where
     overloadedMethod _ = taskSetTaskData
 
 -- method Task::is_valid
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -1050,17 +1048,17 @@
 
 -- method Task::report_error
 -- method type : MemberFunction
--- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "source_object", argType = TInterface "GObject" "Object", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "source_tag", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "error", argType = TError, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_task_report_error" g_task_report_error :: 
     Ptr GObject.Object ->                   -- source_object : TInterface "GObject" "Object"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- callback_data : TBasicType TVoid
-    Ptr () ->                               -- source_tag : TBasicType TVoid
+    Ptr () ->                               -- callback_data : TBasicType TPtr
+    Ptr () ->                               -- source_tag : TBasicType TPtr
     Ptr GError ->                           -- error : TError
     IO ()
 
diff --git a/GI/Gio/Objects/Task.hs-boot b/GI/Gio/Objects/Task.hs-boot
--- a/GI/Gio/Objects/Task.hs-boot
+++ b/GI/Gio/Objects/Task.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Task where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TcpConnection.hs b/GI/Gio/Objects/TcpConnection.hs
--- a/GI/Gio/Objects/TcpConnection.hs
+++ b/GI/Gio/Objects/TcpConnection.hs
@@ -35,15 +35,16 @@
     constructTcpConnectionGracefulDisconnect,
     getTcpConnectionGracefulDisconnect      ,
     setTcpConnectionGracefulDisconnect      ,
+    tcpConnectionGracefulDisconnect         ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -128,6 +129,7 @@
 -- VVV Prop "graceful-disconnect"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTcpConnectionGracefulDisconnect :: (MonadIO m, TcpConnectionK o) => o -> m Bool
 getTcpConnectionGracefulDisconnect obj = liftIO $ getObjectPropertyBool obj "graceful-disconnect"
@@ -148,10 +150,14 @@
     attrGet _ = getTcpConnectionGracefulDisconnect
     attrSet _ = setTcpConnectionGracefulDisconnect
     attrConstruct _ = constructTcpConnectionGracefulDisconnect
+    attrClear _ = undefined
 
 type instance AttributeList TcpConnection = TcpConnectionAttributeList
 type TcpConnectionAttributeList = ('[ '("closed", IOStreamClosedPropertyInfo), '("gracefulDisconnect", TcpConnectionGracefulDisconnectPropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("socket", SocketConnectionSocketPropertyInfo)] :: [(Symbol, *)])
 
+tcpConnectionGracefulDisconnect :: AttrLabelProxy "gracefulDisconnect"
+tcpConnectionGracefulDisconnect = AttrLabelProxy
+
 type instance SignalList TcpConnection = TcpConnectionSignalList
 type TcpConnectionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -159,7 +165,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TcpConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -187,7 +193,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TcpConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "graceful_disconnect", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TcpConnection.hs-boot b/GI/Gio/Objects/TcpConnection.hs-boot
--- a/GI/Gio/Objects/TcpConnection.hs-boot
+++ b/GI/Gio/Objects/TcpConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TcpConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TcpWrapperConnection.hs b/GI/Gio/Objects/TcpWrapperConnection.hs
--- a/GI/Gio/Objects/TcpWrapperConnection.hs
+++ b/GI/Gio/Objects/TcpWrapperConnection.hs
@@ -33,15 +33,16 @@
     TcpWrapperConnectionBaseIoStreamPropertyInfo,
     constructTcpWrapperConnectionBaseIoStream,
     getTcpWrapperConnectionBaseIoStream     ,
+    tcpWrapperConnectionBaseIoStream        ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -127,16 +128,17 @@
 -- VVV Prop "base-io-stream"
    -- Type: TInterface "Gio" "IOStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getTcpWrapperConnectionBaseIoStream :: (MonadIO m, TcpWrapperConnectionK o) => o -> m IOStream
-getTcpWrapperConnectionBaseIoStream obj = liftIO $ getObjectPropertyObject obj "base-io-stream" IOStream
+getTcpWrapperConnectionBaseIoStream obj = liftIO $ checkUnexpectedNothing "getTcpWrapperConnectionBaseIoStream" $ getObjectPropertyObject obj "base-io-stream" IOStream
 
 constructTcpWrapperConnectionBaseIoStream :: (IOStreamK a) => a -> IO ([Char], GValue)
-constructTcpWrapperConnectionBaseIoStream val = constructObjectPropertyObject "base-io-stream" val
+constructTcpWrapperConnectionBaseIoStream val = constructObjectPropertyObject "base-io-stream" (Just val)
 
 data TcpWrapperConnectionBaseIoStreamPropertyInfo
 instance AttrInfo TcpWrapperConnectionBaseIoStreamPropertyInfo where
-    type AttrAllowedOps TcpWrapperConnectionBaseIoStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TcpWrapperConnectionBaseIoStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TcpWrapperConnectionBaseIoStreamPropertyInfo = IOStreamK
     type AttrBaseTypeConstraint TcpWrapperConnectionBaseIoStreamPropertyInfo = TcpWrapperConnectionK
     type AttrGetType TcpWrapperConnectionBaseIoStreamPropertyInfo = IOStream
@@ -144,10 +146,14 @@
     attrGet _ = getTcpWrapperConnectionBaseIoStream
     attrSet _ = undefined
     attrConstruct _ = constructTcpWrapperConnectionBaseIoStream
+    attrClear _ = undefined
 
 type instance AttributeList TcpWrapperConnection = TcpWrapperConnectionAttributeList
 type TcpWrapperConnectionAttributeList = ('[ '("baseIoStream", TcpWrapperConnectionBaseIoStreamPropertyInfo), '("closed", IOStreamClosedPropertyInfo), '("gracefulDisconnect", TcpConnectionGracefulDisconnectPropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("socket", SocketConnectionSocketPropertyInfo)] :: [(Symbol, *)])
 
+tcpWrapperConnectionBaseIoStream :: AttrLabelProxy "baseIoStream"
+tcpWrapperConnectionBaseIoStream = AttrLabelProxy
+
 type instance SignalList TcpWrapperConnection = TcpWrapperConnectionSignalList
 type TcpWrapperConnectionSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -155,7 +161,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "base_io_stream", argType = TInterface "Gio" "IOStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "socket", argType = TInterface "Gio" "Socket", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TcpWrapperConnection"
+-- returnType : Just (TInterface "Gio" "TcpWrapperConnection")
 -- throws : False
 -- Skip return : False
 
@@ -184,7 +190,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TcpWrapperConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOStream"
+-- returnType : Just (TInterface "Gio" "IOStream")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TcpWrapperConnection.hs-boot b/GI/Gio/Objects/TcpWrapperConnection.hs-boot
--- a/GI/Gio/Objects/TcpWrapperConnection.hs-boot
+++ b/GI/Gio/Objects/TcpWrapperConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TcpWrapperConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TestDBus.hs b/GI/Gio/Objects/TestDBus.hs
--- a/GI/Gio/Objects/TestDBus.hs
+++ b/GI/Gio/Objects/TestDBus.hs
@@ -62,15 +62,16 @@
     TestDBusFlagsPropertyInfo               ,
     constructTestDBusFlags                  ,
     getTestDBusFlags                        ,
+    testDBusFlags                           ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,6 +143,7 @@
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "TestDBusFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getTestDBusFlags :: (MonadIO m, TestDBusK o) => o -> m [TestDBusFlags]
 getTestDBusFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -159,10 +161,14 @@
     attrGet _ = getTestDBusFlags
     attrSet _ = undefined
     attrConstruct _ = constructTestDBusFlags
+    attrClear _ = undefined
 
 type instance AttributeList TestDBus = TestDBusAttributeList
 type TestDBusAttributeList = ('[ '("flags", TestDBusFlagsPropertyInfo)] :: [(Symbol, *)])
 
+testDBusFlags :: AttrLabelProxy "flags"
+testDBusFlags = AttrLabelProxy
+
 type instance SignalList TestDBus = TestDBusSignalList
 type TestDBusSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -170,7 +176,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "flags", argType = TInterface "Gio" "TestDBusFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TestDBus"
+-- returnType : Just (TInterface "Gio" "TestDBus")
 -- throws : False
 -- Skip return : False
 
@@ -194,7 +200,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -225,7 +231,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -252,7 +258,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -281,7 +287,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TestDBusFlags"
+-- returnType : Just (TInterface "Gio" "TestDBusFlags")
 -- throws : False
 -- Skip return : False
 
@@ -309,7 +315,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -336,7 +342,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TestDBus", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -363,7 +369,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TestDBus.hs-boot b/GI/Gio/Objects/TestDBus.hs-boot
--- a/GI/Gio/Objects/TestDBus.hs-boot
+++ b/GI/Gio/Objects/TestDBus.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TestDBus where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ThemedIcon.hs b/GI/Gio/Objects/ThemedIcon.hs
--- a/GI/Gio/Objects/ThemedIcon.hs
+++ b/GI/Gio/Objects/ThemedIcon.hs
@@ -50,27 +50,30 @@
 -- ** Name
     ThemedIconNamePropertyInfo              ,
     constructThemedIconName                 ,
+    themedIconName                          ,
 
 
 -- ** Names
     ThemedIconNamesPropertyInfo             ,
     constructThemedIconNames                ,
     getThemedIconNames                      ,
+    themedIconNames                         ,
 
 
 -- ** UseDefaultFallbacks
     ThemedIconUseDefaultFallbacksPropertyInfo,
     constructThemedIconUseDefaultFallbacks  ,
     getThemedIconUseDefaultFallbacks        ,
+    themedIconUseDefaultFallbacks           ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,13 +145,14 @@
 -- VVV Prop "name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructThemedIconName :: T.Text -> IO ([Char], GValue)
-constructThemedIconName val = constructObjectPropertyString "name" val
+constructThemedIconName val = constructObjectPropertyString "name" (Just val)
 
 data ThemedIconNamePropertyInfo
 instance AttrInfo ThemedIconNamePropertyInfo where
-    type AttrAllowedOps ThemedIconNamePropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps ThemedIconNamePropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint ThemedIconNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint ThemedIconNamePropertyInfo = ThemedIconK
     type AttrGetType ThemedIconNamePropertyInfo = ()
@@ -156,20 +160,22 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructThemedIconName
+    attrClear _ = undefined
 
 -- VVV Prop "names"
    -- Type: TCArray True (-1) (-1) (TBasicType TUTF8)
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getThemedIconNames :: (MonadIO m, ThemedIconK o) => o -> m [T.Text]
-getThemedIconNames obj = liftIO $ getObjectPropertyStringArray obj "names"
+getThemedIconNames obj = liftIO $ checkUnexpectedNothing "getThemedIconNames" $ getObjectPropertyStringArray obj "names"
 
 constructThemedIconNames :: [T.Text] -> IO ([Char], GValue)
-constructThemedIconNames val = constructObjectPropertyStringArray "names" val
+constructThemedIconNames val = constructObjectPropertyStringArray "names" (Just val)
 
 data ThemedIconNamesPropertyInfo
 instance AttrInfo ThemedIconNamesPropertyInfo where
-    type AttrAllowedOps ThemedIconNamesPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ThemedIconNamesPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ThemedIconNamesPropertyInfo = (~) [T.Text]
     type AttrBaseTypeConstraint ThemedIconNamesPropertyInfo = ThemedIconK
     type AttrGetType ThemedIconNamesPropertyInfo = [T.Text]
@@ -177,10 +183,12 @@
     attrGet _ = getThemedIconNames
     attrSet _ = undefined
     attrConstruct _ = constructThemedIconNames
+    attrClear _ = undefined
 
 -- VVV Prop "use-default-fallbacks"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getThemedIconUseDefaultFallbacks :: (MonadIO m, ThemedIconK o) => o -> m Bool
 getThemedIconUseDefaultFallbacks obj = liftIO $ getObjectPropertyBool obj "use-default-fallbacks"
@@ -198,10 +206,20 @@
     attrGet _ = getThemedIconUseDefaultFallbacks
     attrSet _ = undefined
     attrConstruct _ = constructThemedIconUseDefaultFallbacks
+    attrClear _ = undefined
 
 type instance AttributeList ThemedIcon = ThemedIconAttributeList
 type ThemedIconAttributeList = ('[ '("name", ThemedIconNamePropertyInfo), '("names", ThemedIconNamesPropertyInfo), '("useDefaultFallbacks", ThemedIconUseDefaultFallbacksPropertyInfo)] :: [(Symbol, *)])
 
+themedIconName :: AttrLabelProxy "name"
+themedIconName = AttrLabelProxy
+
+themedIconNames :: AttrLabelProxy "names"
+themedIconNames = AttrLabelProxy
+
+themedIconUseDefaultFallbacks :: AttrLabelProxy "useDefaultFallbacks"
+themedIconUseDefaultFallbacks = AttrLabelProxy
+
 type instance SignalList ThemedIcon = ThemedIconSignalList
 type ThemedIconSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -209,7 +227,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "iconname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ThemedIcon"
+-- returnType : Just (TInterface "Gio" "ThemedIcon")
 -- throws : False
 -- Skip return : False
 
@@ -232,15 +250,15 @@
 
 -- method ThemedIcon::new_from_names
 -- method type : Constructor
--- Args : [Arg {argCName = "iconnames", argType = TCArray False (-1) 1 (TBasicType TUTF8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "ThemedIcon"
+-- Args : [Arg {argCName = "iconnames", argType = TCArray False (-1) 1 (TBasicType TUTF8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TInterface "Gio" "ThemedIcon")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_themed_icon_new_from_names" g_themed_icon_new_from_names :: 
     Ptr CString ->                          -- iconnames : TCArray False (-1) 1 (TBasicType TUTF8)
-    Int32 ->                                -- len : TBasicType TInt32
+    Int32 ->                                -- len : TBasicType TInt
     IO (Ptr ThemedIcon)
 
 
@@ -262,7 +280,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "iconname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ThemedIcon"
+-- returnType : Just (TInterface "Gio" "ThemedIcon")
 -- throws : False
 -- Skip return : False
 
@@ -287,7 +305,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ThemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "iconname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -318,7 +336,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ThemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -347,7 +365,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ThemedIcon", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "iconname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ThemedIcon.hs-boot b/GI/Gio/Objects/ThemedIcon.hs-boot
--- a/GI/Gio/Objects/ThemedIcon.hs-boot
+++ b/GI/Gio/Objects/ThemedIcon.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ThemedIcon where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ThreadedSocketService.hs b/GI/Gio/Objects/ThreadedSocketService.hs
--- a/GI/Gio/Objects/ThreadedSocketService.hs
+++ b/GI/Gio/Objects/ThreadedSocketService.hs
@@ -28,6 +28,7 @@
     ThreadedSocketServiceMaxThreadsPropertyInfo,
     constructThreadedSocketServiceMaxThreads,
     getThreadedSocketServiceMaxThreads      ,
+    threadedSocketServiceMaxThreads         ,
 
 
 
@@ -49,9 +50,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -178,14 +179,15 @@
     connectSignalFunPtr obj "run" cb' after
 
 -- VVV Prop "max-threads"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getThreadedSocketServiceMaxThreads :: (MonadIO m, ThreadedSocketServiceK o) => o -> m Int32
-getThreadedSocketServiceMaxThreads obj = liftIO $ getObjectPropertyCInt obj "max-threads"
+getThreadedSocketServiceMaxThreads obj = liftIO $ getObjectPropertyInt32 obj "max-threads"
 
 constructThreadedSocketServiceMaxThreads :: Int32 -> IO ([Char], GValue)
-constructThreadedSocketServiceMaxThreads val = constructObjectPropertyCInt "max-threads" val
+constructThreadedSocketServiceMaxThreads val = constructObjectPropertyInt32 "max-threads" val
 
 data ThreadedSocketServiceMaxThreadsPropertyInfo
 instance AttrInfo ThreadedSocketServiceMaxThreadsPropertyInfo where
@@ -197,10 +199,14 @@
     attrGet _ = getThreadedSocketServiceMaxThreads
     attrSet _ = undefined
     attrConstruct _ = constructThreadedSocketServiceMaxThreads
+    attrClear _ = undefined
 
 type instance AttributeList ThreadedSocketService = ThreadedSocketServiceAttributeList
 type ThreadedSocketServiceAttributeList = ('[ '("active", SocketServiceActivePropertyInfo), '("listenBacklog", SocketListenerListenBacklogPropertyInfo), '("maxThreads", ThreadedSocketServiceMaxThreadsPropertyInfo)] :: [(Symbol, *)])
 
+threadedSocketServiceMaxThreads :: AttrLabelProxy "maxThreads"
+threadedSocketServiceMaxThreads = AttrLabelProxy
+
 data ThreadedSocketServiceRunSignalInfo
 instance SignalInfo ThreadedSocketServiceRunSignalInfo where
     type HaskellCallbackType ThreadedSocketServiceRunSignalInfo = ThreadedSocketServiceRunCallback
@@ -211,14 +217,14 @@
 
 -- method ThreadedSocketService::new
 -- method type : Constructor
--- Args : [Arg {argCName = "max_threads", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "max_threads", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ThreadedSocketService"
+-- returnType : Just (TInterface "Gio" "ThreadedSocketService")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_threaded_socket_service_new" g_threaded_socket_service_new :: 
-    Int32 ->                                -- max_threads : TBasicType TInt32
+    Int32 ->                                -- max_threads : TBasicType TInt
     IO (Ptr ThreadedSocketService)
 
 
diff --git a/GI/Gio/Objects/ThreadedSocketService.hs-boot b/GI/Gio/Objects/ThreadedSocketService.hs-boot
--- a/GI/Gio/Objects/ThreadedSocketService.hs-boot
+++ b/GI/Gio/Objects/ThreadedSocketService.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ThreadedSocketService where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TlsCertificate.hs b/GI/Gio/Objects/TlsCertificate.hs
--- a/GI/Gio/Objects/TlsCertificate.hs
+++ b/GI/Gio/Objects/TlsCertificate.hs
@@ -55,37 +55,42 @@
     TlsCertificateCertificatePropertyInfo   ,
     constructTlsCertificateCertificate      ,
     getTlsCertificateCertificate            ,
+    tlsCertificateCertificate               ,
 
 
 -- ** CertificatePem
     TlsCertificateCertificatePemPropertyInfo,
     constructTlsCertificateCertificatePem   ,
     getTlsCertificateCertificatePem         ,
+    tlsCertificateCertificatePem            ,
 
 
 -- ** Issuer
     TlsCertificateIssuerPropertyInfo        ,
     constructTlsCertificateIssuer           ,
     getTlsCertificateIssuer                 ,
+    tlsCertificateIssuer                    ,
 
 
 -- ** PrivateKey
     TlsCertificatePrivateKeyPropertyInfo    ,
     constructTlsCertificatePrivateKey       ,
+    tlsCertificatePrivateKey                ,
 
 
 -- ** PrivateKeyPem
     TlsCertificatePrivateKeyPemPropertyInfo ,
     constructTlsCertificatePrivateKeyPem    ,
+    tlsCertificatePrivateKeyPem             ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -154,58 +159,63 @@
 -- VVV Prop "certificate"
    -- Type: TByteArray
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getTlsCertificateCertificate :: (MonadIO m, TlsCertificateK o) => o -> m ByteString
+getTlsCertificateCertificate :: (MonadIO m, TlsCertificateK o) => o -> m (Maybe ByteString)
 getTlsCertificateCertificate obj = liftIO $ getObjectPropertyByteArray obj "certificate"
 
 constructTlsCertificateCertificate :: ByteString -> IO ([Char], GValue)
-constructTlsCertificateCertificate val = constructObjectPropertyByteArray "certificate" val
+constructTlsCertificateCertificate val = constructObjectPropertyByteArray "certificate" (Just val)
 
 data TlsCertificateCertificatePropertyInfo
 instance AttrInfo TlsCertificateCertificatePropertyInfo where
-    type AttrAllowedOps TlsCertificateCertificatePropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsCertificateCertificatePropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsCertificateCertificatePropertyInfo = (~) ByteString
     type AttrBaseTypeConstraint TlsCertificateCertificatePropertyInfo = TlsCertificateK
-    type AttrGetType TlsCertificateCertificatePropertyInfo = ByteString
+    type AttrGetType TlsCertificateCertificatePropertyInfo = (Maybe ByteString)
     type AttrLabel TlsCertificateCertificatePropertyInfo = "certificate"
     attrGet _ = getTlsCertificateCertificate
     attrSet _ = undefined
     attrConstruct _ = constructTlsCertificateCertificate
+    attrClear _ = undefined
 
 -- VVV Prop "certificate-pem"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getTlsCertificateCertificatePem :: (MonadIO m, TlsCertificateK o) => o -> m T.Text
+getTlsCertificateCertificatePem :: (MonadIO m, TlsCertificateK o) => o -> m (Maybe T.Text)
 getTlsCertificateCertificatePem obj = liftIO $ getObjectPropertyString obj "certificate-pem"
 
 constructTlsCertificateCertificatePem :: T.Text -> IO ([Char], GValue)
-constructTlsCertificateCertificatePem val = constructObjectPropertyString "certificate-pem" val
+constructTlsCertificateCertificatePem val = constructObjectPropertyString "certificate-pem" (Just val)
 
 data TlsCertificateCertificatePemPropertyInfo
 instance AttrInfo TlsCertificateCertificatePemPropertyInfo where
-    type AttrAllowedOps TlsCertificateCertificatePemPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsCertificateCertificatePemPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsCertificateCertificatePemPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint TlsCertificateCertificatePemPropertyInfo = TlsCertificateK
-    type AttrGetType TlsCertificateCertificatePemPropertyInfo = T.Text
+    type AttrGetType TlsCertificateCertificatePemPropertyInfo = (Maybe T.Text)
     type AttrLabel TlsCertificateCertificatePemPropertyInfo = "certificate-pem"
     attrGet _ = getTlsCertificateCertificatePem
     attrSet _ = undefined
     attrConstruct _ = constructTlsCertificateCertificatePem
+    attrClear _ = undefined
 
 -- VVV Prop "issuer"
    -- Type: TInterface "Gio" "TlsCertificate"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getTlsCertificateIssuer :: (MonadIO m, TlsCertificateK o) => o -> m TlsCertificate
-getTlsCertificateIssuer obj = liftIO $ getObjectPropertyObject obj "issuer" TlsCertificate
+getTlsCertificateIssuer obj = liftIO $ checkUnexpectedNothing "getTlsCertificateIssuer" $ getObjectPropertyObject obj "issuer" TlsCertificate
 
 constructTlsCertificateIssuer :: (TlsCertificateK a) => a -> IO ([Char], GValue)
-constructTlsCertificateIssuer val = constructObjectPropertyObject "issuer" val
+constructTlsCertificateIssuer val = constructObjectPropertyObject "issuer" (Just val)
 
 data TlsCertificateIssuerPropertyInfo
 instance AttrInfo TlsCertificateIssuerPropertyInfo where
-    type AttrAllowedOps TlsCertificateIssuerPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsCertificateIssuerPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsCertificateIssuerPropertyInfo = TlsCertificateK
     type AttrBaseTypeConstraint TlsCertificateIssuerPropertyInfo = TlsCertificateK
     type AttrGetType TlsCertificateIssuerPropertyInfo = TlsCertificate
@@ -213,17 +223,19 @@
     attrGet _ = getTlsCertificateIssuer
     attrSet _ = undefined
     attrConstruct _ = constructTlsCertificateIssuer
+    attrClear _ = undefined
 
 -- VVV Prop "private-key"
    -- Type: TByteArray
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructTlsCertificatePrivateKey :: ByteString -> IO ([Char], GValue)
-constructTlsCertificatePrivateKey val = constructObjectPropertyByteArray "private-key" val
+constructTlsCertificatePrivateKey val = constructObjectPropertyByteArray "private-key" (Just val)
 
 data TlsCertificatePrivateKeyPropertyInfo
 instance AttrInfo TlsCertificatePrivateKeyPropertyInfo where
-    type AttrAllowedOps TlsCertificatePrivateKeyPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps TlsCertificatePrivateKeyPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint TlsCertificatePrivateKeyPropertyInfo = (~) ByteString
     type AttrBaseTypeConstraint TlsCertificatePrivateKeyPropertyInfo = TlsCertificateK
     type AttrGetType TlsCertificatePrivateKeyPropertyInfo = ()
@@ -231,17 +243,19 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructTlsCertificatePrivateKey
+    attrClear _ = undefined
 
 -- VVV Prop "private-key-pem"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 constructTlsCertificatePrivateKeyPem :: T.Text -> IO ([Char], GValue)
-constructTlsCertificatePrivateKeyPem val = constructObjectPropertyString "private-key-pem" val
+constructTlsCertificatePrivateKeyPem val = constructObjectPropertyString "private-key-pem" (Just val)
 
 data TlsCertificatePrivateKeyPemPropertyInfo
 instance AttrInfo TlsCertificatePrivateKeyPemPropertyInfo where
-    type AttrAllowedOps TlsCertificatePrivateKeyPemPropertyInfo = '[ 'AttrConstruct]
+    type AttrAllowedOps TlsCertificatePrivateKeyPemPropertyInfo = '[ 'AttrConstruct, 'AttrClear]
     type AttrSetTypeConstraint TlsCertificatePrivateKeyPemPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint TlsCertificatePrivateKeyPemPropertyInfo = TlsCertificateK
     type AttrGetType TlsCertificatePrivateKeyPemPropertyInfo = ()
@@ -249,10 +263,26 @@
     attrGet _ = undefined
     attrSet _ = undefined
     attrConstruct _ = constructTlsCertificatePrivateKeyPem
+    attrClear _ = undefined
 
 type instance AttributeList TlsCertificate = TlsCertificateAttributeList
 type TlsCertificateAttributeList = ('[ '("certificate", TlsCertificateCertificatePropertyInfo), '("certificatePem", TlsCertificateCertificatePemPropertyInfo), '("issuer", TlsCertificateIssuerPropertyInfo), '("privateKey", TlsCertificatePrivateKeyPropertyInfo), '("privateKeyPem", TlsCertificatePrivateKeyPemPropertyInfo)] :: [(Symbol, *)])
 
+tlsCertificateCertificate :: AttrLabelProxy "certificate"
+tlsCertificateCertificate = AttrLabelProxy
+
+tlsCertificateCertificatePem :: AttrLabelProxy "certificatePem"
+tlsCertificateCertificatePem = AttrLabelProxy
+
+tlsCertificateIssuer :: AttrLabelProxy "issuer"
+tlsCertificateIssuer = AttrLabelProxy
+
+tlsCertificatePrivateKey :: AttrLabelProxy "privateKey"
+tlsCertificatePrivateKey = AttrLabelProxy
+
+tlsCertificatePrivateKeyPem :: AttrLabelProxy "privateKeyPem"
+tlsCertificatePrivateKeyPem = AttrLabelProxy
+
 type instance SignalList TlsCertificate = TlsCertificateSignalList
 type TlsCertificateSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -260,7 +290,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "file", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -290,7 +320,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "cert_file", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "key_file", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -325,7 +355,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "data", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -357,7 +387,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : False
 -- Skip return : False
 
@@ -386,7 +416,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cert_two", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -418,7 +448,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "trusted_ca", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : False
 -- Skip return : False
 
@@ -462,7 +492,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "file", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "TlsCertificate")
+-- returnType : Just (TGList (TInterface "Gio" "TlsCertificate"))
 -- throws : True
 -- Skip return : False
 
@@ -480,7 +510,6 @@
     file' <- textToCString file
     onException (do
         result <- propagateGError $ g_tls_certificate_list_new_from_file file'
-        checkUnexpectedReturnNULL "g_tls_certificate_list_new_from_file" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject TlsCertificate) result'
         g_list_free result
diff --git a/GI/Gio/Objects/TlsCertificate.hs-boot b/GI/Gio/Objects/TlsCertificate.hs-boot
--- a/GI/Gio/Objects/TlsCertificate.hs-boot
+++ b/GI/Gio/Objects/TlsCertificate.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TlsCertificate where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TlsConnection.hs b/GI/Gio/Objects/TlsConnection.hs
--- a/GI/Gio/Objects/TlsConnection.hs
+++ b/GI/Gio/Objects/TlsConnection.hs
@@ -114,6 +114,7 @@
     TlsConnectionBaseIoStreamPropertyInfo   ,
     constructTlsConnectionBaseIoStream      ,
     getTlsConnectionBaseIoStream            ,
+    tlsConnectionBaseIoStream               ,
 
 
 -- ** Certificate
@@ -121,6 +122,7 @@
     constructTlsConnectionCertificate       ,
     getTlsConnectionCertificate             ,
     setTlsConnectionCertificate             ,
+    tlsConnectionCertificate                ,
 
 
 -- ** Database
@@ -128,23 +130,28 @@
     constructTlsConnectionDatabase          ,
     getTlsConnectionDatabase                ,
     setTlsConnectionDatabase                ,
+    tlsConnectionDatabase                   ,
 
 
 -- ** Interaction
     TlsConnectionInteractionPropertyInfo    ,
+    clearTlsConnectionInteraction           ,
     constructTlsConnectionInteraction       ,
     getTlsConnectionInteraction             ,
     setTlsConnectionInteraction             ,
+    tlsConnectionInteraction                ,
 
 
 -- ** PeerCertificate
     TlsConnectionPeerCertificatePropertyInfo,
     getTlsConnectionPeerCertificate         ,
+    tlsConnectionPeerCertificate            ,
 
 
 -- ** PeerCertificateErrors
     TlsConnectionPeerCertificateErrorsPropertyInfo,
     getTlsConnectionPeerCertificateErrors   ,
+    tlsConnectionPeerCertificateErrors      ,
 
 
 -- ** RehandshakeMode
@@ -152,6 +159,7 @@
     constructTlsConnectionRehandshakeMode   ,
     getTlsConnectionRehandshakeMode         ,
     setTlsConnectionRehandshakeMode         ,
+    tlsConnectionRehandshakeMode            ,
 
 
 -- ** RequireCloseNotify
@@ -159,6 +167,7 @@
     constructTlsConnectionRequireCloseNotify,
     getTlsConnectionRequireCloseNotify      ,
     setTlsConnectionRequireCloseNotify      ,
+    tlsConnectionRequireCloseNotify         ,
 
 
 -- ** UseSystemCertdb
@@ -166,6 +175,7 @@
     constructTlsConnectionUseSystemCertdb   ,
     getTlsConnectionUseSystemCertdb         ,
     setTlsConnectionUseSystemCertdb         ,
+    tlsConnectionUseSystemCertdb            ,
 
 
 
@@ -187,9 +197,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -331,36 +341,39 @@
 -- VVV Prop "base-io-stream"
    -- Type: TInterface "Gio" "IOStream"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getTlsConnectionBaseIoStream :: (MonadIO m, TlsConnectionK o) => o -> m IOStream
+getTlsConnectionBaseIoStream :: (MonadIO m, TlsConnectionK o) => o -> m (Maybe IOStream)
 getTlsConnectionBaseIoStream obj = liftIO $ getObjectPropertyObject obj "base-io-stream" IOStream
 
 constructTlsConnectionBaseIoStream :: (IOStreamK a) => a -> IO ([Char], GValue)
-constructTlsConnectionBaseIoStream val = constructObjectPropertyObject "base-io-stream" val
+constructTlsConnectionBaseIoStream val = constructObjectPropertyObject "base-io-stream" (Just val)
 
 data TlsConnectionBaseIoStreamPropertyInfo
 instance AttrInfo TlsConnectionBaseIoStreamPropertyInfo where
-    type AttrAllowedOps TlsConnectionBaseIoStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsConnectionBaseIoStreamPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsConnectionBaseIoStreamPropertyInfo = IOStreamK
     type AttrBaseTypeConstraint TlsConnectionBaseIoStreamPropertyInfo = TlsConnectionK
-    type AttrGetType TlsConnectionBaseIoStreamPropertyInfo = IOStream
+    type AttrGetType TlsConnectionBaseIoStreamPropertyInfo = (Maybe IOStream)
     type AttrLabel TlsConnectionBaseIoStreamPropertyInfo = "base-io-stream"
     attrGet _ = getTlsConnectionBaseIoStream
     attrSet _ = undefined
     attrConstruct _ = constructTlsConnectionBaseIoStream
+    attrClear _ = undefined
 
 -- VVV Prop "certificate"
    -- Type: TInterface "Gio" "TlsCertificate"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTlsConnectionCertificate :: (MonadIO m, TlsConnectionK o) => o -> m TlsCertificate
-getTlsConnectionCertificate obj = liftIO $ getObjectPropertyObject obj "certificate" TlsCertificate
+getTlsConnectionCertificate obj = liftIO $ checkUnexpectedNothing "getTlsConnectionCertificate" $ getObjectPropertyObject obj "certificate" TlsCertificate
 
 setTlsConnectionCertificate :: (MonadIO m, TlsConnectionK o, TlsCertificateK a) => o -> a -> m ()
-setTlsConnectionCertificate obj val = liftIO $ setObjectPropertyObject obj "certificate" val
+setTlsConnectionCertificate obj val = liftIO $ setObjectPropertyObject obj "certificate" (Just val)
 
 constructTlsConnectionCertificate :: (TlsCertificateK a) => a -> IO ([Char], GValue)
-constructTlsConnectionCertificate val = constructObjectPropertyObject "certificate" val
+constructTlsConnectionCertificate val = constructObjectPropertyObject "certificate" (Just val)
 
 data TlsConnectionCertificatePropertyInfo
 instance AttrInfo TlsConnectionCertificatePropertyInfo where
@@ -372,19 +385,21 @@
     attrGet _ = getTlsConnectionCertificate
     attrSet _ = setTlsConnectionCertificate
     attrConstruct _ = constructTlsConnectionCertificate
+    attrClear _ = undefined
 
 -- VVV Prop "database"
    -- Type: TInterface "Gio" "TlsDatabase"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTlsConnectionDatabase :: (MonadIO m, TlsConnectionK o) => o -> m TlsDatabase
-getTlsConnectionDatabase obj = liftIO $ getObjectPropertyObject obj "database" TlsDatabase
+getTlsConnectionDatabase obj = liftIO $ checkUnexpectedNothing "getTlsConnectionDatabase" $ getObjectPropertyObject obj "database" TlsDatabase
 
 setTlsConnectionDatabase :: (MonadIO m, TlsConnectionK o, TlsDatabaseK a) => o -> a -> m ()
-setTlsConnectionDatabase obj val = liftIO $ setObjectPropertyObject obj "database" val
+setTlsConnectionDatabase obj val = liftIO $ setObjectPropertyObject obj "database" (Just val)
 
 constructTlsConnectionDatabase :: (TlsDatabaseK a) => a -> IO ([Char], GValue)
-constructTlsConnectionDatabase val = constructObjectPropertyObject "database" val
+constructTlsConnectionDatabase val = constructObjectPropertyObject "database" (Just val)
 
 data TlsConnectionDatabasePropertyInfo
 instance AttrInfo TlsConnectionDatabasePropertyInfo where
@@ -396,23 +411,28 @@
     attrGet _ = getTlsConnectionDatabase
     attrSet _ = setTlsConnectionDatabase
     attrConstruct _ = constructTlsConnectionDatabase
+    attrClear _ = undefined
 
 -- VVV Prop "interaction"
    -- Type: TInterface "Gio" "TlsInteraction"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just True)
 
 getTlsConnectionInteraction :: (MonadIO m, TlsConnectionK o) => o -> m TlsInteraction
-getTlsConnectionInteraction obj = liftIO $ getObjectPropertyObject obj "interaction" TlsInteraction
+getTlsConnectionInteraction obj = liftIO $ checkUnexpectedNothing "getTlsConnectionInteraction" $ getObjectPropertyObject obj "interaction" TlsInteraction
 
 setTlsConnectionInteraction :: (MonadIO m, TlsConnectionK o, TlsInteractionK a) => o -> a -> m ()
-setTlsConnectionInteraction obj val = liftIO $ setObjectPropertyObject obj "interaction" val
+setTlsConnectionInteraction obj val = liftIO $ setObjectPropertyObject obj "interaction" (Just val)
 
 constructTlsConnectionInteraction :: (TlsInteractionK a) => a -> IO ([Char], GValue)
-constructTlsConnectionInteraction val = constructObjectPropertyObject "interaction" val
+constructTlsConnectionInteraction val = constructObjectPropertyObject "interaction" (Just val)
 
+clearTlsConnectionInteraction :: (MonadIO m, TlsConnectionK o) => o -> m ()
+clearTlsConnectionInteraction obj = liftIO $ setObjectPropertyObject obj "interaction" (Nothing :: Maybe TlsInteraction)
+
 data TlsConnectionInteractionPropertyInfo
 instance AttrInfo TlsConnectionInteractionPropertyInfo where
-    type AttrAllowedOps TlsConnectionInteractionPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TlsConnectionInteractionPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsConnectionInteractionPropertyInfo = TlsInteractionK
     type AttrBaseTypeConstraint TlsConnectionInteractionPropertyInfo = TlsConnectionK
     type AttrGetType TlsConnectionInteractionPropertyInfo = TlsInteraction
@@ -420,17 +440,19 @@
     attrGet _ = getTlsConnectionInteraction
     attrSet _ = setTlsConnectionInteraction
     attrConstruct _ = constructTlsConnectionInteraction
+    attrClear _ = clearTlsConnectionInteraction
 
 -- VVV Prop "peer-certificate"
    -- Type: TInterface "Gio" "TlsCertificate"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTlsConnectionPeerCertificate :: (MonadIO m, TlsConnectionK o) => o -> m TlsCertificate
-getTlsConnectionPeerCertificate obj = liftIO $ getObjectPropertyObject obj "peer-certificate" TlsCertificate
+getTlsConnectionPeerCertificate obj = liftIO $ checkUnexpectedNothing "getTlsConnectionPeerCertificate" $ getObjectPropertyObject obj "peer-certificate" TlsCertificate
 
 data TlsConnectionPeerCertificatePropertyInfo
 instance AttrInfo TlsConnectionPeerCertificatePropertyInfo where
-    type AttrAllowedOps TlsConnectionPeerCertificatePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps TlsConnectionPeerCertificatePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TlsConnectionPeerCertificatePropertyInfo = (~) ()
     type AttrBaseTypeConstraint TlsConnectionPeerCertificatePropertyInfo = TlsConnectionK
     type AttrGetType TlsConnectionPeerCertificatePropertyInfo = TlsCertificate
@@ -438,10 +460,12 @@
     attrGet _ = getTlsConnectionPeerCertificate
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "peer-certificate-errors"
    -- Type: TInterface "Gio" "TlsCertificateFlags"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTlsConnectionPeerCertificateErrors :: (MonadIO m, TlsConnectionK o) => o -> m [TlsCertificateFlags]
 getTlsConnectionPeerCertificateErrors obj = liftIO $ getObjectPropertyFlags obj "peer-certificate-errors"
@@ -456,10 +480,12 @@
     attrGet _ = getTlsConnectionPeerCertificateErrors
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "rehandshake-mode"
    -- Type: TInterface "Gio" "TlsRehandshakeMode"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsConnectionRehandshakeMode :: (MonadIO m, TlsConnectionK o) => o -> m TlsRehandshakeMode
 getTlsConnectionRehandshakeMode obj = liftIO $ getObjectPropertyEnum obj "rehandshake-mode"
@@ -480,10 +506,12 @@
     attrGet _ = getTlsConnectionRehandshakeMode
     attrSet _ = setTlsConnectionRehandshakeMode
     attrConstruct _ = constructTlsConnectionRehandshakeMode
+    attrClear _ = undefined
 
 -- VVV Prop "require-close-notify"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsConnectionRequireCloseNotify :: (MonadIO m, TlsConnectionK o) => o -> m Bool
 getTlsConnectionRequireCloseNotify obj = liftIO $ getObjectPropertyBool obj "require-close-notify"
@@ -504,10 +532,12 @@
     attrGet _ = getTlsConnectionRequireCloseNotify
     attrSet _ = setTlsConnectionRequireCloseNotify
     attrConstruct _ = constructTlsConnectionRequireCloseNotify
+    attrClear _ = undefined
 
 -- VVV Prop "use-system-certdb"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Just False,Just False)
 
 getTlsConnectionUseSystemCertdb :: (MonadIO m, TlsConnectionK o) => o -> m Bool
 getTlsConnectionUseSystemCertdb obj = liftIO $ getObjectPropertyBool obj "use-system-certdb"
@@ -528,10 +558,38 @@
     attrGet _ = getTlsConnectionUseSystemCertdb
     attrSet _ = setTlsConnectionUseSystemCertdb
     attrConstruct _ = constructTlsConnectionUseSystemCertdb
+    attrClear _ = undefined
 
 type instance AttributeList TlsConnection = TlsConnectionAttributeList
 type TlsConnectionAttributeList = ('[ '("baseIoStream", TlsConnectionBaseIoStreamPropertyInfo), '("certificate", TlsConnectionCertificatePropertyInfo), '("closed", IOStreamClosedPropertyInfo), '("database", TlsConnectionDatabasePropertyInfo), '("inputStream", IOStreamInputStreamPropertyInfo), '("interaction", TlsConnectionInteractionPropertyInfo), '("outputStream", IOStreamOutputStreamPropertyInfo), '("peerCertificate", TlsConnectionPeerCertificatePropertyInfo), '("peerCertificateErrors", TlsConnectionPeerCertificateErrorsPropertyInfo), '("rehandshakeMode", TlsConnectionRehandshakeModePropertyInfo), '("requireCloseNotify", TlsConnectionRequireCloseNotifyPropertyInfo), '("useSystemCertdb", TlsConnectionUseSystemCertdbPropertyInfo)] :: [(Symbol, *)])
 
+tlsConnectionBaseIoStream :: AttrLabelProxy "baseIoStream"
+tlsConnectionBaseIoStream = AttrLabelProxy
+
+tlsConnectionCertificate :: AttrLabelProxy "certificate"
+tlsConnectionCertificate = AttrLabelProxy
+
+tlsConnectionDatabase :: AttrLabelProxy "database"
+tlsConnectionDatabase = AttrLabelProxy
+
+tlsConnectionInteraction :: AttrLabelProxy "interaction"
+tlsConnectionInteraction = AttrLabelProxy
+
+tlsConnectionPeerCertificate :: AttrLabelProxy "peerCertificate"
+tlsConnectionPeerCertificate = AttrLabelProxy
+
+tlsConnectionPeerCertificateErrors :: AttrLabelProxy "peerCertificateErrors"
+tlsConnectionPeerCertificateErrors = AttrLabelProxy
+
+tlsConnectionRehandshakeMode :: AttrLabelProxy "rehandshakeMode"
+tlsConnectionRehandshakeMode = AttrLabelProxy
+
+tlsConnectionRequireCloseNotify :: AttrLabelProxy "requireCloseNotify"
+tlsConnectionRequireCloseNotify = AttrLabelProxy
+
+tlsConnectionUseSystemCertdb :: AttrLabelProxy "useSystemCertdb"
+tlsConnectionUseSystemCertdb = AttrLabelProxy
+
 data TlsConnectionAcceptCertificateSignalInfo
 instance SignalInfo TlsConnectionAcceptCertificateSignalInfo where
     type HaskellCallbackType TlsConnectionAcceptCertificateSignalInfo = TlsConnectionAcceptCertificateCallback
@@ -544,7 +602,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "peer_cert", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "errors", argType = TInterface "Gio" "TlsCertificateFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -579,7 +637,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : False
 -- Skip return : False
 
@@ -608,7 +666,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsDatabase"
+-- returnType : Just (TInterface "Gio" "TlsDatabase")
 -- throws : False
 -- Skip return : False
 
@@ -637,7 +695,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteraction"
+-- returnType : Just (TInterface "Gio" "TlsInteraction")
 -- throws : False
 -- Skip return : False
 
@@ -666,7 +724,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : False
 -- Skip return : False
 
@@ -695,7 +753,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : False
 -- Skip return : False
 
@@ -723,7 +781,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsRehandshakeMode"
+-- returnType : Just (TInterface "Gio" "TlsRehandshakeMode")
 -- throws : False
 -- Skip return : False
 
@@ -751,7 +809,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -779,7 +837,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -807,7 +865,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -845,18 +903,18 @@
 
 -- method TlsConnection::handshake_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "io_priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_tls_connection_handshake_async" g_tls_connection_handshake_async :: 
     Ptr TlsConnection ->                    -- _obj : TInterface "Gio" "TlsConnection"
-    Int32 ->                                -- io_priority : TBasicType TInt32
+    Int32 ->                                -- io_priority : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -895,7 +953,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -931,7 +989,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -962,7 +1020,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "database", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -993,7 +1051,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1028,7 +1086,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mode", argType = TInterface "Gio" "TlsRehandshakeMode", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1058,7 +1116,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "require_close_notify", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1088,7 +1146,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "use_system_certdb", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TlsConnection.hs-boot b/GI/Gio/Objects/TlsConnection.hs-boot
--- a/GI/Gio/Objects/TlsConnection.hs-boot
+++ b/GI/Gio/Objects/TlsConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TlsConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TlsDatabase.hs b/GI/Gio/Objects/TlsDatabase.hs
--- a/GI/Gio/Objects/TlsDatabase.hs
+++ b/GI/Gio/Objects/TlsDatabase.hs
@@ -86,9 +86,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -174,7 +174,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -188,27 +188,28 @@
     (MonadIO m, TlsDatabaseK a, TlsCertificateK b) =>
     a                                       -- _obj
     -> b                                    -- certificate
-    -> m T.Text                             -- result
+    -> m (Maybe T.Text)                     -- result
 tlsDatabaseCreateCertificateHandle _obj certificate = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     let certificate' = unsafeManagedPtrCastPtr certificate
     result <- g_tls_database_create_certificate_handle _obj' certificate'
-    checkUnexpectedReturnNULL "g_tls_database_create_certificate_handle" result
-    result' <- cstringToText result
-    freeMem result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- cstringToText result'
+        freeMem result'
+        return result''
     touchManagedPtr _obj
     touchManagedPtr certificate
-    return result'
+    return maybeResult
 
 data TlsDatabaseCreateCertificateHandleMethodInfo
-instance (signature ~ (b -> m T.Text), MonadIO m, TlsDatabaseK a, TlsCertificateK b) => MethodInfo TlsDatabaseCreateCertificateHandleMethodInfo a signature where
+instance (signature ~ (b -> m (Maybe T.Text)), MonadIO m, TlsDatabaseK a, TlsCertificateK b) => MethodInfo TlsDatabaseCreateCertificateHandleMethodInfo a signature where
     overloadedMethod _ = tlsDatabaseCreateCertificateHandle
 
 -- method TlsDatabase::lookup_certificate_for_handle
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handle", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -263,9 +264,9 @@
 
 -- method TlsDatabase::lookup_certificate_for_handle_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handle", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "handle", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -276,7 +277,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "TlsDatabaseLookupFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -326,7 +327,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -364,7 +365,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -419,9 +420,9 @@
 
 -- method TlsDatabase::lookup_certificate_issuer_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "certificate", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -432,7 +433,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "TlsDatabaseLookupFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -482,7 +483,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificate"
+-- returnType : Just (TInterface "Gio" "TlsCertificate")
 -- throws : True
 -- Skip return : False
 
@@ -520,7 +521,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "issuer_raw_dn", argType = TByteArray, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "TlsCertificate")
+-- returnType : Just (TGList (TInterface "Gio" "TlsCertificate"))
 -- throws : True
 -- Skip return : False
 
@@ -558,7 +559,6 @@
             return jCancellable'
     onException (do
         result <- propagateGError $ g_tls_database_lookup_certificates_issued_by _obj' issuerRawDn' maybeInteraction flags' maybeCancellable
-        checkUnexpectedReturnNULL "g_tls_database_lookup_certificates_issued_by" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject TlsCertificate) result'
         g_list_free result
@@ -577,9 +577,9 @@
 
 -- method TlsDatabase::lookup_certificates_issued_by_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "issuer_raw_dn", argType = TByteArray, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "issuer_raw_dn", argType = TByteArray, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -590,7 +590,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "TlsDatabaseLookupFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -640,7 +640,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "TlsCertificate")
+-- returnType : Just (TGList (TInterface "Gio" "TlsCertificate"))
 -- throws : True
 -- Skip return : False
 
@@ -661,7 +661,6 @@
     let result_' = unsafeManagedPtrCastPtr result_
     onException (do
         result <- propagateGError $ g_tls_database_lookup_certificates_issued_by_finish _obj' result_'
-        checkUnexpectedReturnNULL "g_tls_database_lookup_certificates_issued_by_finish" result
         result' <- unpackGList result
         result'' <- mapM (wrapObject TlsCertificate) result'
         g_list_free result
@@ -680,7 +679,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "chain", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "purpose", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseVerifyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : True
 -- Skip return : False
 
@@ -746,9 +745,9 @@
 
 -- method TlsDatabase::verify_chain_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "chain", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "purpose", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseVerifyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "chain", argType = TInterface "Gio" "TlsCertificate", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "purpose", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "identity", argType = TInterface "Gio" "SocketConnectable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "interaction", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsDatabaseVerifyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 8, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -761,7 +760,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "TlsDatabaseVerifyFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -821,7 +820,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsDatabase", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsCertificateFlags"
+-- returnType : Just (TInterface "Gio" "TlsCertificateFlags")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TlsDatabase.hs-boot b/GI/Gio/Objects/TlsDatabase.hs-boot
--- a/GI/Gio/Objects/TlsDatabase.hs-boot
+++ b/GI/Gio/Objects/TlsDatabase.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TlsDatabase where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TlsInteraction.hs b/GI/Gio/Objects/TlsInteraction.hs
--- a/GI/Gio/Objects/TlsInteraction.hs
+++ b/GI/Gio/Objects/TlsInteraction.hs
@@ -61,9 +61,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -144,7 +144,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
@@ -187,9 +187,9 @@
 
 -- method TlsInteraction::ask_password_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 4, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -198,7 +198,7 @@
     Ptr TlsPassword ->                      -- password : TInterface "Gio" "TlsPassword"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -239,7 +239,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
@@ -276,7 +276,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "password", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
@@ -321,7 +321,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateRequestFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
@@ -369,7 +369,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateRequestFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
@@ -415,9 +415,9 @@
 
 -- method TlsInteraction::request_certificate_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateRequestFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "connection", argType = TInterface "Gio" "TlsConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsCertificateRequestFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 5, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -427,7 +427,7 @@
     CUInt ->                                -- flags : TInterface "Gio" "TlsCertificateRequestFlags"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -470,7 +470,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsInteraction", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsInteractionResult"
+-- returnType : Just (TInterface "Gio" "TlsInteractionResult")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TlsInteraction.hs-boot b/GI/Gio/Objects/TlsInteraction.hs-boot
--- a/GI/Gio/Objects/TlsInteraction.hs-boot
+++ b/GI/Gio/Objects/TlsInteraction.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TlsInteraction where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/TlsPassword.hs b/GI/Gio/Objects/TlsPassword.hs
--- a/GI/Gio/Objects/TlsPassword.hs
+++ b/GI/Gio/Objects/TlsPassword.hs
@@ -69,6 +69,7 @@
     constructTlsPasswordDescription         ,
     getTlsPasswordDescription               ,
     setTlsPasswordDescription               ,
+    tlsPasswordDescription                  ,
 
 
 -- ** Flags
@@ -76,6 +77,7 @@
     constructTlsPasswordFlags               ,
     getTlsPasswordFlags                     ,
     setTlsPasswordFlags                     ,
+    tlsPasswordFlags                        ,
 
 
 -- ** Warning
@@ -83,15 +85,16 @@
     constructTlsPasswordWarning             ,
     getTlsPasswordWarning                   ,
     setTlsPasswordWarning                   ,
+    tlsPasswordWarning                      ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -166,15 +169,16 @@
 -- VVV Prop "description"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTlsPasswordDescription :: (MonadIO m, TlsPasswordK o) => o -> m T.Text
-getTlsPasswordDescription obj = liftIO $ getObjectPropertyString obj "description"
+getTlsPasswordDescription obj = liftIO $ checkUnexpectedNothing "getTlsPasswordDescription" $ getObjectPropertyString obj "description"
 
 setTlsPasswordDescription :: (MonadIO m, TlsPasswordK o) => o -> T.Text -> m ()
-setTlsPasswordDescription obj val = liftIO $ setObjectPropertyString obj "description" val
+setTlsPasswordDescription obj val = liftIO $ setObjectPropertyString obj "description" (Just val)
 
 constructTlsPasswordDescription :: T.Text -> IO ([Char], GValue)
-constructTlsPasswordDescription val = constructObjectPropertyString "description" val
+constructTlsPasswordDescription val = constructObjectPropertyString "description" (Just val)
 
 data TlsPasswordDescriptionPropertyInfo
 instance AttrInfo TlsPasswordDescriptionPropertyInfo where
@@ -186,10 +190,12 @@
     attrGet _ = getTlsPasswordDescription
     attrSet _ = setTlsPasswordDescription
     attrConstruct _ = constructTlsPasswordDescription
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Gio" "TlsPasswordFlags"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTlsPasswordFlags :: (MonadIO m, TlsPasswordK o) => o -> m [TlsPasswordFlags]
 getTlsPasswordFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -210,19 +216,21 @@
     attrGet _ = getTlsPasswordFlags
     attrSet _ = setTlsPasswordFlags
     attrConstruct _ = constructTlsPasswordFlags
+    attrClear _ = undefined
 
 -- VVV Prop "warning"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTlsPasswordWarning :: (MonadIO m, TlsPasswordK o) => o -> m T.Text
-getTlsPasswordWarning obj = liftIO $ getObjectPropertyString obj "warning"
+getTlsPasswordWarning obj = liftIO $ checkUnexpectedNothing "getTlsPasswordWarning" $ getObjectPropertyString obj "warning"
 
 setTlsPasswordWarning :: (MonadIO m, TlsPasswordK o) => o -> T.Text -> m ()
-setTlsPasswordWarning obj val = liftIO $ setObjectPropertyString obj "warning" val
+setTlsPasswordWarning obj val = liftIO $ setObjectPropertyString obj "warning" (Just val)
 
 constructTlsPasswordWarning :: T.Text -> IO ([Char], GValue)
-constructTlsPasswordWarning val = constructObjectPropertyString "warning" val
+constructTlsPasswordWarning val = constructObjectPropertyString "warning" (Just val)
 
 data TlsPasswordWarningPropertyInfo
 instance AttrInfo TlsPasswordWarningPropertyInfo where
@@ -234,10 +242,20 @@
     attrGet _ = getTlsPasswordWarning
     attrSet _ = setTlsPasswordWarning
     attrConstruct _ = constructTlsPasswordWarning
+    attrClear _ = undefined
 
 type instance AttributeList TlsPassword = TlsPasswordAttributeList
 type TlsPasswordAttributeList = ('[ '("description", TlsPasswordDescriptionPropertyInfo), '("flags", TlsPasswordFlagsPropertyInfo), '("warning", TlsPasswordWarningPropertyInfo)] :: [(Symbol, *)])
 
+tlsPasswordDescription :: AttrLabelProxy "description"
+tlsPasswordDescription = AttrLabelProxy
+
+tlsPasswordFlags :: AttrLabelProxy "flags"
+tlsPasswordFlags = AttrLabelProxy
+
+tlsPasswordWarning :: AttrLabelProxy "warning"
+tlsPasswordWarning = AttrLabelProxy
+
 type instance SignalList TlsPassword = TlsPasswordSignalList
 type TlsPasswordSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -245,7 +263,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "flags", argType = TInterface "Gio" "TlsPasswordFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "description", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsPassword"
+-- returnType : Just (TInterface "Gio" "TlsPassword")
 -- throws : False
 -- Skip return : False
 
@@ -273,7 +291,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -302,7 +320,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "TlsPasswordFlags"
+-- returnType : Just (TInterface "Gio" "TlsPasswordFlags")
 -- throws : False
 -- Skip return : False
 
@@ -330,7 +348,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -359,7 +377,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "description", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -390,7 +408,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "TlsPasswordFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -420,7 +438,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -451,7 +469,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TBasicType TUInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "destroy", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -491,7 +509,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "TlsPassword", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "warning", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/TlsPassword.hs-boot b/GI/Gio/Objects/TlsPassword.hs-boot
--- a/GI/Gio/Objects/TlsPassword.hs-boot
+++ b/GI/Gio/Objects/TlsPassword.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.TlsPassword where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixConnection.hs b/GI/Gio/Objects/UnixConnection.hs
--- a/GI/Gio/Objects/UnixConnection.hs
+++ b/GI/Gio/Objects/UnixConnection.hs
@@ -61,9 +61,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -161,7 +161,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : True
 -- Skip return : False
 
@@ -201,9 +201,9 @@
 
 -- method UnixConnection::receive_credentials_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -211,7 +211,7 @@
     Ptr UnixConnection ->                   -- _obj : TInterface "Gio" "UnixConnection"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -249,7 +249,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : True
 -- Skip return : False
 
@@ -287,7 +287,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
@@ -327,7 +327,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -365,9 +365,9 @@
 
 -- method UnixConnection::send_credentials_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Gio" "AsyncReadyCallback", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = 3, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -375,7 +375,7 @@
     Ptr UnixConnection ->                   -- _obj : TInterface "Gio" "UnixConnection"
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     FunPtr AsyncReadyCallbackC ->           -- callback : TInterface "Gio" "AsyncReadyCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     IO ()
 
 
@@ -413,7 +413,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "result", argType = TInterface "Gio" "AsyncResult", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -447,15 +447,15 @@
 
 -- method UnixConnection::send_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixConnection", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_unix_connection_send_fd" g_unix_connection_send_fd :: 
     Ptr UnixConnection ->                   -- _obj : TInterface "Gio" "UnixConnection"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     Ptr Cancellable ->                      -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO CInt
diff --git a/GI/Gio/Objects/UnixConnection.hs-boot b/GI/Gio/Objects/UnixConnection.hs-boot
--- a/GI/Gio/Objects/UnixConnection.hs-boot
+++ b/GI/Gio/Objects/UnixConnection.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixConnection where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixCredentialsMessage.hs b/GI/Gio/Objects/UnixCredentialsMessage.hs
--- a/GI/Gio/Objects/UnixCredentialsMessage.hs
+++ b/GI/Gio/Objects/UnixCredentialsMessage.hs
@@ -41,15 +41,16 @@
     UnixCredentialsMessageCredentialsPropertyInfo,
     constructUnixCredentialsMessageCredentials,
     getUnixCredentialsMessageCredentials    ,
+    unixCredentialsMessageCredentials       ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -120,16 +121,17 @@
 -- VVV Prop "credentials"
    -- Type: TInterface "Gio" "Credentials"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixCredentialsMessageCredentials :: (MonadIO m, UnixCredentialsMessageK o) => o -> m Credentials
-getUnixCredentialsMessageCredentials obj = liftIO $ getObjectPropertyObject obj "credentials" Credentials
+getUnixCredentialsMessageCredentials obj = liftIO $ checkUnexpectedNothing "getUnixCredentialsMessageCredentials" $ getObjectPropertyObject obj "credentials" Credentials
 
 constructUnixCredentialsMessageCredentials :: (CredentialsK a) => a -> IO ([Char], GValue)
-constructUnixCredentialsMessageCredentials val = constructObjectPropertyObject "credentials" val
+constructUnixCredentialsMessageCredentials val = constructObjectPropertyObject "credentials" (Just val)
 
 data UnixCredentialsMessageCredentialsPropertyInfo
 instance AttrInfo UnixCredentialsMessageCredentialsPropertyInfo where
-    type AttrAllowedOps UnixCredentialsMessageCredentialsPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps UnixCredentialsMessageCredentialsPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint UnixCredentialsMessageCredentialsPropertyInfo = CredentialsK
     type AttrBaseTypeConstraint UnixCredentialsMessageCredentialsPropertyInfo = UnixCredentialsMessageK
     type AttrGetType UnixCredentialsMessageCredentialsPropertyInfo = Credentials
@@ -137,10 +139,14 @@
     attrGet _ = getUnixCredentialsMessageCredentials
     attrSet _ = undefined
     attrConstruct _ = constructUnixCredentialsMessageCredentials
+    attrClear _ = undefined
 
 type instance AttributeList UnixCredentialsMessage = UnixCredentialsMessageAttributeList
 type UnixCredentialsMessageAttributeList = ('[ '("credentials", UnixCredentialsMessageCredentialsPropertyInfo)] :: [(Symbol, *)])
 
+unixCredentialsMessageCredentials :: AttrLabelProxy "credentials"
+unixCredentialsMessageCredentials = AttrLabelProxy
+
 type instance SignalList UnixCredentialsMessage = UnixCredentialsMessageSignalList
 type UnixCredentialsMessageSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -148,7 +154,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixCredentialsMessage"
+-- returnType : Just (TInterface "Gio" "UnixCredentialsMessage")
 -- throws : False
 -- Skip return : False
 
@@ -169,7 +175,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "credentials", argType = TInterface "Gio" "Credentials", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixCredentialsMessage"
+-- returnType : Just (TInterface "Gio" "UnixCredentialsMessage")
 -- throws : False
 -- Skip return : False
 
@@ -194,7 +200,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixCredentialsMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Credentials"
+-- returnType : Just (TInterface "Gio" "Credentials")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +229,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/UnixCredentialsMessage.hs-boot b/GI/Gio/Objects/UnixCredentialsMessage.hs-boot
--- a/GI/Gio/Objects/UnixCredentialsMessage.hs-boot
+++ b/GI/Gio/Objects/UnixCredentialsMessage.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixCredentialsMessage where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixFDList.hs b/GI/Gio/Objects/UnixFDList.hs
--- a/GI/Gio/Objects/UnixFDList.hs
+++ b/GI/Gio/Objects/UnixFDList.hs
@@ -54,9 +54,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -134,7 +134,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixFDList"
+-- returnType : Just (TInterface "Gio" "UnixFDList")
 -- throws : False
 -- Skip return : False
 
@@ -153,15 +153,15 @@
 
 -- method UnixFDList::new_from_array
 -- method type : Constructor
--- Args : [Arg {argCName = "fds", argType = TCArray False (-1) 1 (TBasicType TInt32), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_fds", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "n_fds", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "UnixFDList"
+-- Args : [Arg {argCName = "fds", argType = TCArray False (-1) 1 (TBasicType TInt), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "n_fds", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "n_fds", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TInterface "Gio" "UnixFDList")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_list_new_from_array" g_unix_fd_list_new_from_array :: 
-    Ptr Int32 ->                            -- fds : TCArray False (-1) 1 (TBasicType TInt32)
-    Int32 ->                                -- n_fds : TBasicType TInt32
+    Ptr Int32 ->                            -- fds : TCArray False (-1) 1 (TBasicType TInt)
+    Int32 ->                                -- n_fds : TBasicType TInt
     IO (Ptr UnixFDList)
 
 
@@ -180,15 +180,15 @@
 
 -- method UnixFDList::append
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_list_append" g_unix_fd_list_append :: 
     Ptr UnixFDList ->                       -- _obj : TInterface "Gio" "UnixFDList"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO Int32
 
@@ -214,15 +214,15 @@
 
 -- method UnixFDList::get
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "index_", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "index_", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_list_get" g_unix_fd_list_get :: 
     Ptr UnixFDList ->                       -- _obj : TInterface "Gio" "UnixFDList"
-    Int32 ->                                -- index_ : TBasicType TInt32
+    Int32 ->                                -- index_ : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO Int32
 
@@ -230,12 +230,12 @@
 unixFDListGet ::
     (MonadIO m, UnixFDListK a) =>
     a                                       -- _obj
-    -> Int32                                -- index
+    -> Int32                                -- index_
     -> m Int32                              -- result
-unixFDListGet _obj index = liftIO $ do
+unixFDListGet _obj index_ = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     onException (do
-        result <- propagateGError $ g_unix_fd_list_get _obj' index
+        result <- propagateGError $ g_unix_fd_list_get _obj' index_
         touchManagedPtr _obj
         return result
      ) (do
@@ -250,7 +250,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -275,15 +275,15 @@
 
 -- method UnixFDList::peek_fds
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- Lengths : [Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TInt32)
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Lengths : [Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TInt))
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_list_peek_fds" g_unix_fd_list_peek_fds :: 
     Ptr UnixFDList ->                       -- _obj : TInterface "Gio" "UnixFDList"
-    Ptr Int32 ->                            -- length : TBasicType TInt32
+    Ptr Int32 ->                            -- length : TBasicType TInt
     IO (Ptr Int32)
 
 
@@ -308,15 +308,15 @@
 
 -- method UnixFDList::steal_fds
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- Lengths : [Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TInt32)
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Lengths : [Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TInt))
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_list_steal_fds" g_unix_fd_list_steal_fds :: 
     Ptr UnixFDList ->                       -- _obj : TInterface "Gio" "UnixFDList"
-    Ptr Int32 ->                            -- length : TBasicType TInt32
+    Ptr Int32 ->                            -- length : TBasicType TInt
     IO (Ptr Int32)
 
 
diff --git a/GI/Gio/Objects/UnixFDList.hs-boot b/GI/Gio/Objects/UnixFDList.hs-boot
--- a/GI/Gio/Objects/UnixFDList.hs-boot
+++ b/GI/Gio/Objects/UnixFDList.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixFDList where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixFDMessage.hs b/GI/Gio/Objects/UnixFDMessage.hs
--- a/GI/Gio/Objects/UnixFDMessage.hs
+++ b/GI/Gio/Objects/UnixFDMessage.hs
@@ -47,15 +47,16 @@
     UnixFDMessageFdListPropertyInfo         ,
     constructUnixFDMessageFdList            ,
     getUnixFDMessageFdList                  ,
+    unixFDMessageFdList                     ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -128,16 +129,17 @@
 -- VVV Prop "fd-list"
    -- Type: TInterface "Gio" "UnixFDList"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixFDMessageFdList :: (MonadIO m, UnixFDMessageK o) => o -> m UnixFDList
-getUnixFDMessageFdList obj = liftIO $ getObjectPropertyObject obj "fd-list" UnixFDList
+getUnixFDMessageFdList obj = liftIO $ checkUnexpectedNothing "getUnixFDMessageFdList" $ getObjectPropertyObject obj "fd-list" UnixFDList
 
 constructUnixFDMessageFdList :: (UnixFDListK a) => a -> IO ([Char], GValue)
-constructUnixFDMessageFdList val = constructObjectPropertyObject "fd-list" val
+constructUnixFDMessageFdList val = constructObjectPropertyObject "fd-list" (Just val)
 
 data UnixFDMessageFdListPropertyInfo
 instance AttrInfo UnixFDMessageFdListPropertyInfo where
-    type AttrAllowedOps UnixFDMessageFdListPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps UnixFDMessageFdListPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint UnixFDMessageFdListPropertyInfo = UnixFDListK
     type AttrBaseTypeConstraint UnixFDMessageFdListPropertyInfo = UnixFDMessageK
     type AttrGetType UnixFDMessageFdListPropertyInfo = UnixFDList
@@ -145,10 +147,14 @@
     attrGet _ = getUnixFDMessageFdList
     attrSet _ = undefined
     attrConstruct _ = constructUnixFDMessageFdList
+    attrClear _ = undefined
 
 type instance AttributeList UnixFDMessage = UnixFDMessageAttributeList
 type UnixFDMessageAttributeList = ('[ '("fdList", UnixFDMessageFdListPropertyInfo)] :: [(Symbol, *)])
 
+unixFDMessageFdList :: AttrLabelProxy "fdList"
+unixFDMessageFdList = AttrLabelProxy
+
 type instance SignalList UnixFDMessage = UnixFDMessageSignalList
 type UnixFDMessageSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -156,7 +162,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixFDMessage"
+-- returnType : Just (TInterface "Gio" "UnixFDMessage")
 -- throws : False
 -- Skip return : False
 
@@ -177,7 +183,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "fd_list", argType = TInterface "Gio" "UnixFDList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixFDMessage"
+-- returnType : Just (TInterface "Gio" "UnixFDMessage")
 -- throws : False
 -- Skip return : False
 
@@ -200,15 +206,15 @@
 
 -- method UnixFDMessage::append_fd
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_message_append_fd" g_unix_fd_message_append_fd :: 
     Ptr UnixFDMessage ->                    -- _obj : TInterface "Gio" "UnixFDMessage"
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -236,7 +242,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixFDList"
+-- returnType : Just (TInterface "Gio" "UnixFDList")
 -- throws : False
 -- Skip return : False
 
@@ -263,15 +269,15 @@
 
 -- method UnixFDMessage::steal_fds
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- Lengths : [Arg {argCName = "length", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
--- returnType : TCArray False (-1) 1 (TBasicType TInt32)
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixFDMessage", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Lengths : [Arg {argCName = "length", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- returnType : Just (TCArray False (-1) 1 (TBasicType TInt))
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_fd_message_steal_fds" g_unix_fd_message_steal_fds :: 
     Ptr UnixFDMessage ->                    -- _obj : TInterface "Gio" "UnixFDMessage"
-    Ptr Int32 ->                            -- length : TBasicType TInt32
+    Ptr Int32 ->                            -- length : TBasicType TInt
     IO (Ptr Int32)
 
 
diff --git a/GI/Gio/Objects/UnixFDMessage.hs-boot b/GI/Gio/Objects/UnixFDMessage.hs-boot
--- a/GI/Gio/Objects/UnixFDMessage.hs-boot
+++ b/GI/Gio/Objects/UnixFDMessage.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixFDMessage where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixInputStream.hs b/GI/Gio/Objects/UnixInputStream.hs
--- a/GI/Gio/Objects/UnixInputStream.hs
+++ b/GI/Gio/Objects/UnixInputStream.hs
@@ -44,21 +44,23 @@
     constructUnixInputStreamCloseFd         ,
     getUnixInputStreamCloseFd               ,
     setUnixInputStreamCloseFd               ,
+    unixInputStreamCloseFd                  ,
 
 
 -- ** Fd
     UnixInputStreamFdPropertyInfo           ,
     constructUnixInputStreamFd              ,
     getUnixInputStreamFd                    ,
+    unixInputStreamFd                       ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -149,6 +151,7 @@
 -- VVV Prop "close-fd"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getUnixInputStreamCloseFd :: (MonadIO m, UnixInputStreamK o) => o -> m Bool
 getUnixInputStreamCloseFd obj = liftIO $ getObjectPropertyBool obj "close-fd"
@@ -169,16 +172,18 @@
     attrGet _ = getUnixInputStreamCloseFd
     attrSet _ = setUnixInputStreamCloseFd
     attrConstruct _ = constructUnixInputStreamCloseFd
+    attrClear _ = undefined
 
 -- VVV Prop "fd"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixInputStreamFd :: (MonadIO m, UnixInputStreamK o) => o -> m Int32
-getUnixInputStreamFd obj = liftIO $ getObjectPropertyCInt obj "fd"
+getUnixInputStreamFd obj = liftIO $ getObjectPropertyInt32 obj "fd"
 
 constructUnixInputStreamFd :: Int32 -> IO ([Char], GValue)
-constructUnixInputStreamFd val = constructObjectPropertyCInt "fd" val
+constructUnixInputStreamFd val = constructObjectPropertyInt32 "fd" val
 
 data UnixInputStreamFdPropertyInfo
 instance AttrInfo UnixInputStreamFdPropertyInfo where
@@ -190,23 +195,30 @@
     attrGet _ = getUnixInputStreamFd
     attrSet _ = undefined
     attrConstruct _ = constructUnixInputStreamFd
+    attrClear _ = undefined
 
 type instance AttributeList UnixInputStream = UnixInputStreamAttributeList
 type UnixInputStreamAttributeList = ('[ '("closeFd", UnixInputStreamCloseFdPropertyInfo), '("fd", UnixInputStreamFdPropertyInfo)] :: [(Symbol, *)])
 
+unixInputStreamCloseFd :: AttrLabelProxy "closeFd"
+unixInputStreamCloseFd = AttrLabelProxy
+
+unixInputStreamFd :: AttrLabelProxy "fd"
+unixInputStreamFd = AttrLabelProxy
+
 type instance SignalList UnixInputStream = UnixInputStreamSignalList
 type UnixInputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method UnixInputStream::new
 -- method type : Constructor
--- Args : [Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixInputStream"
+-- returnType : Just (TInterface "Gio" "UnixInputStream")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_input_stream_new" g_unix_input_stream_new :: 
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     CInt ->                                 -- close_fd : TBasicType TBoolean
     IO (Ptr UnixInputStream)
 
@@ -227,7 +239,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -255,7 +267,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -282,7 +294,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixInputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/UnixInputStream.hs-boot b/GI/Gio/Objects/UnixInputStream.hs-boot
--- a/GI/Gio/Objects/UnixInputStream.hs-boot
+++ b/GI/Gio/Objects/UnixInputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixInputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixMountMonitor.hs b/GI/Gio/Objects/UnixMountMonitor.hs
--- a/GI/Gio/Objects/UnixMountMonitor.hs
+++ b/GI/Gio/Objects/UnixMountMonitor.hs
@@ -61,9 +61,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -223,7 +223,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixMountMonitor"
+-- returnType : Just (TInterface "Gio" "UnixMountMonitor")
 -- throws : False
 -- Skip return : False
 
@@ -242,15 +242,15 @@
 
 -- method UnixMountMonitor::set_rate_limit
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "limit_msec", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "limit_msec", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_mount_monitor_set_rate_limit" g_unix_mount_monitor_set_rate_limit :: 
     Ptr UnixMountMonitor ->                 -- _obj : TInterface "Gio" "UnixMountMonitor"
-    Int32 ->                                -- limit_msec : TBasicType TInt32
+    Int32 ->                                -- limit_msec : TBasicType TInt
     IO ()
 
 {-# DEPRECATED unixMountMonitorSetRateLimit ["(Since version 2.44)","This function does nothing.  Don't call it."]#-}
@@ -273,7 +273,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixMountMonitor"
+-- returnType : Just (TInterface "Gio" "UnixMountMonitor")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/UnixMountMonitor.hs-boot b/GI/Gio/Objects/UnixMountMonitor.hs-boot
--- a/GI/Gio/Objects/UnixMountMonitor.hs-boot
+++ b/GI/Gio/Objects/UnixMountMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixMountMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixOutputStream.hs b/GI/Gio/Objects/UnixOutputStream.hs
--- a/GI/Gio/Objects/UnixOutputStream.hs
+++ b/GI/Gio/Objects/UnixOutputStream.hs
@@ -44,21 +44,23 @@
     constructUnixOutputStreamCloseFd        ,
     getUnixOutputStreamCloseFd              ,
     setUnixOutputStreamCloseFd              ,
+    unixOutputStreamCloseFd                 ,
 
 
 -- ** Fd
     UnixOutputStreamFdPropertyInfo          ,
     constructUnixOutputStreamFd             ,
     getUnixOutputStreamFd                   ,
+    unixOutputStreamFd                      ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -153,6 +155,7 @@
 -- VVV Prop "close-fd"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getUnixOutputStreamCloseFd :: (MonadIO m, UnixOutputStreamK o) => o -> m Bool
 getUnixOutputStreamCloseFd obj = liftIO $ getObjectPropertyBool obj "close-fd"
@@ -173,16 +176,18 @@
     attrGet _ = getUnixOutputStreamCloseFd
     attrSet _ = setUnixOutputStreamCloseFd
     attrConstruct _ = constructUnixOutputStreamCloseFd
+    attrClear _ = undefined
 
 -- VVV Prop "fd"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixOutputStreamFd :: (MonadIO m, UnixOutputStreamK o) => o -> m Int32
-getUnixOutputStreamFd obj = liftIO $ getObjectPropertyCInt obj "fd"
+getUnixOutputStreamFd obj = liftIO $ getObjectPropertyInt32 obj "fd"
 
 constructUnixOutputStreamFd :: Int32 -> IO ([Char], GValue)
-constructUnixOutputStreamFd val = constructObjectPropertyCInt "fd" val
+constructUnixOutputStreamFd val = constructObjectPropertyInt32 "fd" val
 
 data UnixOutputStreamFdPropertyInfo
 instance AttrInfo UnixOutputStreamFdPropertyInfo where
@@ -194,23 +199,30 @@
     attrGet _ = getUnixOutputStreamFd
     attrSet _ = undefined
     attrConstruct _ = constructUnixOutputStreamFd
+    attrClear _ = undefined
 
 type instance AttributeList UnixOutputStream = UnixOutputStreamAttributeList
 type UnixOutputStreamAttributeList = ('[ '("closeFd", UnixOutputStreamCloseFdPropertyInfo), '("fd", UnixOutputStreamFdPropertyInfo)] :: [(Symbol, *)])
 
+unixOutputStreamCloseFd :: AttrLabelProxy "closeFd"
+unixOutputStreamCloseFd = AttrLabelProxy
+
+unixOutputStreamFd :: AttrLabelProxy "fd"
+unixOutputStreamFd = AttrLabelProxy
+
 type instance SignalList UnixOutputStream = UnixOutputStreamSignalList
 type UnixOutputStreamSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method UnixOutputStream::new
 -- method type : Constructor
--- Args : [Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixOutputStream"
+-- returnType : Just (TInterface "Gio" "UnixOutputStream")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_output_stream_new" g_unix_output_stream_new :: 
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     CInt ->                                 -- close_fd : TBasicType TBoolean
     IO (Ptr UnixOutputStream)
 
@@ -231,7 +243,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -259,7 +271,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -286,7 +298,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixOutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "close_fd", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/UnixOutputStream.hs-boot b/GI/Gio/Objects/UnixOutputStream.hs-boot
--- a/GI/Gio/Objects/UnixOutputStream.hs-boot
+++ b/GI/Gio/Objects/UnixOutputStream.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixOutputStream where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/UnixSocketAddress.hs b/GI/Gio/Objects/UnixSocketAddress.hs
--- a/GI/Gio/Objects/UnixSocketAddress.hs
+++ b/GI/Gio/Objects/UnixSocketAddress.hs
@@ -60,33 +60,37 @@
     UnixSocketAddressAbstractPropertyInfo   ,
     constructUnixSocketAddressAbstract      ,
     getUnixSocketAddressAbstract            ,
+    unixSocketAddressAbstract               ,
 
 
 -- ** AddressType
     UnixSocketAddressAddressTypePropertyInfo,
     constructUnixSocketAddressAddressType   ,
     getUnixSocketAddressAddressType         ,
+    unixSocketAddressAddressType            ,
 
 
 -- ** Path
     UnixSocketAddressPathPropertyInfo       ,
     constructUnixSocketAddressPath          ,
     getUnixSocketAddressPath                ,
+    unixSocketAddressPath                   ,
 
 
 -- ** PathAsArray
     UnixSocketAddressPathAsArrayPropertyInfo,
     constructUnixSocketAddressPathAsArray   ,
     getUnixSocketAddressPathAsArray         ,
+    unixSocketAddressPathAsArray            ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -161,6 +165,7 @@
 -- VVV Prop "abstract"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getUnixSocketAddressAbstract :: (MonadIO m, UnixSocketAddressK o) => o -> m Bool
 getUnixSocketAddressAbstract obj = liftIO $ getObjectPropertyBool obj "abstract"
@@ -178,10 +183,12 @@
     attrGet _ = getUnixSocketAddressAbstract
     attrSet _ = undefined
     attrConstruct _ = constructUnixSocketAddressAbstract
+    attrClear _ = undefined
 
 -- VVV Prop "address-type"
    -- Type: TInterface "Gio" "UnixSocketAddressType"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixSocketAddressAddressType :: (MonadIO m, UnixSocketAddressK o) => o -> m UnixSocketAddressType
 getUnixSocketAddressAddressType obj = liftIO $ getObjectPropertyEnum obj "address-type"
@@ -199,20 +206,22 @@
     attrGet _ = getUnixSocketAddressAddressType
     attrSet _ = undefined
     attrConstruct _ = constructUnixSocketAddressAddressType
+    attrClear _ = undefined
 
 -- VVV Prop "path"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getUnixSocketAddressPath :: (MonadIO m, UnixSocketAddressK o) => o -> m T.Text
-getUnixSocketAddressPath obj = liftIO $ getObjectPropertyString obj "path"
+getUnixSocketAddressPath obj = liftIO $ checkUnexpectedNothing "getUnixSocketAddressPath" $ getObjectPropertyString obj "path"
 
 constructUnixSocketAddressPath :: T.Text -> IO ([Char], GValue)
-constructUnixSocketAddressPath val = constructObjectPropertyString "path" val
+constructUnixSocketAddressPath val = constructObjectPropertyString "path" (Just val)
 
 data UnixSocketAddressPathPropertyInfo
 instance AttrInfo UnixSocketAddressPathPropertyInfo where
-    type AttrAllowedOps UnixSocketAddressPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps UnixSocketAddressPathPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint UnixSocketAddressPathPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint UnixSocketAddressPathPropertyInfo = UnixSocketAddressK
     type AttrGetType UnixSocketAddressPathPropertyInfo = T.Text
@@ -220,31 +229,46 @@
     attrGet _ = getUnixSocketAddressPath
     attrSet _ = undefined
     attrConstruct _ = constructUnixSocketAddressPath
+    attrClear _ = undefined
 
 -- VVV Prop "path-as-array"
    -- Type: TByteArray
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
-getUnixSocketAddressPathAsArray :: (MonadIO m, UnixSocketAddressK o) => o -> m ByteString
+getUnixSocketAddressPathAsArray :: (MonadIO m, UnixSocketAddressK o) => o -> m (Maybe ByteString)
 getUnixSocketAddressPathAsArray obj = liftIO $ getObjectPropertyByteArray obj "path-as-array"
 
 constructUnixSocketAddressPathAsArray :: ByteString -> IO ([Char], GValue)
-constructUnixSocketAddressPathAsArray val = constructObjectPropertyByteArray "path-as-array" val
+constructUnixSocketAddressPathAsArray val = constructObjectPropertyByteArray "path-as-array" (Just val)
 
 data UnixSocketAddressPathAsArrayPropertyInfo
 instance AttrInfo UnixSocketAddressPathAsArrayPropertyInfo where
-    type AttrAllowedOps UnixSocketAddressPathAsArrayPropertyInfo = '[ 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps UnixSocketAddressPathAsArrayPropertyInfo = '[ 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint UnixSocketAddressPathAsArrayPropertyInfo = (~) ByteString
     type AttrBaseTypeConstraint UnixSocketAddressPathAsArrayPropertyInfo = UnixSocketAddressK
-    type AttrGetType UnixSocketAddressPathAsArrayPropertyInfo = ByteString
+    type AttrGetType UnixSocketAddressPathAsArrayPropertyInfo = (Maybe ByteString)
     type AttrLabel UnixSocketAddressPathAsArrayPropertyInfo = "path-as-array"
     attrGet _ = getUnixSocketAddressPathAsArray
     attrSet _ = undefined
     attrConstruct _ = constructUnixSocketAddressPathAsArray
+    attrClear _ = undefined
 
 type instance AttributeList UnixSocketAddress = UnixSocketAddressAttributeList
 type UnixSocketAddressAttributeList = ('[ '("abstract", UnixSocketAddressAbstractPropertyInfo), '("addressType", UnixSocketAddressAddressTypePropertyInfo), '("family", SocketAddressFamilyPropertyInfo), '("path", UnixSocketAddressPathPropertyInfo), '("pathAsArray", UnixSocketAddressPathAsArrayPropertyInfo)] :: [(Symbol, *)])
 
+unixSocketAddressAbstract :: AttrLabelProxy "abstract"
+unixSocketAddressAbstract = AttrLabelProxy
+
+unixSocketAddressAddressType :: AttrLabelProxy "addressType"
+unixSocketAddressAddressType = AttrLabelProxy
+
+unixSocketAddressPath :: AttrLabelProxy "path"
+unixSocketAddressPath = AttrLabelProxy
+
+unixSocketAddressPathAsArray :: AttrLabelProxy "pathAsArray"
+unixSocketAddressPathAsArray = AttrLabelProxy
+
 type instance SignalList UnixSocketAddress = UnixSocketAddressSignalList
 type UnixSocketAddressSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -252,7 +276,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixSocketAddress"
+-- returnType : Just (TInterface "Gio" "UnixSocketAddress")
 -- throws : False
 -- Skip return : False
 
@@ -275,15 +299,15 @@
 
 -- method UnixSocketAddress::new_abstract
 -- method type : Constructor
--- Args : [Arg {argCName = "path", argType = TCArray False (-1) 1 (TBasicType TInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path_len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "path_len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "UnixSocketAddress"
+-- Args : [Arg {argCName = "path", argType = TCArray False (-1) 1 (TBasicType TInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path_len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "path_len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TInterface "Gio" "UnixSocketAddress")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_socket_address_new_abstract" g_unix_socket_address_new_abstract :: 
     Ptr Int8 ->                             -- path : TCArray False (-1) 1 (TBasicType TInt8)
-    Int32 ->                                -- path_len : TBasicType TInt32
+    Int32 ->                                -- path_len : TBasicType TInt
     IO (Ptr UnixSocketAddress)
 
 {-# DEPRECATED unixSocketAddressNewAbstract ["Use g_unix_socket_address_new_with_type()."]#-}
@@ -302,15 +326,15 @@
 
 -- method UnixSocketAddress::new_with_type
 -- method type : Constructor
--- Args : [Arg {argCName = "path", argType = TCArray False (-1) 1 (TBasicType TInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path_len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "UnixSocketAddressType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- Lengths : [Arg {argCName = "path_len", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TInterface "Gio" "UnixSocketAddress"
+-- Args : [Arg {argCName = "path", argType = TCArray False (-1) 1 (TBasicType TInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path_len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "UnixSocketAddressType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Lengths : [Arg {argCName = "path_len", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- returnType : Just (TInterface "Gio" "UnixSocketAddress")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_unix_socket_address_new_with_type" g_unix_socket_address_new_with_type :: 
     Ptr Int8 ->                             -- path : TCArray False (-1) 1 (TBasicType TInt8)
-    Int32 ->                                -- path_len : TBasicType TInt32
+    Int32 ->                                -- path_len : TBasicType TInt
     CUInt ->                                -- type : TInterface "Gio" "UnixSocketAddressType"
     IO (Ptr UnixSocketAddress)
 
@@ -334,7 +358,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "UnixSocketAddressType"
+-- returnType : Just (TInterface "Gio" "UnixSocketAddressType")
 -- throws : False
 -- Skip return : False
 
@@ -362,7 +386,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -390,7 +414,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -419,7 +443,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixSocketAddress", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt64
+-- returnType : Just (TBasicType TUInt64)
 -- throws : False
 -- Skip return : False
 
@@ -446,7 +470,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/UnixSocketAddress.hs-boot b/GI/Gio/Objects/UnixSocketAddress.hs-boot
--- a/GI/Gio/Objects/UnixSocketAddress.hs-boot
+++ b/GI/Gio/Objects/UnixSocketAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.UnixSocketAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/Vfs.hs b/GI/Gio/Objects/Vfs.hs
--- a/GI/Gio/Objects/Vfs.hs
+++ b/GI/Gio/Objects/Vfs.hs
@@ -54,9 +54,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -134,7 +134,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Vfs", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -167,7 +167,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Vfs", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uri", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -200,7 +200,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Vfs", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -229,7 +229,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Vfs", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -257,7 +257,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Vfs", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parse_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "File"
+-- returnType : Just (TInterface "Gio" "File")
 -- throws : False
 -- Skip return : False
 
@@ -290,7 +290,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Vfs"
+-- returnType : Just (TInterface "Gio" "Vfs")
 -- throws : False
 -- Skip return : False
 
@@ -311,7 +311,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "Vfs"
+-- returnType : Just (TInterface "Gio" "Vfs")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/Vfs.hs-boot b/GI/Gio/Objects/Vfs.hs-boot
--- a/GI/Gio/Objects/Vfs.hs-boot
+++ b/GI/Gio/Objects/Vfs.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.Vfs where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/VolumeMonitor.hs b/GI/Gio/Objects/VolumeMonitor.hs
--- a/GI/Gio/Objects/VolumeMonitor.hs
+++ b/GI/Gio/Objects/VolumeMonitor.hs
@@ -201,9 +201,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -845,7 +845,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "VolumeMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "Drive")
+-- returnType : Just (TGList (TInterface "Gio" "Drive"))
 -- throws : False
 -- Skip return : False
 
@@ -861,7 +861,6 @@
 volumeMonitorGetConnectedDrives _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_volume_monitor_get_connected_drives _obj'
-    checkUnexpectedReturnNULL "g_volume_monitor_get_connected_drives" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject Drive) result'
     g_list_free result
@@ -876,7 +875,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "VolumeMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uuid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Mount"
+-- returnType : Just (TInterface "Gio" "Mount")
 -- throws : False
 -- Skip return : False
 
@@ -909,7 +908,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "VolumeMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "Mount")
+-- returnType : Just (TGList (TInterface "Gio" "Mount"))
 -- throws : False
 -- Skip return : False
 
@@ -925,7 +924,6 @@
 volumeMonitorGetMounts _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_volume_monitor_get_mounts _obj'
-    checkUnexpectedReturnNULL "g_volume_monitor_get_mounts" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject Mount) result'
     g_list_free result
@@ -940,7 +938,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "VolumeMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "uuid", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Volume"
+-- returnType : Just (TInterface "Gio" "Volume")
 -- throws : False
 -- Skip return : False
 
@@ -973,7 +971,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "VolumeMonitor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "Volume")
+-- returnType : Just (TGList (TInterface "Gio" "Volume"))
 -- throws : False
 -- Skip return : False
 
@@ -989,7 +987,6 @@
 volumeMonitorGetVolumes _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- g_volume_monitor_get_volumes _obj'
-    checkUnexpectedReturnNULL "g_volume_monitor_get_volumes" result
     result' <- unpackGList result
     result'' <- mapM (wrapObject Volume) result'
     g_list_free result
@@ -1004,7 +1001,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "mount", argType = TInterface "Gio" "Mount", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Volume"
+-- returnType : Just (TInterface "Gio" "Volume")
 -- throws : False
 -- Skip return : False
 
@@ -1029,7 +1026,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "VolumeMonitor"
+-- returnType : Just (TInterface "Gio" "VolumeMonitor")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/VolumeMonitor.hs-boot b/GI/Gio/Objects/VolumeMonitor.hs-boot
--- a/GI/Gio/Objects/VolumeMonitor.hs-boot
+++ b/GI/Gio/Objects/VolumeMonitor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.VolumeMonitor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ZlibCompressor.hs b/GI/Gio/Objects/ZlibCompressor.hs
--- a/GI/Gio/Objects/ZlibCompressor.hs
+++ b/GI/Gio/Objects/ZlibCompressor.hs
@@ -36,30 +36,34 @@
  -- * Properties
 -- ** FileInfo
     ZlibCompressorFileInfoPropertyInfo      ,
+    clearZlibCompressorFileInfo             ,
     constructZlibCompressorFileInfo         ,
     getZlibCompressorFileInfo               ,
     setZlibCompressorFileInfo               ,
+    zlibCompressorFileInfo                  ,
 
 
 -- ** Format
     ZlibCompressorFormatPropertyInfo        ,
     constructZlibCompressorFormat           ,
     getZlibCompressorFormat                 ,
+    zlibCompressorFormat                    ,
 
 
 -- ** Level
     ZlibCompressorLevelPropertyInfo         ,
     constructZlibCompressorLevel            ,
     getZlibCompressorLevel                  ,
+    zlibCompressorLevel                     ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -129,19 +133,23 @@
 -- VVV Prop "file-info"
    -- Type: TInterface "Gio" "FileInfo"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just True)
 
 getZlibCompressorFileInfo :: (MonadIO m, ZlibCompressorK o) => o -> m FileInfo
-getZlibCompressorFileInfo obj = liftIO $ getObjectPropertyObject obj "file-info" FileInfo
+getZlibCompressorFileInfo obj = liftIO $ checkUnexpectedNothing "getZlibCompressorFileInfo" $ getObjectPropertyObject obj "file-info" FileInfo
 
 setZlibCompressorFileInfo :: (MonadIO m, ZlibCompressorK o, FileInfoK a) => o -> a -> m ()
-setZlibCompressorFileInfo obj val = liftIO $ setObjectPropertyObject obj "file-info" val
+setZlibCompressorFileInfo obj val = liftIO $ setObjectPropertyObject obj "file-info" (Just val)
 
 constructZlibCompressorFileInfo :: (FileInfoK a) => a -> IO ([Char], GValue)
-constructZlibCompressorFileInfo val = constructObjectPropertyObject "file-info" val
+constructZlibCompressorFileInfo val = constructObjectPropertyObject "file-info" (Just val)
 
+clearZlibCompressorFileInfo :: (MonadIO m, ZlibCompressorK o) => o -> m ()
+clearZlibCompressorFileInfo obj = liftIO $ setObjectPropertyObject obj "file-info" (Nothing :: Maybe FileInfo)
+
 data ZlibCompressorFileInfoPropertyInfo
 instance AttrInfo ZlibCompressorFileInfoPropertyInfo where
-    type AttrAllowedOps ZlibCompressorFileInfoPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps ZlibCompressorFileInfoPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ZlibCompressorFileInfoPropertyInfo = FileInfoK
     type AttrBaseTypeConstraint ZlibCompressorFileInfoPropertyInfo = ZlibCompressorK
     type AttrGetType ZlibCompressorFileInfoPropertyInfo = FileInfo
@@ -149,10 +157,12 @@
     attrGet _ = getZlibCompressorFileInfo
     attrSet _ = setZlibCompressorFileInfo
     attrConstruct _ = constructZlibCompressorFileInfo
+    attrClear _ = clearZlibCompressorFileInfo
 
 -- VVV Prop "format"
    -- Type: TInterface "Gio" "ZlibCompressorFormat"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getZlibCompressorFormat :: (MonadIO m, ZlibCompressorK o) => o -> m ZlibCompressorFormat
 getZlibCompressorFormat obj = liftIO $ getObjectPropertyEnum obj "format"
@@ -170,16 +180,18 @@
     attrGet _ = getZlibCompressorFormat
     attrSet _ = undefined
     attrConstruct _ = constructZlibCompressorFormat
+    attrClear _ = undefined
 
 -- VVV Prop "level"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getZlibCompressorLevel :: (MonadIO m, ZlibCompressorK o) => o -> m Int32
-getZlibCompressorLevel obj = liftIO $ getObjectPropertyCInt obj "level"
+getZlibCompressorLevel obj = liftIO $ getObjectPropertyInt32 obj "level"
 
 constructZlibCompressorLevel :: Int32 -> IO ([Char], GValue)
-constructZlibCompressorLevel val = constructObjectPropertyCInt "level" val
+constructZlibCompressorLevel val = constructObjectPropertyInt32 "level" val
 
 data ZlibCompressorLevelPropertyInfo
 instance AttrInfo ZlibCompressorLevelPropertyInfo where
@@ -191,24 +203,34 @@
     attrGet _ = getZlibCompressorLevel
     attrSet _ = undefined
     attrConstruct _ = constructZlibCompressorLevel
+    attrClear _ = undefined
 
 type instance AttributeList ZlibCompressor = ZlibCompressorAttributeList
 type ZlibCompressorAttributeList = ('[ '("fileInfo", ZlibCompressorFileInfoPropertyInfo), '("format", ZlibCompressorFormatPropertyInfo), '("level", ZlibCompressorLevelPropertyInfo)] :: [(Symbol, *)])
 
+zlibCompressorFileInfo :: AttrLabelProxy "fileInfo"
+zlibCompressorFileInfo = AttrLabelProxy
+
+zlibCompressorFormat :: AttrLabelProxy "format"
+zlibCompressorFormat = AttrLabelProxy
+
+zlibCompressorLevel :: AttrLabelProxy "level"
+zlibCompressorLevel = AttrLabelProxy
+
 type instance SignalList ZlibCompressor = ZlibCompressorSignalList
 type ZlibCompressorSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method ZlibCompressor::new
 -- method type : Constructor
--- Args : [Arg {argCName = "format", argType = TInterface "Gio" "ZlibCompressorFormat", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "format", argType = TInterface "Gio" "ZlibCompressorFormat", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "level", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ZlibCompressor"
+-- returnType : Just (TInterface "Gio" "ZlibCompressor")
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_zlib_compressor_new" g_zlib_compressor_new :: 
     CUInt ->                                -- format : TInterface "Gio" "ZlibCompressorFormat"
-    Int32 ->                                -- level : TBasicType TInt32
+    Int32 ->                                -- level : TBasicType TInt
     IO (Ptr ZlibCompressor)
 
 
@@ -228,7 +250,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ZlibCompressor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : False
 -- Skip return : False
 
@@ -257,7 +279,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ZlibCompressor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "file_info", argType = TInterface "Gio" "FileInfo", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ZlibCompressor.hs-boot b/GI/Gio/Objects/ZlibCompressor.hs-boot
--- a/GI/Gio/Objects/ZlibCompressor.hs-boot
+++ b/GI/Gio/Objects/ZlibCompressor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ZlibCompressor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Objects/ZlibDecompressor.hs b/GI/Gio/Objects/ZlibDecompressor.hs
--- a/GI/Gio/Objects/ZlibDecompressor.hs
+++ b/GI/Gio/Objects/ZlibDecompressor.hs
@@ -32,21 +32,23 @@
 -- ** FileInfo
     ZlibDecompressorFileInfoPropertyInfo    ,
     getZlibDecompressorFileInfo             ,
+    zlibDecompressorFileInfo                ,
 
 
 -- ** Format
     ZlibDecompressorFormatPropertyInfo      ,
     constructZlibDecompressorFormat         ,
     getZlibDecompressorFormat               ,
+    zlibDecompressorFormat                  ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -115,13 +117,14 @@
 -- VVV Prop "file-info"
    -- Type: TInterface "Gio" "FileInfo"
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getZlibDecompressorFileInfo :: (MonadIO m, ZlibDecompressorK o) => o -> m FileInfo
-getZlibDecompressorFileInfo obj = liftIO $ getObjectPropertyObject obj "file-info" FileInfo
+getZlibDecompressorFileInfo obj = liftIO $ checkUnexpectedNothing "getZlibDecompressorFileInfo" $ getObjectPropertyObject obj "file-info" FileInfo
 
 data ZlibDecompressorFileInfoPropertyInfo
 instance AttrInfo ZlibDecompressorFileInfoPropertyInfo where
-    type AttrAllowedOps ZlibDecompressorFileInfoPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps ZlibDecompressorFileInfoPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint ZlibDecompressorFileInfoPropertyInfo = (~) ()
     type AttrBaseTypeConstraint ZlibDecompressorFileInfoPropertyInfo = ZlibDecompressorK
     type AttrGetType ZlibDecompressorFileInfoPropertyInfo = FileInfo
@@ -129,10 +132,12 @@
     attrGet _ = getZlibDecompressorFileInfo
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "format"
    -- Type: TInterface "Gio" "ZlibCompressorFormat"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getZlibDecompressorFormat :: (MonadIO m, ZlibDecompressorK o) => o -> m ZlibCompressorFormat
 getZlibDecompressorFormat obj = liftIO $ getObjectPropertyEnum obj "format"
@@ -150,10 +155,17 @@
     attrGet _ = getZlibDecompressorFormat
     attrSet _ = undefined
     attrConstruct _ = constructZlibDecompressorFormat
+    attrClear _ = undefined
 
 type instance AttributeList ZlibDecompressor = ZlibDecompressorAttributeList
 type ZlibDecompressorAttributeList = ('[ '("fileInfo", ZlibDecompressorFileInfoPropertyInfo), '("format", ZlibDecompressorFormatPropertyInfo)] :: [(Symbol, *)])
 
+zlibDecompressorFileInfo :: AttrLabelProxy "fileInfo"
+zlibDecompressorFileInfo = AttrLabelProxy
+
+zlibDecompressorFormat :: AttrLabelProxy "format"
+zlibDecompressorFormat = AttrLabelProxy
+
 type instance SignalList ZlibDecompressor = ZlibDecompressorSignalList
 type ZlibDecompressorSignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
@@ -161,7 +173,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "format", argType = TInterface "Gio" "ZlibCompressorFormat", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "ZlibDecompressor"
+-- returnType : Just (TInterface "Gio" "ZlibDecompressor")
 -- throws : False
 -- Skip return : False
 
@@ -185,7 +197,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "ZlibDecompressor", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileInfo"
+-- returnType : Just (TInterface "Gio" "FileInfo")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Objects/ZlibDecompressor.hs-boot b/GI/Gio/Objects/ZlibDecompressor.hs-boot
--- a/GI/Gio/Objects/ZlibDecompressor.hs-boot
+++ b/GI/Gio/Objects/ZlibDecompressor.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Objects.ZlibDecompressor where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs.hs b/GI/Gio/Structs.hs
--- a/GI/Gio/Structs.hs
+++ b/GI/Gio/Structs.hs
@@ -76,9 +76,9 @@
 import GI.Gio.Structs.UnixMountEntry
 import GI.Gio.Structs.UnixMountPoint
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/ActionEntry.hs b/GI/Gio/Structs/ActionEntry.hs
--- a/GI/Gio/Structs/ActionEntry.hs
+++ b/GI/Gio/Structs/ActionEntry.hs
@@ -28,24 +28,33 @@
 
  -- * Properties
 -- ** Name
+    actionEntryClearName                    ,
+    actionEntryName                         ,
     actionEntryReadName                     ,
+    actionEntryWriteName                    ,
 
 
 -- ** ParameterType
+    actionEntryClearParameterType           ,
+    actionEntryParameterType                ,
     actionEntryReadParameterType            ,
+    actionEntryWriteParameterType           ,
 
 
 -- ** State
+    actionEntryClearState                   ,
     actionEntryReadState                    ,
+    actionEntryState                        ,
+    actionEntryWriteState                   ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -58,30 +67,117 @@
 newZeroActionEntry :: MonadIO m => m ActionEntry
 newZeroActionEntry = liftIO $ callocBytes 64 >>= wrapPtr ActionEntry
 
+instance tag ~ 'AttrSet => Constructible ActionEntry tag where
+    new _ attrs = do
+        o <- newZeroActionEntry
+        GI.Attributes.set o attrs
+        return o
+
+
 noActionEntry :: Maybe ActionEntry
 noActionEntry = Nothing
 
-actionEntryReadName :: ActionEntry -> IO T.Text
-actionEntryReadName s = withManagedPtr s $ \ptr -> do
+actionEntryReadName :: MonadIO m => ActionEntry -> m (Maybe T.Text)
+actionEntryReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
--- XXX Skipped getter for "ActionEntry:activate" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+actionEntryWriteName :: MonadIO m => ActionEntry -> CString -> m ()
+actionEntryWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: CString)
 
-actionEntryReadParameterType :: ActionEntry -> IO T.Text
-actionEntryReadParameterType s = withManagedPtr s $ \ptr -> do
+actionEntryClearName :: MonadIO m => ActionEntry -> m ()
+actionEntryClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: CString)
+
+data ActionEntryNameFieldInfo
+instance AttrInfo ActionEntryNameFieldInfo where
+    type AttrAllowedOps ActionEntryNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint ActionEntryNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint ActionEntryNameFieldInfo = (~) ActionEntry
+    type AttrGetType ActionEntryNameFieldInfo = Maybe T.Text
+    type AttrLabel ActionEntryNameFieldInfo = "name"
+    attrGet _ = actionEntryReadName
+    attrSet _ = actionEntryWriteName
+    attrConstruct = undefined
+    attrClear _ = actionEntryClearName
+
+actionEntryName :: AttrLabelProxy "name"
+actionEntryName = AttrLabelProxy
+
+
+-- XXX Skipped attribute for "ActionEntry:activate" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+actionEntryReadParameterType :: MonadIO m => ActionEntry -> m (Maybe T.Text)
+actionEntryReadParameterType s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-actionEntryReadState :: ActionEntry -> IO T.Text
-actionEntryReadState s = withManagedPtr s $ \ptr -> do
+actionEntryWriteParameterType :: MonadIO m => ActionEntry -> CString -> m ()
+actionEntryWriteParameterType s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: CString)
+
+actionEntryClearParameterType :: MonadIO m => ActionEntry -> m ()
+actionEntryClearParameterType s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: CString)
+
+data ActionEntryParameterTypeFieldInfo
+instance AttrInfo ActionEntryParameterTypeFieldInfo where
+    type AttrAllowedOps ActionEntryParameterTypeFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint ActionEntryParameterTypeFieldInfo = (~) CString
+    type AttrBaseTypeConstraint ActionEntryParameterTypeFieldInfo = (~) ActionEntry
+    type AttrGetType ActionEntryParameterTypeFieldInfo = Maybe T.Text
+    type AttrLabel ActionEntryParameterTypeFieldInfo = "parameter_type"
+    attrGet _ = actionEntryReadParameterType
+    attrSet _ = actionEntryWriteParameterType
+    attrConstruct = undefined
+    attrClear _ = actionEntryClearParameterType
+
+actionEntryParameterType :: AttrLabelProxy "parameterType"
+actionEntryParameterType = AttrLabelProxy
+
+
+actionEntryReadState :: MonadIO m => ActionEntry -> m (Maybe T.Text)
+actionEntryReadState s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
--- XXX Skipped getter for "ActionEntry:change_state" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+actionEntryWriteState :: MonadIO m => ActionEntry -> CString -> m ()
+actionEntryWriteState s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: CString)
+
+actionEntryClearState :: MonadIO m => ActionEntry -> m ()
+actionEntryClearState s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: CString)
+
+data ActionEntryStateFieldInfo
+instance AttrInfo ActionEntryStateFieldInfo where
+    type AttrAllowedOps ActionEntryStateFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint ActionEntryStateFieldInfo = (~) CString
+    type AttrBaseTypeConstraint ActionEntryStateFieldInfo = (~) ActionEntry
+    type AttrGetType ActionEntryStateFieldInfo = Maybe T.Text
+    type AttrLabel ActionEntryStateFieldInfo = "state"
+    attrGet _ = actionEntryReadState
+    attrSet _ = actionEntryWriteState
+    attrConstruct = undefined
+    attrClear _ = actionEntryClearState
+
+actionEntryState :: AttrLabelProxy "state"
+actionEntryState = AttrLabelProxy
+
+
+-- XXX Skipped attribute for "ActionEntry:change_state" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+
+type instance AttributeList ActionEntry = ActionEntryAttributeList
+type ActionEntryAttributeList = ('[ '("name", ActionEntryNameFieldInfo), '("parameterType", ActionEntryParameterTypeFieldInfo), '("state", ActionEntryStateFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveActionEntryMethod (t :: Symbol) (o :: *) :: * where
     ResolveActionEntryMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/ActionEntry.hs-boot b/GI/Gio/Structs/ActionEntry.hs-boot
--- a/GI/Gio/Structs/ActionEntry.hs-boot
+++ b/GI/Gio/Structs/ActionEntry.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.ActionEntry where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusAnnotationInfo.hs b/GI/Gio/Structs/DBusAnnotationInfo.hs
--- a/GI/Gio/Structs/DBusAnnotationInfo.hs
+++ b/GI/Gio/Structs/DBusAnnotationInfo.hs
@@ -36,28 +36,39 @@
 
  -- * Properties
 -- ** Annotations
+    dBusAnnotationInfoAnnotations           ,
+    dBusAnnotationInfoClearAnnotations      ,
     dBusAnnotationInfoReadAnnotations       ,
+    dBusAnnotationInfoWriteAnnotations      ,
 
 
 -- ** Key
+    dBusAnnotationInfoClearKey              ,
+    dBusAnnotationInfoKey                   ,
     dBusAnnotationInfoReadKey               ,
+    dBusAnnotationInfoWriteKey              ,
 
 
 -- ** RefCount
     dBusAnnotationInfoReadRefCount          ,
+    dBusAnnotationInfoRefCount              ,
+    dBusAnnotationInfoWriteRefCount         ,
 
 
 -- ** Value
+    dBusAnnotationInfoClearValue            ,
     dBusAnnotationInfoReadValue             ,
+    dBusAnnotationInfoValue                 ,
+    dBusAnnotationInfoWriteValue            ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -76,38 +87,147 @@
 newZeroDBusAnnotationInfo :: MonadIO m => m DBusAnnotationInfo
 newZeroDBusAnnotationInfo = liftIO $ callocBoxedBytes 32 >>= wrapBoxed DBusAnnotationInfo
 
+instance tag ~ 'AttrSet => Constructible DBusAnnotationInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusAnnotationInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusAnnotationInfo :: Maybe DBusAnnotationInfo
 noDBusAnnotationInfo = Nothing
 
-dBusAnnotationInfoReadRefCount :: DBusAnnotationInfo -> IO Int32
-dBusAnnotationInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusAnnotationInfoReadRefCount :: MonadIO m => DBusAnnotationInfo -> m Int32
+dBusAnnotationInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusAnnotationInfoReadKey :: DBusAnnotationInfo -> IO T.Text
-dBusAnnotationInfoReadKey s = withManagedPtr s $ \ptr -> do
+dBusAnnotationInfoWriteRefCount :: MonadIO m => DBusAnnotationInfo -> Int32 -> m ()
+dBusAnnotationInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusAnnotationInfoRefCountFieldInfo
+instance AttrInfo DBusAnnotationInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusAnnotationInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusAnnotationInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusAnnotationInfoRefCountFieldInfo = (~) DBusAnnotationInfo
+    type AttrGetType DBusAnnotationInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusAnnotationInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusAnnotationInfoReadRefCount
+    attrSet _ = dBusAnnotationInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusAnnotationInfoRefCount :: AttrLabelProxy "refCount"
+dBusAnnotationInfoRefCount = AttrLabelProxy
+
+
+dBusAnnotationInfoReadKey :: MonadIO m => DBusAnnotationInfo -> m (Maybe T.Text)
+dBusAnnotationInfoReadKey s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusAnnotationInfoReadValue :: DBusAnnotationInfo -> IO T.Text
-dBusAnnotationInfoReadValue s = withManagedPtr s $ \ptr -> do
+dBusAnnotationInfoWriteKey :: MonadIO m => DBusAnnotationInfo -> CString -> m ()
+dBusAnnotationInfoWriteKey s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusAnnotationInfoClearKey :: MonadIO m => DBusAnnotationInfo -> m ()
+dBusAnnotationInfoClearKey s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusAnnotationInfoKeyFieldInfo
+instance AttrInfo DBusAnnotationInfoKeyFieldInfo where
+    type AttrAllowedOps DBusAnnotationInfoKeyFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusAnnotationInfoKeyFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusAnnotationInfoKeyFieldInfo = (~) DBusAnnotationInfo
+    type AttrGetType DBusAnnotationInfoKeyFieldInfo = Maybe T.Text
+    type AttrLabel DBusAnnotationInfoKeyFieldInfo = "key"
+    attrGet _ = dBusAnnotationInfoReadKey
+    attrSet _ = dBusAnnotationInfoWriteKey
+    attrConstruct = undefined
+    attrClear _ = dBusAnnotationInfoClearKey
+
+dBusAnnotationInfoKey :: AttrLabelProxy "key"
+dBusAnnotationInfoKey = AttrLabelProxy
+
+
+dBusAnnotationInfoReadValue :: MonadIO m => DBusAnnotationInfo -> m (Maybe T.Text)
+dBusAnnotationInfoReadValue s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusAnnotationInfoReadAnnotations :: DBusAnnotationInfo -> IO [DBusAnnotationInfo]
-dBusAnnotationInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusAnnotationInfoWriteValue :: MonadIO m => DBusAnnotationInfo -> CString -> m ()
+dBusAnnotationInfoWriteValue s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: CString)
+
+dBusAnnotationInfoClearValue :: MonadIO m => DBusAnnotationInfo -> m ()
+dBusAnnotationInfoClearValue s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: CString)
+
+data DBusAnnotationInfoValueFieldInfo
+instance AttrInfo DBusAnnotationInfoValueFieldInfo where
+    type AttrAllowedOps DBusAnnotationInfoValueFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusAnnotationInfoValueFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusAnnotationInfoValueFieldInfo = (~) DBusAnnotationInfo
+    type AttrGetType DBusAnnotationInfoValueFieldInfo = Maybe T.Text
+    type AttrLabel DBusAnnotationInfoValueFieldInfo = "value"
+    attrGet _ = dBusAnnotationInfoReadValue
+    attrSet _ = dBusAnnotationInfoWriteValue
+    attrConstruct = undefined
+    attrClear _ = dBusAnnotationInfoClearValue
+
+dBusAnnotationInfoValue :: AttrLabelProxy "value"
+dBusAnnotationInfoValue = AttrLabelProxy
+
+
+dBusAnnotationInfoReadAnnotations :: MonadIO m => DBusAnnotationInfo -> m (Maybe [DBusAnnotationInfo])
+dBusAnnotationInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusAnnotationInfoWriteAnnotations :: MonadIO m => DBusAnnotationInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusAnnotationInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusAnnotationInfoClearAnnotations :: MonadIO m => DBusAnnotationInfo -> m ()
+dBusAnnotationInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusAnnotationInfoAnnotationsFieldInfo
+instance AttrInfo DBusAnnotationInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusAnnotationInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusAnnotationInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusAnnotationInfoAnnotationsFieldInfo = (~) DBusAnnotationInfo
+    type AttrGetType DBusAnnotationInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusAnnotationInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusAnnotationInfoReadAnnotations
+    attrSet _ = dBusAnnotationInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusAnnotationInfoClearAnnotations
+
+dBusAnnotationInfoAnnotations :: AttrLabelProxy "annotations"
+dBusAnnotationInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusAnnotationInfo = DBusAnnotationInfoAttributeList
+type DBusAnnotationInfoAttributeList = ('[ '("refCount", DBusAnnotationInfoRefCountFieldInfo), '("key", DBusAnnotationInfoKeyFieldInfo), '("value", DBusAnnotationInfoValueFieldInfo), '("annotations", DBusAnnotationInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusAnnotationInfo::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusAnnotationInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusAnnotationInfo"
+-- returnType : Just (TInterface "Gio" "DBusAnnotationInfo")
 -- throws : False
 -- Skip return : False
 
@@ -136,7 +256,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusAnnotationInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -163,7 +283,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "annotations", argType = TCArray True (-1) (-1) (TInterface "Gio" "DBusAnnotationInfo"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusAnnotationInfo.hs-boot b/GI/Gio/Structs/DBusAnnotationInfo.hs-boot
--- a/GI/Gio/Structs/DBusAnnotationInfo.hs-boot
+++ b/GI/Gio/Structs/DBusAnnotationInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusAnnotationInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusArgInfo.hs b/GI/Gio/Structs/DBusArgInfo.hs
--- a/GI/Gio/Structs/DBusArgInfo.hs
+++ b/GI/Gio/Structs/DBusArgInfo.hs
@@ -32,28 +32,39 @@
 
  -- * Properties
 -- ** Annotations
+    dBusArgInfoAnnotations                  ,
+    dBusArgInfoClearAnnotations             ,
     dBusArgInfoReadAnnotations              ,
+    dBusArgInfoWriteAnnotations             ,
 
 
 -- ** Name
+    dBusArgInfoClearName                    ,
+    dBusArgInfoName                         ,
     dBusArgInfoReadName                     ,
+    dBusArgInfoWriteName                    ,
 
 
 -- ** RefCount
     dBusArgInfoReadRefCount                 ,
+    dBusArgInfoRefCount                     ,
+    dBusArgInfoWriteRefCount                ,
 
 
 -- ** Signature
+    dBusArgInfoClearSignature               ,
     dBusArgInfoReadSignature                ,
+    dBusArgInfoSignature                    ,
+    dBusArgInfoWriteSignature               ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -72,38 +83,147 @@
 newZeroDBusArgInfo :: MonadIO m => m DBusArgInfo
 newZeroDBusArgInfo = liftIO $ callocBoxedBytes 32 >>= wrapBoxed DBusArgInfo
 
+instance tag ~ 'AttrSet => Constructible DBusArgInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusArgInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusArgInfo :: Maybe DBusArgInfo
 noDBusArgInfo = Nothing
 
-dBusArgInfoReadRefCount :: DBusArgInfo -> IO Int32
-dBusArgInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusArgInfoReadRefCount :: MonadIO m => DBusArgInfo -> m Int32
+dBusArgInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusArgInfoReadName :: DBusArgInfo -> IO T.Text
-dBusArgInfoReadName s = withManagedPtr s $ \ptr -> do
+dBusArgInfoWriteRefCount :: MonadIO m => DBusArgInfo -> Int32 -> m ()
+dBusArgInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusArgInfoRefCountFieldInfo
+instance AttrInfo DBusArgInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusArgInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusArgInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusArgInfoRefCountFieldInfo = (~) DBusArgInfo
+    type AttrGetType DBusArgInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusArgInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusArgInfoReadRefCount
+    attrSet _ = dBusArgInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusArgInfoRefCount :: AttrLabelProxy "refCount"
+dBusArgInfoRefCount = AttrLabelProxy
+
+
+dBusArgInfoReadName :: MonadIO m => DBusArgInfo -> m (Maybe T.Text)
+dBusArgInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusArgInfoReadSignature :: DBusArgInfo -> IO T.Text
-dBusArgInfoReadSignature s = withManagedPtr s $ \ptr -> do
+dBusArgInfoWriteName :: MonadIO m => DBusArgInfo -> CString -> m ()
+dBusArgInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusArgInfoClearName :: MonadIO m => DBusArgInfo -> m ()
+dBusArgInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusArgInfoNameFieldInfo
+instance AttrInfo DBusArgInfoNameFieldInfo where
+    type AttrAllowedOps DBusArgInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusArgInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusArgInfoNameFieldInfo = (~) DBusArgInfo
+    type AttrGetType DBusArgInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusArgInfoNameFieldInfo = "name"
+    attrGet _ = dBusArgInfoReadName
+    attrSet _ = dBusArgInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = dBusArgInfoClearName
+
+dBusArgInfoName :: AttrLabelProxy "name"
+dBusArgInfoName = AttrLabelProxy
+
+
+dBusArgInfoReadSignature :: MonadIO m => DBusArgInfo -> m (Maybe T.Text)
+dBusArgInfoReadSignature s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusArgInfoReadAnnotations :: DBusArgInfo -> IO [DBusAnnotationInfo]
-dBusArgInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusArgInfoWriteSignature :: MonadIO m => DBusArgInfo -> CString -> m ()
+dBusArgInfoWriteSignature s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: CString)
+
+dBusArgInfoClearSignature :: MonadIO m => DBusArgInfo -> m ()
+dBusArgInfoClearSignature s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: CString)
+
+data DBusArgInfoSignatureFieldInfo
+instance AttrInfo DBusArgInfoSignatureFieldInfo where
+    type AttrAllowedOps DBusArgInfoSignatureFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusArgInfoSignatureFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusArgInfoSignatureFieldInfo = (~) DBusArgInfo
+    type AttrGetType DBusArgInfoSignatureFieldInfo = Maybe T.Text
+    type AttrLabel DBusArgInfoSignatureFieldInfo = "signature"
+    attrGet _ = dBusArgInfoReadSignature
+    attrSet _ = dBusArgInfoWriteSignature
+    attrConstruct = undefined
+    attrClear _ = dBusArgInfoClearSignature
+
+dBusArgInfoSignature :: AttrLabelProxy "signature"
+dBusArgInfoSignature = AttrLabelProxy
+
+
+dBusArgInfoReadAnnotations :: MonadIO m => DBusArgInfo -> m (Maybe [DBusAnnotationInfo])
+dBusArgInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusArgInfoWriteAnnotations :: MonadIO m => DBusArgInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusArgInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusArgInfoClearAnnotations :: MonadIO m => DBusArgInfo -> m ()
+dBusArgInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusArgInfoAnnotationsFieldInfo
+instance AttrInfo DBusArgInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusArgInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusArgInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusArgInfoAnnotationsFieldInfo = (~) DBusArgInfo
+    type AttrGetType DBusArgInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusArgInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusArgInfoReadAnnotations
+    attrSet _ = dBusArgInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusArgInfoClearAnnotations
+
+dBusArgInfoAnnotations :: AttrLabelProxy "annotations"
+dBusArgInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusArgInfo = DBusArgInfoAttributeList
+type DBusArgInfoAttributeList = ('[ '("refCount", DBusArgInfoRefCountFieldInfo), '("name", DBusArgInfoNameFieldInfo), '("signature", DBusArgInfoSignatureFieldInfo), '("annotations", DBusArgInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusArgInfo::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusArgInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusArgInfo"
+-- returnType : Just (TInterface "Gio" "DBusArgInfo")
 -- throws : False
 -- Skip return : False
 
@@ -132,7 +252,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusArgInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusArgInfo.hs-boot b/GI/Gio/Structs/DBusArgInfo.hs-boot
--- a/GI/Gio/Structs/DBusArgInfo.hs-boot
+++ b/GI/Gio/Structs/DBusArgInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusArgInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusErrorEntry.hs b/GI/Gio/Structs/DBusErrorEntry.hs
--- a/GI/Gio/Structs/DBusErrorEntry.hs
+++ b/GI/Gio/Structs/DBusErrorEntry.hs
@@ -19,20 +19,25 @@
 
  -- * Properties
 -- ** DbusErrorName
+    dBusErrorEntryClearDbusErrorName        ,
+    dBusErrorEntryDbusErrorName             ,
     dBusErrorEntryReadDbusErrorName         ,
+    dBusErrorEntryWriteDbusErrorName        ,
 
 
 -- ** ErrorCode
+    dBusErrorEntryErrorCode                 ,
     dBusErrorEntryReadErrorCode             ,
+    dBusErrorEntryWriteErrorCode            ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -45,19 +50,76 @@
 newZeroDBusErrorEntry :: MonadIO m => m DBusErrorEntry
 newZeroDBusErrorEntry = liftIO $ callocBytes 16 >>= wrapPtr DBusErrorEntry
 
+instance tag ~ 'AttrSet => Constructible DBusErrorEntry tag where
+    new _ attrs = do
+        o <- newZeroDBusErrorEntry
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusErrorEntry :: Maybe DBusErrorEntry
 noDBusErrorEntry = Nothing
 
-dBusErrorEntryReadErrorCode :: DBusErrorEntry -> IO Int32
-dBusErrorEntryReadErrorCode s = withManagedPtr s $ \ptr -> do
+dBusErrorEntryReadErrorCode :: MonadIO m => DBusErrorEntry -> m Int32
+dBusErrorEntryReadErrorCode s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusErrorEntryReadDbusErrorName :: DBusErrorEntry -> IO T.Text
-dBusErrorEntryReadDbusErrorName s = withManagedPtr s $ \ptr -> do
+dBusErrorEntryWriteErrorCode :: MonadIO m => DBusErrorEntry -> Int32 -> m ()
+dBusErrorEntryWriteErrorCode s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusErrorEntryErrorCodeFieldInfo
+instance AttrInfo DBusErrorEntryErrorCodeFieldInfo where
+    type AttrAllowedOps DBusErrorEntryErrorCodeFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusErrorEntryErrorCodeFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusErrorEntryErrorCodeFieldInfo = (~) DBusErrorEntry
+    type AttrGetType DBusErrorEntryErrorCodeFieldInfo = Int32
+    type AttrLabel DBusErrorEntryErrorCodeFieldInfo = "error_code"
+    attrGet _ = dBusErrorEntryReadErrorCode
+    attrSet _ = dBusErrorEntryWriteErrorCode
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusErrorEntryErrorCode :: AttrLabelProxy "errorCode"
+dBusErrorEntryErrorCode = AttrLabelProxy
+
+
+dBusErrorEntryReadDbusErrorName :: MonadIO m => DBusErrorEntry -> m (Maybe T.Text)
+dBusErrorEntryReadDbusErrorName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
+
+dBusErrorEntryWriteDbusErrorName :: MonadIO m => DBusErrorEntry -> CString -> m ()
+dBusErrorEntryWriteDbusErrorName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusErrorEntryClearDbusErrorName :: MonadIO m => DBusErrorEntry -> m ()
+dBusErrorEntryClearDbusErrorName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusErrorEntryDbusErrorNameFieldInfo
+instance AttrInfo DBusErrorEntryDbusErrorNameFieldInfo where
+    type AttrAllowedOps DBusErrorEntryDbusErrorNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusErrorEntryDbusErrorNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusErrorEntryDbusErrorNameFieldInfo = (~) DBusErrorEntry
+    type AttrGetType DBusErrorEntryDbusErrorNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusErrorEntryDbusErrorNameFieldInfo = "dbus_error_name"
+    attrGet _ = dBusErrorEntryReadDbusErrorName
+    attrSet _ = dBusErrorEntryWriteDbusErrorName
+    attrConstruct = undefined
+    attrClear _ = dBusErrorEntryClearDbusErrorName
+
+dBusErrorEntryDbusErrorName :: AttrLabelProxy "dbusErrorName"
+dBusErrorEntryDbusErrorName = AttrLabelProxy
+
+
+
+type instance AttributeList DBusErrorEntry = DBusErrorEntryAttributeList
+type DBusErrorEntryAttributeList = ('[ '("errorCode", DBusErrorEntryErrorCodeFieldInfo), '("dbusErrorName", DBusErrorEntryDbusErrorNameFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveDBusErrorEntryMethod (t :: Symbol) (o :: *) :: * where
     ResolveDBusErrorEntryMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/DBusErrorEntry.hs-boot b/GI/Gio/Structs/DBusErrorEntry.hs-boot
--- a/GI/Gio/Structs/DBusErrorEntry.hs-boot
+++ b/GI/Gio/Structs/DBusErrorEntry.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusErrorEntry where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusInterfaceInfo.hs b/GI/Gio/Structs/DBusInterfaceInfo.hs
--- a/GI/Gio/Structs/DBusInterfaceInfo.hs
+++ b/GI/Gio/Structs/DBusInterfaceInfo.hs
@@ -62,36 +62,53 @@
 
  -- * Properties
 -- ** Annotations
+    dBusInterfaceInfoAnnotations            ,
+    dBusInterfaceInfoClearAnnotations       ,
     dBusInterfaceInfoReadAnnotations        ,
+    dBusInterfaceInfoWriteAnnotations       ,
 
 
 -- ** Methods
+    dBusInterfaceInfoClearMethods           ,
+    dBusInterfaceInfoMethods                ,
     dBusInterfaceInfoReadMethods            ,
+    dBusInterfaceInfoWriteMethods           ,
 
 
 -- ** Name
+    dBusInterfaceInfoClearName              ,
+    dBusInterfaceInfoName                   ,
     dBusInterfaceInfoReadName               ,
+    dBusInterfaceInfoWriteName              ,
 
 
 -- ** Properties
+    dBusInterfaceInfoClearProperties        ,
+    dBusInterfaceInfoProperties             ,
     dBusInterfaceInfoReadProperties         ,
+    dBusInterfaceInfoWriteProperties        ,
 
 
 -- ** RefCount
     dBusInterfaceInfoReadRefCount           ,
+    dBusInterfaceInfoRefCount               ,
+    dBusInterfaceInfoWriteRefCount          ,
 
 
 -- ** Signals
+    dBusInterfaceInfoClearSignals           ,
     dBusInterfaceInfoReadSignals            ,
+    dBusInterfaceInfoSignals                ,
+    dBusInterfaceInfoWriteSignals           ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -111,53 +128,214 @@
 newZeroDBusInterfaceInfo :: MonadIO m => m DBusInterfaceInfo
 newZeroDBusInterfaceInfo = liftIO $ callocBoxedBytes 48 >>= wrapBoxed DBusInterfaceInfo
 
+instance tag ~ 'AttrSet => Constructible DBusInterfaceInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusInterfaceInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusInterfaceInfo :: Maybe DBusInterfaceInfo
 noDBusInterfaceInfo = Nothing
 
-dBusInterfaceInfoReadRefCount :: DBusInterfaceInfo -> IO Int32
-dBusInterfaceInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoReadRefCount :: MonadIO m => DBusInterfaceInfo -> m Int32
+dBusInterfaceInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusInterfaceInfoReadName :: DBusInterfaceInfo -> IO T.Text
-dBusInterfaceInfoReadName s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoWriteRefCount :: MonadIO m => DBusInterfaceInfo -> Int32 -> m ()
+dBusInterfaceInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusInterfaceInfoRefCountFieldInfo
+instance AttrInfo DBusInterfaceInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusInterfaceInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusInterfaceInfoRefCountFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusInterfaceInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusInterfaceInfoReadRefCount
+    attrSet _ = dBusInterfaceInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusInterfaceInfoRefCount :: AttrLabelProxy "refCount"
+dBusInterfaceInfoRefCount = AttrLabelProxy
+
+
+dBusInterfaceInfoReadName :: MonadIO m => DBusInterfaceInfo -> m (Maybe T.Text)
+dBusInterfaceInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusInterfaceInfoReadMethods :: DBusInterfaceInfo -> IO [DBusMethodInfo]
-dBusInterfaceInfoReadMethods s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoWriteName :: MonadIO m => DBusInterfaceInfo -> CString -> m ()
+dBusInterfaceInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusInterfaceInfoClearName :: MonadIO m => DBusInterfaceInfo -> m ()
+dBusInterfaceInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusInterfaceInfoNameFieldInfo
+instance AttrInfo DBusInterfaceInfoNameFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusInterfaceInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusInterfaceInfoNameFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusInterfaceInfoNameFieldInfo = "name"
+    attrGet _ = dBusInterfaceInfoReadName
+    attrSet _ = dBusInterfaceInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = dBusInterfaceInfoClearName
+
+dBusInterfaceInfoName :: AttrLabelProxy "name"
+dBusInterfaceInfoName = AttrLabelProxy
+
+
+dBusInterfaceInfoReadMethods :: MonadIO m => DBusInterfaceInfo -> m (Maybe [DBusMethodInfo])
+dBusInterfaceInfoReadMethods s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO (Ptr (Ptr DBusMethodInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusMethodInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusMethodInfo) val''
+        return val'''
+    return result
 
-dBusInterfaceInfoReadSignals :: DBusInterfaceInfo -> IO [DBusSignalInfo]
-dBusInterfaceInfoReadSignals s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoWriteMethods :: MonadIO m => DBusInterfaceInfo -> Ptr (Ptr DBusMethodInfo) -> m ()
+dBusInterfaceInfoWriteMethods s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: Ptr (Ptr DBusMethodInfo))
+
+dBusInterfaceInfoClearMethods :: MonadIO m => DBusInterfaceInfo -> m ()
+dBusInterfaceInfoClearMethods s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: Ptr (Ptr DBusMethodInfo))
+
+data DBusInterfaceInfoMethodsFieldInfo
+instance AttrInfo DBusInterfaceInfoMethodsFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoMethodsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusInterfaceInfoMethodsFieldInfo = (~) (Ptr (Ptr DBusMethodInfo))
+    type AttrBaseTypeConstraint DBusInterfaceInfoMethodsFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoMethodsFieldInfo = Maybe [DBusMethodInfo]
+    type AttrLabel DBusInterfaceInfoMethodsFieldInfo = "methods"
+    attrGet _ = dBusInterfaceInfoReadMethods
+    attrSet _ = dBusInterfaceInfoWriteMethods
+    attrConstruct = undefined
+    attrClear _ = dBusInterfaceInfoClearMethods
+
+dBusInterfaceInfoMethods :: AttrLabelProxy "methods"
+dBusInterfaceInfoMethods = AttrLabelProxy
+
+
+dBusInterfaceInfoReadSignals :: MonadIO m => DBusInterfaceInfo -> m (Maybe [DBusSignalInfo])
+dBusInterfaceInfoReadSignals s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusSignalInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusSignalInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusSignalInfo) val''
+        return val'''
+    return result
 
-dBusInterfaceInfoReadProperties :: DBusInterfaceInfo -> IO [DBusPropertyInfo]
-dBusInterfaceInfoReadProperties s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoWriteSignals :: MonadIO m => DBusInterfaceInfo -> Ptr (Ptr DBusSignalInfo) -> m ()
+dBusInterfaceInfoWriteSignals s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusSignalInfo))
+
+dBusInterfaceInfoClearSignals :: MonadIO m => DBusInterfaceInfo -> m ()
+dBusInterfaceInfoClearSignals s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusSignalInfo))
+
+data DBusInterfaceInfoSignalsFieldInfo
+instance AttrInfo DBusInterfaceInfoSignalsFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoSignalsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusInterfaceInfoSignalsFieldInfo = (~) (Ptr (Ptr DBusSignalInfo))
+    type AttrBaseTypeConstraint DBusInterfaceInfoSignalsFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoSignalsFieldInfo = Maybe [DBusSignalInfo]
+    type AttrLabel DBusInterfaceInfoSignalsFieldInfo = "signals"
+    attrGet _ = dBusInterfaceInfoReadSignals
+    attrSet _ = dBusInterfaceInfoWriteSignals
+    attrConstruct = undefined
+    attrClear _ = dBusInterfaceInfoClearSignals
+
+dBusInterfaceInfoSignals :: AttrLabelProxy "signals"
+dBusInterfaceInfoSignals = AttrLabelProxy
+
+
+dBusInterfaceInfoReadProperties :: MonadIO m => DBusInterfaceInfo -> m (Maybe [DBusPropertyInfo])
+dBusInterfaceInfoReadProperties s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 32) :: IO (Ptr (Ptr DBusPropertyInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusPropertyInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusPropertyInfo) val''
+        return val'''
+    return result
 
-dBusInterfaceInfoReadAnnotations :: DBusInterfaceInfo -> IO [DBusAnnotationInfo]
-dBusInterfaceInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusInterfaceInfoWriteProperties :: MonadIO m => DBusInterfaceInfo -> Ptr (Ptr DBusPropertyInfo) -> m ()
+dBusInterfaceInfoWriteProperties s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (val :: Ptr (Ptr DBusPropertyInfo))
+
+dBusInterfaceInfoClearProperties :: MonadIO m => DBusInterfaceInfo -> m ()
+dBusInterfaceInfoClearProperties s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (nullPtr :: Ptr (Ptr DBusPropertyInfo))
+
+data DBusInterfaceInfoPropertiesFieldInfo
+instance AttrInfo DBusInterfaceInfoPropertiesFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoPropertiesFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusInterfaceInfoPropertiesFieldInfo = (~) (Ptr (Ptr DBusPropertyInfo))
+    type AttrBaseTypeConstraint DBusInterfaceInfoPropertiesFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoPropertiesFieldInfo = Maybe [DBusPropertyInfo]
+    type AttrLabel DBusInterfaceInfoPropertiesFieldInfo = "properties"
+    attrGet _ = dBusInterfaceInfoReadProperties
+    attrSet _ = dBusInterfaceInfoWriteProperties
+    attrConstruct = undefined
+    attrClear _ = dBusInterfaceInfoClearProperties
+
+dBusInterfaceInfoProperties :: AttrLabelProxy "properties"
+dBusInterfaceInfoProperties = AttrLabelProxy
+
+
+dBusInterfaceInfoReadAnnotations :: MonadIO m => DBusInterfaceInfo -> m (Maybe [DBusAnnotationInfo])
+dBusInterfaceInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 40) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusInterfaceInfoWriteAnnotations :: MonadIO m => DBusInterfaceInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusInterfaceInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 40) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusInterfaceInfoClearAnnotations :: MonadIO m => DBusInterfaceInfo -> m ()
+dBusInterfaceInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 40) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusInterfaceInfoAnnotationsFieldInfo
+instance AttrInfo DBusInterfaceInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusInterfaceInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusInterfaceInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusInterfaceInfoAnnotationsFieldInfo = (~) DBusInterfaceInfo
+    type AttrGetType DBusInterfaceInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusInterfaceInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusInterfaceInfoReadAnnotations
+    attrSet _ = dBusInterfaceInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusInterfaceInfoClearAnnotations
+
+dBusInterfaceInfoAnnotations :: AttrLabelProxy "annotations"
+dBusInterfaceInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusInterfaceInfo = DBusInterfaceInfoAttributeList
+type DBusInterfaceInfoAttributeList = ('[ '("refCount", DBusInterfaceInfoRefCountFieldInfo), '("name", DBusInterfaceInfoNameFieldInfo), '("methods", DBusInterfaceInfoMethodsFieldInfo), '("signals", DBusInterfaceInfoSignalsFieldInfo), '("properties", DBusInterfaceInfoPropertiesFieldInfo), '("annotations", DBusInterfaceInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusInterfaceInfo::cache_build
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -184,7 +362,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -209,15 +387,15 @@
 
 -- method DBusInterfaceInfo::generate_xml
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "string_builder", argType = TInterface "GLib" "String", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "string_builder", argType = TInterface "GLib" "String", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_interface_info_generate_xml" g_dbus_interface_info_generate_xml :: 
     Ptr DBusInterfaceInfo ->                -- _obj : TInterface "Gio" "DBusInterfaceInfo"
-    Word32 ->                               -- indent : TBasicType TUInt32
+    Word32 ->                               -- indent : TBasicType TUInt
     Ptr GLib.String ->                      -- string_builder : TInterface "GLib" "String"
     IO ()
 
@@ -243,7 +421,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMethodInfo"
+-- returnType : Just (TInterface "Gio" "DBusMethodInfo")
 -- throws : False
 -- Skip return : False
 
@@ -276,7 +454,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusPropertyInfo"
+-- returnType : Just (TInterface "Gio" "DBusPropertyInfo")
 -- throws : False
 -- Skip return : False
 
@@ -309,7 +487,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusSignalInfo"
+-- returnType : Just (TInterface "Gio" "DBusSignalInfo")
 -- throws : False
 -- Skip return : False
 
@@ -342,7 +520,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceInfo"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceInfo")
 -- throws : False
 -- Skip return : False
 
@@ -371,7 +549,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusInterfaceInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusInterfaceInfo.hs-boot b/GI/Gio/Structs/DBusInterfaceInfo.hs-boot
--- a/GI/Gio/Structs/DBusInterfaceInfo.hs-boot
+++ b/GI/Gio/Structs/DBusInterfaceInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusInterfaceInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusInterfaceVTable.hs b/GI/Gio/Structs/DBusInterfaceVTable.hs
--- a/GI/Gio/Structs/DBusInterfaceVTable.hs
+++ b/GI/Gio/Structs/DBusInterfaceVTable.hs
@@ -59,9 +59,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -74,14 +74,22 @@
 newZeroDBusInterfaceVTable :: MonadIO m => m DBusInterfaceVTable
 newZeroDBusInterfaceVTable = liftIO $ callocBytes 88 >>= wrapPtr DBusInterfaceVTable
 
+instance tag ~ 'AttrSet => Constructible DBusInterfaceVTable tag where
+    new _ attrs = do
+        o <- newZeroDBusInterfaceVTable
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusInterfaceVTable :: Maybe DBusInterfaceVTable
 noDBusInterfaceVTable = Nothing
 
--- XXX Skipped getter for "DBusInterfaceVTable:method_call" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
-
--- XXX Skipped getter for "DBusInterfaceVTable:get_property" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+-- XXX Skipped attribute for "DBusInterfaceVTable:method_call" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+-- XXX Skipped attribute for "DBusInterfaceVTable:get_property" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+-- XXX Skipped attribute for "DBusInterfaceVTable:set_property" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
 
--- XXX Skipped getter for "DBusInterfaceVTable:set_property" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+type instance AttributeList DBusInterfaceVTable = DBusInterfaceVTableAttributeList
+type DBusInterfaceVTableAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveDBusInterfaceVTableMethod (t :: Symbol) (o :: *) :: * where
     ResolveDBusInterfaceVTableMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/DBusInterfaceVTable.hs-boot b/GI/Gio/Structs/DBusInterfaceVTable.hs-boot
--- a/GI/Gio/Structs/DBusInterfaceVTable.hs-boot
+++ b/GI/Gio/Structs/DBusInterfaceVTable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusInterfaceVTable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusMethodInfo.hs b/GI/Gio/Structs/DBusMethodInfo.hs
--- a/GI/Gio/Structs/DBusMethodInfo.hs
+++ b/GI/Gio/Structs/DBusMethodInfo.hs
@@ -32,32 +32,46 @@
 
  -- * Properties
 -- ** Annotations
+    dBusMethodInfoAnnotations               ,
+    dBusMethodInfoClearAnnotations          ,
     dBusMethodInfoReadAnnotations           ,
+    dBusMethodInfoWriteAnnotations          ,
 
 
 -- ** InArgs
+    dBusMethodInfoClearInArgs               ,
+    dBusMethodInfoInArgs                    ,
     dBusMethodInfoReadInArgs                ,
+    dBusMethodInfoWriteInArgs               ,
 
 
 -- ** Name
+    dBusMethodInfoClearName                 ,
+    dBusMethodInfoName                      ,
     dBusMethodInfoReadName                  ,
+    dBusMethodInfoWriteName                 ,
 
 
 -- ** OutArgs
+    dBusMethodInfoClearOutArgs              ,
+    dBusMethodInfoOutArgs                   ,
     dBusMethodInfoReadOutArgs               ,
+    dBusMethodInfoWriteOutArgs              ,
 
 
 -- ** RefCount
     dBusMethodInfoReadRefCount              ,
+    dBusMethodInfoRefCount                  ,
+    dBusMethodInfoWriteRefCount             ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -76,46 +90,181 @@
 newZeroDBusMethodInfo :: MonadIO m => m DBusMethodInfo
 newZeroDBusMethodInfo = liftIO $ callocBoxedBytes 40 >>= wrapBoxed DBusMethodInfo
 
+instance tag ~ 'AttrSet => Constructible DBusMethodInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusMethodInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusMethodInfo :: Maybe DBusMethodInfo
 noDBusMethodInfo = Nothing
 
-dBusMethodInfoReadRefCount :: DBusMethodInfo -> IO Int32
-dBusMethodInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusMethodInfoReadRefCount :: MonadIO m => DBusMethodInfo -> m Int32
+dBusMethodInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusMethodInfoReadName :: DBusMethodInfo -> IO T.Text
-dBusMethodInfoReadName s = withManagedPtr s $ \ptr -> do
+dBusMethodInfoWriteRefCount :: MonadIO m => DBusMethodInfo -> Int32 -> m ()
+dBusMethodInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusMethodInfoRefCountFieldInfo
+instance AttrInfo DBusMethodInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusMethodInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusMethodInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusMethodInfoRefCountFieldInfo = (~) DBusMethodInfo
+    type AttrGetType DBusMethodInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusMethodInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusMethodInfoReadRefCount
+    attrSet _ = dBusMethodInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusMethodInfoRefCount :: AttrLabelProxy "refCount"
+dBusMethodInfoRefCount = AttrLabelProxy
+
+
+dBusMethodInfoReadName :: MonadIO m => DBusMethodInfo -> m (Maybe T.Text)
+dBusMethodInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusMethodInfoReadInArgs :: DBusMethodInfo -> IO [DBusArgInfo]
-dBusMethodInfoReadInArgs s = withManagedPtr s $ \ptr -> do
+dBusMethodInfoWriteName :: MonadIO m => DBusMethodInfo -> CString -> m ()
+dBusMethodInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusMethodInfoClearName :: MonadIO m => DBusMethodInfo -> m ()
+dBusMethodInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusMethodInfoNameFieldInfo
+instance AttrInfo DBusMethodInfoNameFieldInfo where
+    type AttrAllowedOps DBusMethodInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusMethodInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusMethodInfoNameFieldInfo = (~) DBusMethodInfo
+    type AttrGetType DBusMethodInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusMethodInfoNameFieldInfo = "name"
+    attrGet _ = dBusMethodInfoReadName
+    attrSet _ = dBusMethodInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = dBusMethodInfoClearName
+
+dBusMethodInfoName :: AttrLabelProxy "name"
+dBusMethodInfoName = AttrLabelProxy
+
+
+dBusMethodInfoReadInArgs :: MonadIO m => DBusMethodInfo -> m (Maybe [DBusArgInfo])
+dBusMethodInfoReadInArgs s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO (Ptr (Ptr DBusArgInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusArgInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusArgInfo) val''
+        return val'''
+    return result
 
-dBusMethodInfoReadOutArgs :: DBusMethodInfo -> IO [DBusArgInfo]
-dBusMethodInfoReadOutArgs s = withManagedPtr s $ \ptr -> do
+dBusMethodInfoWriteInArgs :: MonadIO m => DBusMethodInfo -> Ptr (Ptr DBusArgInfo) -> m ()
+dBusMethodInfoWriteInArgs s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: Ptr (Ptr DBusArgInfo))
+
+dBusMethodInfoClearInArgs :: MonadIO m => DBusMethodInfo -> m ()
+dBusMethodInfoClearInArgs s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: Ptr (Ptr DBusArgInfo))
+
+data DBusMethodInfoInArgsFieldInfo
+instance AttrInfo DBusMethodInfoInArgsFieldInfo where
+    type AttrAllowedOps DBusMethodInfoInArgsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusMethodInfoInArgsFieldInfo = (~) (Ptr (Ptr DBusArgInfo))
+    type AttrBaseTypeConstraint DBusMethodInfoInArgsFieldInfo = (~) DBusMethodInfo
+    type AttrGetType DBusMethodInfoInArgsFieldInfo = Maybe [DBusArgInfo]
+    type AttrLabel DBusMethodInfoInArgsFieldInfo = "in_args"
+    attrGet _ = dBusMethodInfoReadInArgs
+    attrSet _ = dBusMethodInfoWriteInArgs
+    attrConstruct = undefined
+    attrClear _ = dBusMethodInfoClearInArgs
+
+dBusMethodInfoInArgs :: AttrLabelProxy "inArgs"
+dBusMethodInfoInArgs = AttrLabelProxy
+
+
+dBusMethodInfoReadOutArgs :: MonadIO m => DBusMethodInfo -> m (Maybe [DBusArgInfo])
+dBusMethodInfoReadOutArgs s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusArgInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusArgInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusArgInfo) val''
+        return val'''
+    return result
 
-dBusMethodInfoReadAnnotations :: DBusMethodInfo -> IO [DBusAnnotationInfo]
-dBusMethodInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusMethodInfoWriteOutArgs :: MonadIO m => DBusMethodInfo -> Ptr (Ptr DBusArgInfo) -> m ()
+dBusMethodInfoWriteOutArgs s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusArgInfo))
+
+dBusMethodInfoClearOutArgs :: MonadIO m => DBusMethodInfo -> m ()
+dBusMethodInfoClearOutArgs s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusArgInfo))
+
+data DBusMethodInfoOutArgsFieldInfo
+instance AttrInfo DBusMethodInfoOutArgsFieldInfo where
+    type AttrAllowedOps DBusMethodInfoOutArgsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusMethodInfoOutArgsFieldInfo = (~) (Ptr (Ptr DBusArgInfo))
+    type AttrBaseTypeConstraint DBusMethodInfoOutArgsFieldInfo = (~) DBusMethodInfo
+    type AttrGetType DBusMethodInfoOutArgsFieldInfo = Maybe [DBusArgInfo]
+    type AttrLabel DBusMethodInfoOutArgsFieldInfo = "out_args"
+    attrGet _ = dBusMethodInfoReadOutArgs
+    attrSet _ = dBusMethodInfoWriteOutArgs
+    attrConstruct = undefined
+    attrClear _ = dBusMethodInfoClearOutArgs
+
+dBusMethodInfoOutArgs :: AttrLabelProxy "outArgs"
+dBusMethodInfoOutArgs = AttrLabelProxy
+
+
+dBusMethodInfoReadAnnotations :: MonadIO m => DBusMethodInfo -> m (Maybe [DBusAnnotationInfo])
+dBusMethodInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 32) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusMethodInfoWriteAnnotations :: MonadIO m => DBusMethodInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusMethodInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusMethodInfoClearAnnotations :: MonadIO m => DBusMethodInfo -> m ()
+dBusMethodInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusMethodInfoAnnotationsFieldInfo
+instance AttrInfo DBusMethodInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusMethodInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusMethodInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusMethodInfoAnnotationsFieldInfo = (~) DBusMethodInfo
+    type AttrGetType DBusMethodInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusMethodInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusMethodInfoReadAnnotations
+    attrSet _ = dBusMethodInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusMethodInfoClearAnnotations
+
+dBusMethodInfoAnnotations :: AttrLabelProxy "annotations"
+dBusMethodInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusMethodInfo = DBusMethodInfoAttributeList
+type DBusMethodInfoAttributeList = ('[ '("refCount", DBusMethodInfoRefCountFieldInfo), '("name", DBusMethodInfoNameFieldInfo), '("inArgs", DBusMethodInfoInArgsFieldInfo), '("outArgs", DBusMethodInfoOutArgsFieldInfo), '("annotations", DBusMethodInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusMethodInfo::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusMethodInfo"
+-- returnType : Just (TInterface "Gio" "DBusMethodInfo")
 -- throws : False
 -- Skip return : False
 
@@ -144,7 +293,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusMethodInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusMethodInfo.hs-boot b/GI/Gio/Structs/DBusMethodInfo.hs-boot
--- a/GI/Gio/Structs/DBusMethodInfo.hs-boot
+++ b/GI/Gio/Structs/DBusMethodInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusMethodInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusNodeInfo.hs b/GI/Gio/Structs/DBusNodeInfo.hs
--- a/GI/Gio/Structs/DBusNodeInfo.hs
+++ b/GI/Gio/Structs/DBusNodeInfo.hs
@@ -46,32 +46,46 @@
 
  -- * Properties
 -- ** Annotations
+    dBusNodeInfoAnnotations                 ,
+    dBusNodeInfoClearAnnotations            ,
     dBusNodeInfoReadAnnotations             ,
+    dBusNodeInfoWriteAnnotations            ,
 
 
 -- ** Interfaces
+    dBusNodeInfoClearInterfaces             ,
+    dBusNodeInfoInterfaces                  ,
     dBusNodeInfoReadInterfaces              ,
+    dBusNodeInfoWriteInterfaces             ,
 
 
 -- ** Nodes
+    dBusNodeInfoClearNodes                  ,
+    dBusNodeInfoNodes                       ,
     dBusNodeInfoReadNodes                   ,
+    dBusNodeInfoWriteNodes                  ,
 
 
 -- ** Path
+    dBusNodeInfoClearPath                   ,
+    dBusNodeInfoPath                        ,
     dBusNodeInfoReadPath                    ,
+    dBusNodeInfoWritePath                   ,
 
 
 -- ** RefCount
     dBusNodeInfoReadRefCount                ,
+    dBusNodeInfoRefCount                    ,
+    dBusNodeInfoWriteRefCount               ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -91,46 +105,181 @@
 newZeroDBusNodeInfo :: MonadIO m => m DBusNodeInfo
 newZeroDBusNodeInfo = liftIO $ callocBoxedBytes 40 >>= wrapBoxed DBusNodeInfo
 
+instance tag ~ 'AttrSet => Constructible DBusNodeInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusNodeInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusNodeInfo :: Maybe DBusNodeInfo
 noDBusNodeInfo = Nothing
 
-dBusNodeInfoReadRefCount :: DBusNodeInfo -> IO Int32
-dBusNodeInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusNodeInfoReadRefCount :: MonadIO m => DBusNodeInfo -> m Int32
+dBusNodeInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusNodeInfoReadPath :: DBusNodeInfo -> IO T.Text
-dBusNodeInfoReadPath s = withManagedPtr s $ \ptr -> do
+dBusNodeInfoWriteRefCount :: MonadIO m => DBusNodeInfo -> Int32 -> m ()
+dBusNodeInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusNodeInfoRefCountFieldInfo
+instance AttrInfo DBusNodeInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusNodeInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusNodeInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusNodeInfoRefCountFieldInfo = (~) DBusNodeInfo
+    type AttrGetType DBusNodeInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusNodeInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusNodeInfoReadRefCount
+    attrSet _ = dBusNodeInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusNodeInfoRefCount :: AttrLabelProxy "refCount"
+dBusNodeInfoRefCount = AttrLabelProxy
+
+
+dBusNodeInfoReadPath :: MonadIO m => DBusNodeInfo -> m (Maybe T.Text)
+dBusNodeInfoReadPath s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusNodeInfoReadInterfaces :: DBusNodeInfo -> IO [DBusInterfaceInfo]
-dBusNodeInfoReadInterfaces s = withManagedPtr s $ \ptr -> do
+dBusNodeInfoWritePath :: MonadIO m => DBusNodeInfo -> CString -> m ()
+dBusNodeInfoWritePath s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusNodeInfoClearPath :: MonadIO m => DBusNodeInfo -> m ()
+dBusNodeInfoClearPath s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusNodeInfoPathFieldInfo
+instance AttrInfo DBusNodeInfoPathFieldInfo where
+    type AttrAllowedOps DBusNodeInfoPathFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusNodeInfoPathFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusNodeInfoPathFieldInfo = (~) DBusNodeInfo
+    type AttrGetType DBusNodeInfoPathFieldInfo = Maybe T.Text
+    type AttrLabel DBusNodeInfoPathFieldInfo = "path"
+    attrGet _ = dBusNodeInfoReadPath
+    attrSet _ = dBusNodeInfoWritePath
+    attrConstruct = undefined
+    attrClear _ = dBusNodeInfoClearPath
+
+dBusNodeInfoPath :: AttrLabelProxy "path"
+dBusNodeInfoPath = AttrLabelProxy
+
+
+dBusNodeInfoReadInterfaces :: MonadIO m => DBusNodeInfo -> m (Maybe [DBusInterfaceInfo])
+dBusNodeInfoReadInterfaces s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO (Ptr (Ptr DBusInterfaceInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusInterfaceInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusInterfaceInfo) val''
+        return val'''
+    return result
 
-dBusNodeInfoReadNodes :: DBusNodeInfo -> IO [DBusNodeInfo]
-dBusNodeInfoReadNodes s = withManagedPtr s $ \ptr -> do
+dBusNodeInfoWriteInterfaces :: MonadIO m => DBusNodeInfo -> Ptr (Ptr DBusInterfaceInfo) -> m ()
+dBusNodeInfoWriteInterfaces s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: Ptr (Ptr DBusInterfaceInfo))
+
+dBusNodeInfoClearInterfaces :: MonadIO m => DBusNodeInfo -> m ()
+dBusNodeInfoClearInterfaces s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: Ptr (Ptr DBusInterfaceInfo))
+
+data DBusNodeInfoInterfacesFieldInfo
+instance AttrInfo DBusNodeInfoInterfacesFieldInfo where
+    type AttrAllowedOps DBusNodeInfoInterfacesFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusNodeInfoInterfacesFieldInfo = (~) (Ptr (Ptr DBusInterfaceInfo))
+    type AttrBaseTypeConstraint DBusNodeInfoInterfacesFieldInfo = (~) DBusNodeInfo
+    type AttrGetType DBusNodeInfoInterfacesFieldInfo = Maybe [DBusInterfaceInfo]
+    type AttrLabel DBusNodeInfoInterfacesFieldInfo = "interfaces"
+    attrGet _ = dBusNodeInfoReadInterfaces
+    attrSet _ = dBusNodeInfoWriteInterfaces
+    attrConstruct = undefined
+    attrClear _ = dBusNodeInfoClearInterfaces
+
+dBusNodeInfoInterfaces :: AttrLabelProxy "interfaces"
+dBusNodeInfoInterfaces = AttrLabelProxy
+
+
+dBusNodeInfoReadNodes :: MonadIO m => DBusNodeInfo -> m (Maybe [DBusNodeInfo])
+dBusNodeInfoReadNodes s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusNodeInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusNodeInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusNodeInfo) val''
+        return val'''
+    return result
 
-dBusNodeInfoReadAnnotations :: DBusNodeInfo -> IO [DBusAnnotationInfo]
-dBusNodeInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusNodeInfoWriteNodes :: MonadIO m => DBusNodeInfo -> Ptr (Ptr DBusNodeInfo) -> m ()
+dBusNodeInfoWriteNodes s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusNodeInfo))
+
+dBusNodeInfoClearNodes :: MonadIO m => DBusNodeInfo -> m ()
+dBusNodeInfoClearNodes s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusNodeInfo))
+
+data DBusNodeInfoNodesFieldInfo
+instance AttrInfo DBusNodeInfoNodesFieldInfo where
+    type AttrAllowedOps DBusNodeInfoNodesFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusNodeInfoNodesFieldInfo = (~) (Ptr (Ptr DBusNodeInfo))
+    type AttrBaseTypeConstraint DBusNodeInfoNodesFieldInfo = (~) DBusNodeInfo
+    type AttrGetType DBusNodeInfoNodesFieldInfo = Maybe [DBusNodeInfo]
+    type AttrLabel DBusNodeInfoNodesFieldInfo = "nodes"
+    attrGet _ = dBusNodeInfoReadNodes
+    attrSet _ = dBusNodeInfoWriteNodes
+    attrConstruct = undefined
+    attrClear _ = dBusNodeInfoClearNodes
+
+dBusNodeInfoNodes :: AttrLabelProxy "nodes"
+dBusNodeInfoNodes = AttrLabelProxy
+
+
+dBusNodeInfoReadAnnotations :: MonadIO m => DBusNodeInfo -> m (Maybe [DBusAnnotationInfo])
+dBusNodeInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 32) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusNodeInfoWriteAnnotations :: MonadIO m => DBusNodeInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusNodeInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusNodeInfoClearAnnotations :: MonadIO m => DBusNodeInfo -> m ()
+dBusNodeInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusNodeInfoAnnotationsFieldInfo
+instance AttrInfo DBusNodeInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusNodeInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusNodeInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusNodeInfoAnnotationsFieldInfo = (~) DBusNodeInfo
+    type AttrGetType DBusNodeInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusNodeInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusNodeInfoReadAnnotations
+    attrSet _ = dBusNodeInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusNodeInfoClearAnnotations
+
+dBusNodeInfoAnnotations :: AttrLabelProxy "annotations"
+dBusNodeInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusNodeInfo = DBusNodeInfoAttributeList
+type DBusNodeInfoAttributeList = ('[ '("refCount", DBusNodeInfoRefCountFieldInfo), '("path", DBusNodeInfoPathFieldInfo), '("interfaces", DBusNodeInfoInterfacesFieldInfo), '("nodes", DBusNodeInfoNodesFieldInfo), '("annotations", DBusNodeInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusNodeInfo::new_for_xml
 -- method type : Constructor
 -- Args : [Arg {argCName = "xml_data", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusNodeInfo"
+-- returnType : Just (TInterface "Gio" "DBusNodeInfo")
 -- throws : True
 -- Skip return : False
 
@@ -158,15 +307,15 @@
 
 -- method DBusNodeInfo::generate_xml
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusNodeInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "string_builder", argType = TInterface "GLib" "String", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusNodeInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "indent", argType = TBasicType TUInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "string_builder", argType = TInterface "GLib" "String", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_dbus_node_info_generate_xml" g_dbus_node_info_generate_xml :: 
     Ptr DBusNodeInfo ->                     -- _obj : TInterface "Gio" "DBusNodeInfo"
-    Word32 ->                               -- indent : TBasicType TUInt32
+    Word32 ->                               -- indent : TBasicType TUInt
     Ptr GLib.String ->                      -- string_builder : TInterface "GLib" "String"
     IO ()
 
@@ -192,7 +341,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusNodeInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusInterfaceInfo"
+-- returnType : Just (TInterface "Gio" "DBusInterfaceInfo")
 -- throws : False
 -- Skip return : False
 
@@ -225,7 +374,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusNodeInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusNodeInfo"
+-- returnType : Just (TInterface "Gio" "DBusNodeInfo")
 -- throws : False
 -- Skip return : False
 
@@ -254,7 +403,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusNodeInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusNodeInfo.hs-boot b/GI/Gio/Structs/DBusNodeInfo.hs-boot
--- a/GI/Gio/Structs/DBusNodeInfo.hs-boot
+++ b/GI/Gio/Structs/DBusNodeInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusNodeInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusPropertyInfo.hs b/GI/Gio/Structs/DBusPropertyInfo.hs
--- a/GI/Gio/Structs/DBusPropertyInfo.hs
+++ b/GI/Gio/Structs/DBusPropertyInfo.hs
@@ -32,32 +32,45 @@
 
  -- * Properties
 -- ** Annotations
+    dBusPropertyInfoAnnotations             ,
+    dBusPropertyInfoClearAnnotations        ,
     dBusPropertyInfoReadAnnotations         ,
+    dBusPropertyInfoWriteAnnotations        ,
 
 
 -- ** Flags
+    dBusPropertyInfoFlags                   ,
     dBusPropertyInfoReadFlags               ,
+    dBusPropertyInfoWriteFlags              ,
 
 
 -- ** Name
+    dBusPropertyInfoClearName               ,
+    dBusPropertyInfoName                    ,
     dBusPropertyInfoReadName                ,
+    dBusPropertyInfoWriteName               ,
 
 
 -- ** RefCount
     dBusPropertyInfoReadRefCount            ,
+    dBusPropertyInfoRefCount                ,
+    dBusPropertyInfoWriteRefCount           ,
 
 
 -- ** Signature
+    dBusPropertyInfoClearSignature          ,
     dBusPropertyInfoReadSignature           ,
+    dBusPropertyInfoSignature               ,
+    dBusPropertyInfoWriteSignature          ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -76,44 +89,174 @@
 newZeroDBusPropertyInfo :: MonadIO m => m DBusPropertyInfo
 newZeroDBusPropertyInfo = liftIO $ callocBoxedBytes 40 >>= wrapBoxed DBusPropertyInfo
 
+instance tag ~ 'AttrSet => Constructible DBusPropertyInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusPropertyInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusPropertyInfo :: Maybe DBusPropertyInfo
 noDBusPropertyInfo = Nothing
 
-dBusPropertyInfoReadRefCount :: DBusPropertyInfo -> IO Int32
-dBusPropertyInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusPropertyInfoReadRefCount :: MonadIO m => DBusPropertyInfo -> m Int32
+dBusPropertyInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusPropertyInfoReadName :: DBusPropertyInfo -> IO T.Text
-dBusPropertyInfoReadName s = withManagedPtr s $ \ptr -> do
+dBusPropertyInfoWriteRefCount :: MonadIO m => DBusPropertyInfo -> Int32 -> m ()
+dBusPropertyInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusPropertyInfoRefCountFieldInfo
+instance AttrInfo DBusPropertyInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusPropertyInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusPropertyInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusPropertyInfoRefCountFieldInfo = (~) DBusPropertyInfo
+    type AttrGetType DBusPropertyInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusPropertyInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusPropertyInfoReadRefCount
+    attrSet _ = dBusPropertyInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusPropertyInfoRefCount :: AttrLabelProxy "refCount"
+dBusPropertyInfoRefCount = AttrLabelProxy
+
+
+dBusPropertyInfoReadName :: MonadIO m => DBusPropertyInfo -> m (Maybe T.Text)
+dBusPropertyInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusPropertyInfoReadSignature :: DBusPropertyInfo -> IO T.Text
-dBusPropertyInfoReadSignature s = withManagedPtr s $ \ptr -> do
+dBusPropertyInfoWriteName :: MonadIO m => DBusPropertyInfo -> CString -> m ()
+dBusPropertyInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusPropertyInfoClearName :: MonadIO m => DBusPropertyInfo -> m ()
+dBusPropertyInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusPropertyInfoNameFieldInfo
+instance AttrInfo DBusPropertyInfoNameFieldInfo where
+    type AttrAllowedOps DBusPropertyInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusPropertyInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusPropertyInfoNameFieldInfo = (~) DBusPropertyInfo
+    type AttrGetType DBusPropertyInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusPropertyInfoNameFieldInfo = "name"
+    attrGet _ = dBusPropertyInfoReadName
+    attrSet _ = dBusPropertyInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = dBusPropertyInfoClearName
+
+dBusPropertyInfoName :: AttrLabelProxy "name"
+dBusPropertyInfoName = AttrLabelProxy
+
+
+dBusPropertyInfoReadSignature :: MonadIO m => DBusPropertyInfo -> m (Maybe T.Text)
+dBusPropertyInfoReadSignature s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusPropertyInfoReadFlags :: DBusPropertyInfo -> IO [DBusPropertyInfoFlags]
-dBusPropertyInfoReadFlags s = withManagedPtr s $ \ptr -> do
+dBusPropertyInfoWriteSignature :: MonadIO m => DBusPropertyInfo -> CString -> m ()
+dBusPropertyInfoWriteSignature s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: CString)
+
+dBusPropertyInfoClearSignature :: MonadIO m => DBusPropertyInfo -> m ()
+dBusPropertyInfoClearSignature s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: CString)
+
+data DBusPropertyInfoSignatureFieldInfo
+instance AttrInfo DBusPropertyInfoSignatureFieldInfo where
+    type AttrAllowedOps DBusPropertyInfoSignatureFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusPropertyInfoSignatureFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusPropertyInfoSignatureFieldInfo = (~) DBusPropertyInfo
+    type AttrGetType DBusPropertyInfoSignatureFieldInfo = Maybe T.Text
+    type AttrLabel DBusPropertyInfoSignatureFieldInfo = "signature"
+    attrGet _ = dBusPropertyInfoReadSignature
+    attrSet _ = dBusPropertyInfoWriteSignature
+    attrConstruct = undefined
+    attrClear _ = dBusPropertyInfoClearSignature
+
+dBusPropertyInfoSignature :: AttrLabelProxy "signature"
+dBusPropertyInfoSignature = AttrLabelProxy
+
+
+dBusPropertyInfoReadFlags :: MonadIO m => DBusPropertyInfo -> m [DBusPropertyInfoFlags]
+dBusPropertyInfoReadFlags s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO CUInt
     let val' = wordToGFlags val
     return val'
 
-dBusPropertyInfoReadAnnotations :: DBusPropertyInfo -> IO [DBusAnnotationInfo]
-dBusPropertyInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusPropertyInfoWriteFlags :: MonadIO m => DBusPropertyInfo -> [DBusPropertyInfoFlags] -> m ()
+dBusPropertyInfoWriteFlags s val = liftIO $ withManagedPtr s $ \ptr -> do
+    let val' = gflagsToWord val
+    poke (ptr `plusPtr` 24) (val' :: CUInt)
+
+data DBusPropertyInfoFlagsFieldInfo
+instance AttrInfo DBusPropertyInfoFlagsFieldInfo where
+    type AttrAllowedOps DBusPropertyInfoFlagsFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusPropertyInfoFlagsFieldInfo = (~) [DBusPropertyInfoFlags]
+    type AttrBaseTypeConstraint DBusPropertyInfoFlagsFieldInfo = (~) DBusPropertyInfo
+    type AttrGetType DBusPropertyInfoFlagsFieldInfo = [DBusPropertyInfoFlags]
+    type AttrLabel DBusPropertyInfoFlagsFieldInfo = "flags"
+    attrGet _ = dBusPropertyInfoReadFlags
+    attrSet _ = dBusPropertyInfoWriteFlags
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusPropertyInfoFlags :: AttrLabelProxy "flags"
+dBusPropertyInfoFlags = AttrLabelProxy
+
+
+dBusPropertyInfoReadAnnotations :: MonadIO m => DBusPropertyInfo -> m (Maybe [DBusAnnotationInfo])
+dBusPropertyInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 32) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusPropertyInfoWriteAnnotations :: MonadIO m => DBusPropertyInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusPropertyInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusPropertyInfoClearAnnotations :: MonadIO m => DBusPropertyInfo -> m ()
+dBusPropertyInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusPropertyInfoAnnotationsFieldInfo
+instance AttrInfo DBusPropertyInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusPropertyInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusPropertyInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusPropertyInfoAnnotationsFieldInfo = (~) DBusPropertyInfo
+    type AttrGetType DBusPropertyInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusPropertyInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusPropertyInfoReadAnnotations
+    attrSet _ = dBusPropertyInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusPropertyInfoClearAnnotations
+
+dBusPropertyInfoAnnotations :: AttrLabelProxy "annotations"
+dBusPropertyInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusPropertyInfo = DBusPropertyInfoAttributeList
+type DBusPropertyInfoAttributeList = ('[ '("refCount", DBusPropertyInfoRefCountFieldInfo), '("name", DBusPropertyInfoNameFieldInfo), '("signature", DBusPropertyInfoSignatureFieldInfo), '("flags", DBusPropertyInfoFlagsFieldInfo), '("annotations", DBusPropertyInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusPropertyInfo::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusPropertyInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusPropertyInfo"
+-- returnType : Just (TInterface "Gio" "DBusPropertyInfo")
 -- throws : False
 -- Skip return : False
 
@@ -142,7 +285,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusPropertyInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusPropertyInfo.hs-boot b/GI/Gio/Structs/DBusPropertyInfo.hs-boot
--- a/GI/Gio/Structs/DBusPropertyInfo.hs-boot
+++ b/GI/Gio/Structs/DBusPropertyInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusPropertyInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusSignalInfo.hs b/GI/Gio/Structs/DBusSignalInfo.hs
--- a/GI/Gio/Structs/DBusSignalInfo.hs
+++ b/GI/Gio/Structs/DBusSignalInfo.hs
@@ -32,28 +32,39 @@
 
  -- * Properties
 -- ** Annotations
+    dBusSignalInfoAnnotations               ,
+    dBusSignalInfoClearAnnotations          ,
     dBusSignalInfoReadAnnotations           ,
+    dBusSignalInfoWriteAnnotations          ,
 
 
 -- ** Args
+    dBusSignalInfoArgs                      ,
+    dBusSignalInfoClearArgs                 ,
     dBusSignalInfoReadArgs                  ,
+    dBusSignalInfoWriteArgs                 ,
 
 
 -- ** Name
+    dBusSignalInfoClearName                 ,
+    dBusSignalInfoName                      ,
     dBusSignalInfoReadName                  ,
+    dBusSignalInfoWriteName                 ,
 
 
 -- ** RefCount
     dBusSignalInfoReadRefCount              ,
+    dBusSignalInfoRefCount                  ,
+    dBusSignalInfoWriteRefCount             ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -72,39 +83,148 @@
 newZeroDBusSignalInfo :: MonadIO m => m DBusSignalInfo
 newZeroDBusSignalInfo = liftIO $ callocBoxedBytes 32 >>= wrapBoxed DBusSignalInfo
 
+instance tag ~ 'AttrSet => Constructible DBusSignalInfo tag where
+    new _ attrs = do
+        o <- newZeroDBusSignalInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusSignalInfo :: Maybe DBusSignalInfo
 noDBusSignalInfo = Nothing
 
-dBusSignalInfoReadRefCount :: DBusSignalInfo -> IO Int32
-dBusSignalInfoReadRefCount s = withManagedPtr s $ \ptr -> do
+dBusSignalInfoReadRefCount :: MonadIO m => DBusSignalInfo -> m Int32
+dBusSignalInfoReadRefCount s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO Int32
     return val
 
-dBusSignalInfoReadName :: DBusSignalInfo -> IO T.Text
-dBusSignalInfoReadName s = withManagedPtr s $ \ptr -> do
+dBusSignalInfoWriteRefCount :: MonadIO m => DBusSignalInfo -> Int32 -> m ()
+dBusSignalInfoWriteRefCount s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Int32)
+
+data DBusSignalInfoRefCountFieldInfo
+instance AttrInfo DBusSignalInfoRefCountFieldInfo where
+    type AttrAllowedOps DBusSignalInfoRefCountFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint DBusSignalInfoRefCountFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint DBusSignalInfoRefCountFieldInfo = (~) DBusSignalInfo
+    type AttrGetType DBusSignalInfoRefCountFieldInfo = Int32
+    type AttrLabel DBusSignalInfoRefCountFieldInfo = "ref_count"
+    attrGet _ = dBusSignalInfoReadRefCount
+    attrSet _ = dBusSignalInfoWriteRefCount
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+dBusSignalInfoRefCount :: AttrLabelProxy "refCount"
+dBusSignalInfoRefCount = AttrLabelProxy
+
+
+dBusSignalInfoReadName :: MonadIO m => DBusSignalInfo -> m (Maybe T.Text)
+dBusSignalInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-dBusSignalInfoReadArgs :: DBusSignalInfo -> IO [DBusArgInfo]
-dBusSignalInfoReadArgs s = withManagedPtr s $ \ptr -> do
+dBusSignalInfoWriteName :: MonadIO m => DBusSignalInfo -> CString -> m ()
+dBusSignalInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: CString)
+
+dBusSignalInfoClearName :: MonadIO m => DBusSignalInfo -> m ()
+dBusSignalInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: CString)
+
+data DBusSignalInfoNameFieldInfo
+instance AttrInfo DBusSignalInfoNameFieldInfo where
+    type AttrAllowedOps DBusSignalInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusSignalInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint DBusSignalInfoNameFieldInfo = (~) DBusSignalInfo
+    type AttrGetType DBusSignalInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel DBusSignalInfoNameFieldInfo = "name"
+    attrGet _ = dBusSignalInfoReadName
+    attrSet _ = dBusSignalInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = dBusSignalInfoClearName
+
+dBusSignalInfoName :: AttrLabelProxy "name"
+dBusSignalInfoName = AttrLabelProxy
+
+
+dBusSignalInfoReadArgs :: MonadIO m => DBusSignalInfo -> m (Maybe [DBusArgInfo])
+dBusSignalInfoReadArgs s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO (Ptr (Ptr DBusArgInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusArgInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusArgInfo) val''
+        return val'''
+    return result
 
-dBusSignalInfoReadAnnotations :: DBusSignalInfo -> IO [DBusAnnotationInfo]
-dBusSignalInfoReadAnnotations s = withManagedPtr s $ \ptr -> do
+dBusSignalInfoWriteArgs :: MonadIO m => DBusSignalInfo -> Ptr (Ptr DBusArgInfo) -> m ()
+dBusSignalInfoWriteArgs s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: Ptr (Ptr DBusArgInfo))
+
+dBusSignalInfoClearArgs :: MonadIO m => DBusSignalInfo -> m ()
+dBusSignalInfoClearArgs s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (nullPtr :: Ptr (Ptr DBusArgInfo))
+
+data DBusSignalInfoArgsFieldInfo
+instance AttrInfo DBusSignalInfoArgsFieldInfo where
+    type AttrAllowedOps DBusSignalInfoArgsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusSignalInfoArgsFieldInfo = (~) (Ptr (Ptr DBusArgInfo))
+    type AttrBaseTypeConstraint DBusSignalInfoArgsFieldInfo = (~) DBusSignalInfo
+    type AttrGetType DBusSignalInfoArgsFieldInfo = Maybe [DBusArgInfo]
+    type AttrLabel DBusSignalInfoArgsFieldInfo = "args"
+    attrGet _ = dBusSignalInfoReadArgs
+    attrSet _ = dBusSignalInfoWriteArgs
+    attrConstruct = undefined
+    attrClear _ = dBusSignalInfoClearArgs
+
+dBusSignalInfoArgs :: AttrLabelProxy "args"
+dBusSignalInfoArgs = AttrLabelProxy
+
+
+dBusSignalInfoReadAnnotations :: MonadIO m => DBusSignalInfo -> m (Maybe [DBusAnnotationInfo])
+dBusSignalInfoReadAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 24) :: IO (Ptr (Ptr DBusAnnotationInfo))
-    val' <- unpackZeroTerminatedPtrArray val
-    val'' <- mapM (newBoxed DBusAnnotationInfo) val'
-    return val''
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- unpackZeroTerminatedPtrArray val'
+        val''' <- mapM (newBoxed DBusAnnotationInfo) val''
+        return val'''
+    return result
 
+dBusSignalInfoWriteAnnotations :: MonadIO m => DBusSignalInfo -> Ptr (Ptr DBusAnnotationInfo) -> m ()
+dBusSignalInfoWriteAnnotations s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (val :: Ptr (Ptr DBusAnnotationInfo))
+
+dBusSignalInfoClearAnnotations :: MonadIO m => DBusSignalInfo -> m ()
+dBusSignalInfoClearAnnotations s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 24) (nullPtr :: Ptr (Ptr DBusAnnotationInfo))
+
+data DBusSignalInfoAnnotationsFieldInfo
+instance AttrInfo DBusSignalInfoAnnotationsFieldInfo where
+    type AttrAllowedOps DBusSignalInfoAnnotationsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint DBusSignalInfoAnnotationsFieldInfo = (~) (Ptr (Ptr DBusAnnotationInfo))
+    type AttrBaseTypeConstraint DBusSignalInfoAnnotationsFieldInfo = (~) DBusSignalInfo
+    type AttrGetType DBusSignalInfoAnnotationsFieldInfo = Maybe [DBusAnnotationInfo]
+    type AttrLabel DBusSignalInfoAnnotationsFieldInfo = "annotations"
+    attrGet _ = dBusSignalInfoReadAnnotations
+    attrSet _ = dBusSignalInfoWriteAnnotations
+    attrConstruct = undefined
+    attrClear _ = dBusSignalInfoClearAnnotations
+
+dBusSignalInfoAnnotations :: AttrLabelProxy "annotations"
+dBusSignalInfoAnnotations = AttrLabelProxy
+
+
+
+type instance AttributeList DBusSignalInfo = DBusSignalInfoAttributeList
+type DBusSignalInfoAttributeList = ('[ '("refCount", DBusSignalInfoRefCountFieldInfo), '("name", DBusSignalInfoNameFieldInfo), '("args", DBusSignalInfoArgsFieldInfo), '("annotations", DBusSignalInfoAnnotationsFieldInfo)] :: [(Symbol, *)])
+
 -- method DBusSignalInfo::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusSignalInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "DBusSignalInfo"
+-- returnType : Just (TInterface "Gio" "DBusSignalInfo")
 -- throws : False
 -- Skip return : False
 
@@ -133,7 +253,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "DBusSignalInfo", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/DBusSignalInfo.hs-boot b/GI/Gio/Structs/DBusSignalInfo.hs-boot
--- a/GI/Gio/Structs/DBusSignalInfo.hs-boot
+++ b/GI/Gio/Structs/DBusSignalInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusSignalInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/DBusSubtreeVTable.hs b/GI/Gio/Structs/DBusSubtreeVTable.hs
--- a/GI/Gio/Structs/DBusSubtreeVTable.hs
+++ b/GI/Gio/Structs/DBusSubtreeVTable.hs
@@ -19,9 +19,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -34,12 +34,21 @@
 newZeroDBusSubtreeVTable :: MonadIO m => m DBusSubtreeVTable
 newZeroDBusSubtreeVTable = liftIO $ callocBytes 88 >>= wrapPtr DBusSubtreeVTable
 
+instance tag ~ 'AttrSet => Constructible DBusSubtreeVTable tag where
+    new _ attrs = do
+        o <- newZeroDBusSubtreeVTable
+        GI.Attributes.set o attrs
+        return o
+
+
 noDBusSubtreeVTable :: Maybe DBusSubtreeVTable
 noDBusSubtreeVTable = Nothing
 
--- XXX Skipped getter for "DBusSubtreeVTable:introspect" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+-- XXX Skipped attribute for "DBusSubtreeVTable:introspect" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+-- XXX Skipped attribute for "DBusSubtreeVTable:dispatch" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
 
--- XXX Skipped getter for "DBusSubtreeVTable:dispatch" :: Not implemented: "Wrapping foreign callbacks is not supported yet"
+type instance AttributeList DBusSubtreeVTable = DBusSubtreeVTableAttributeList
+type DBusSubtreeVTableAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveDBusSubtreeVTableMethod (t :: Symbol) (o :: *) :: * where
     ResolveDBusSubtreeVTableMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/DBusSubtreeVTable.hs-boot b/GI/Gio/Structs/DBusSubtreeVTable.hs-boot
--- a/GI/Gio/Structs/DBusSubtreeVTable.hs-boot
+++ b/GI/Gio/Structs/DBusSubtreeVTable.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.DBusSubtreeVTable where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/FileAttributeInfo.hs b/GI/Gio/Structs/FileAttributeInfo.hs
--- a/GI/Gio/Structs/FileAttributeInfo.hs
+++ b/GI/Gio/Structs/FileAttributeInfo.hs
@@ -19,24 +19,31 @@
 
  -- * Properties
 -- ** Flags
+    fileAttributeInfoFlags                  ,
     fileAttributeInfoReadFlags              ,
+    fileAttributeInfoWriteFlags             ,
 
 
 -- ** Name
+    fileAttributeInfoClearName              ,
+    fileAttributeInfoName                   ,
     fileAttributeInfoReadName               ,
+    fileAttributeInfoWriteName              ,
 
 
 -- ** Type
     fileAttributeInfoReadType               ,
+    fileAttributeInfoType                   ,
+    fileAttributeInfoWriteType              ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -49,26 +56,105 @@
 newZeroFileAttributeInfo :: MonadIO m => m FileAttributeInfo
 newZeroFileAttributeInfo = liftIO $ callocBytes 16 >>= wrapPtr FileAttributeInfo
 
+instance tag ~ 'AttrSet => Constructible FileAttributeInfo tag where
+    new _ attrs = do
+        o <- newZeroFileAttributeInfo
+        GI.Attributes.set o attrs
+        return o
+
+
 noFileAttributeInfo :: Maybe FileAttributeInfo
 noFileAttributeInfo = Nothing
 
-fileAttributeInfoReadName :: FileAttributeInfo -> IO T.Text
-fileAttributeInfoReadName s = withManagedPtr s $ \ptr -> do
+fileAttributeInfoReadName :: MonadIO m => FileAttributeInfo -> m (Maybe T.Text)
+fileAttributeInfoReadName s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO CString
-    val' <- cstringToText val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- cstringToText val'
+        return val''
+    return result
 
-fileAttributeInfoReadType :: FileAttributeInfo -> IO FileAttributeType
-fileAttributeInfoReadType s = withManagedPtr s $ \ptr -> do
+fileAttributeInfoWriteName :: MonadIO m => FileAttributeInfo -> CString -> m ()
+fileAttributeInfoWriteName s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: CString)
+
+fileAttributeInfoClearName :: MonadIO m => FileAttributeInfo -> m ()
+fileAttributeInfoClearName s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: CString)
+
+data FileAttributeInfoNameFieldInfo
+instance AttrInfo FileAttributeInfoNameFieldInfo where
+    type AttrAllowedOps FileAttributeInfoNameFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint FileAttributeInfoNameFieldInfo = (~) CString
+    type AttrBaseTypeConstraint FileAttributeInfoNameFieldInfo = (~) FileAttributeInfo
+    type AttrGetType FileAttributeInfoNameFieldInfo = Maybe T.Text
+    type AttrLabel FileAttributeInfoNameFieldInfo = "name"
+    attrGet _ = fileAttributeInfoReadName
+    attrSet _ = fileAttributeInfoWriteName
+    attrConstruct = undefined
+    attrClear _ = fileAttributeInfoClearName
+
+fileAttributeInfoName :: AttrLabelProxy "name"
+fileAttributeInfoName = AttrLabelProxy
+
+
+fileAttributeInfoReadType :: MonadIO m => FileAttributeInfo -> m FileAttributeType
+fileAttributeInfoReadType s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO CUInt
     let val' = (toEnum . fromIntegral) val
     return val'
 
-fileAttributeInfoReadFlags :: FileAttributeInfo -> IO [FileAttributeInfoFlags]
-fileAttributeInfoReadFlags s = withManagedPtr s $ \ptr -> do
+fileAttributeInfoWriteType :: MonadIO m => FileAttributeInfo -> FileAttributeType -> m ()
+fileAttributeInfoWriteType s val = liftIO $ withManagedPtr s $ \ptr -> do
+    let val' = (fromIntegral . fromEnum) val
+    poke (ptr `plusPtr` 8) (val' :: CUInt)
+
+data FileAttributeInfoTypeFieldInfo
+instance AttrInfo FileAttributeInfoTypeFieldInfo where
+    type AttrAllowedOps FileAttributeInfoTypeFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint FileAttributeInfoTypeFieldInfo = (~) FileAttributeType
+    type AttrBaseTypeConstraint FileAttributeInfoTypeFieldInfo = (~) FileAttributeInfo
+    type AttrGetType FileAttributeInfoTypeFieldInfo = FileAttributeType
+    type AttrLabel FileAttributeInfoTypeFieldInfo = "type"
+    attrGet _ = fileAttributeInfoReadType
+    attrSet _ = fileAttributeInfoWriteType
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+fileAttributeInfoType :: AttrLabelProxy "type"
+fileAttributeInfoType = AttrLabelProxy
+
+
+fileAttributeInfoReadFlags :: MonadIO m => FileAttributeInfo -> m [FileAttributeInfoFlags]
+fileAttributeInfoReadFlags s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 12) :: IO CUInt
     let val' = wordToGFlags val
     return val'
+
+fileAttributeInfoWriteFlags :: MonadIO m => FileAttributeInfo -> [FileAttributeInfoFlags] -> m ()
+fileAttributeInfoWriteFlags s val = liftIO $ withManagedPtr s $ \ptr -> do
+    let val' = gflagsToWord val
+    poke (ptr `plusPtr` 12) (val' :: CUInt)
+
+data FileAttributeInfoFlagsFieldInfo
+instance AttrInfo FileAttributeInfoFlagsFieldInfo where
+    type AttrAllowedOps FileAttributeInfoFlagsFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint FileAttributeInfoFlagsFieldInfo = (~) [FileAttributeInfoFlags]
+    type AttrBaseTypeConstraint FileAttributeInfoFlagsFieldInfo = (~) FileAttributeInfo
+    type AttrGetType FileAttributeInfoFlagsFieldInfo = [FileAttributeInfoFlags]
+    type AttrLabel FileAttributeInfoFlagsFieldInfo = "flags"
+    attrGet _ = fileAttributeInfoReadFlags
+    attrSet _ = fileAttributeInfoWriteFlags
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+fileAttributeInfoFlags :: AttrLabelProxy "flags"
+fileAttributeInfoFlags = AttrLabelProxy
+
+
+
+type instance AttributeList FileAttributeInfo = FileAttributeInfoAttributeList
+type FileAttributeInfoAttributeList = ('[ '("name", FileAttributeInfoNameFieldInfo), '("type", FileAttributeInfoTypeFieldInfo), '("flags", FileAttributeInfoFlagsFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveFileAttributeInfoMethod (t :: Symbol) (o :: *) :: * where
     ResolveFileAttributeInfoMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/FileAttributeInfo.hs-boot b/GI/Gio/Structs/FileAttributeInfo.hs-boot
--- a/GI/Gio/Structs/FileAttributeInfo.hs-boot
+++ b/GI/Gio/Structs/FileAttributeInfo.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.FileAttributeInfo where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/FileAttributeInfoList.hs b/GI/Gio/Structs/FileAttributeInfoList.hs
--- a/GI/Gio/Structs/FileAttributeInfoList.hs
+++ b/GI/Gio/Structs/FileAttributeInfoList.hs
@@ -52,20 +52,25 @@
 
  -- * Properties
 -- ** Infos
+    fileAttributeInfoListClearInfos         ,
+    fileAttributeInfoListInfos              ,
     fileAttributeInfoListReadInfos          ,
+    fileAttributeInfoListWriteInfos         ,
 
 
 -- ** NInfos
+    fileAttributeInfoListNInfos             ,
     fileAttributeInfoListReadNInfos         ,
+    fileAttributeInfoListWriteNInfos        ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -84,25 +89,82 @@
 newZeroFileAttributeInfoList :: MonadIO m => m FileAttributeInfoList
 newZeroFileAttributeInfoList = liftIO $ callocBoxedBytes 16 >>= wrapBoxed FileAttributeInfoList
 
+instance tag ~ 'AttrSet => Constructible FileAttributeInfoList tag where
+    new _ attrs = do
+        o <- newZeroFileAttributeInfoList
+        GI.Attributes.set o attrs
+        return o
+
+
 noFileAttributeInfoList :: Maybe FileAttributeInfoList
 noFileAttributeInfoList = Nothing
 
-fileAttributeInfoListReadInfos :: FileAttributeInfoList -> IO FileAttributeInfo
-fileAttributeInfoListReadInfos s = withManagedPtr s $ \ptr -> do
+fileAttributeInfoListReadInfos :: MonadIO m => FileAttributeInfoList -> m (Maybe FileAttributeInfo)
+fileAttributeInfoListReadInfos s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO (Ptr FileAttributeInfo)
-    val' <- (newPtr 16 FileAttributeInfo) val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- (newPtr 16 FileAttributeInfo) val'
+        return val''
+    return result
 
-fileAttributeInfoListReadNInfos :: FileAttributeInfoList -> IO Int32
-fileAttributeInfoListReadNInfos s = withManagedPtr s $ \ptr -> do
+fileAttributeInfoListWriteInfos :: MonadIO m => FileAttributeInfoList -> Ptr FileAttributeInfo -> m ()
+fileAttributeInfoListWriteInfos s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Ptr FileAttributeInfo)
+
+fileAttributeInfoListClearInfos :: MonadIO m => FileAttributeInfoList -> m ()
+fileAttributeInfoListClearInfos s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: Ptr FileAttributeInfo)
+
+data FileAttributeInfoListInfosFieldInfo
+instance AttrInfo FileAttributeInfoListInfosFieldInfo where
+    type AttrAllowedOps FileAttributeInfoListInfosFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint FileAttributeInfoListInfosFieldInfo = (~) (Ptr FileAttributeInfo)
+    type AttrBaseTypeConstraint FileAttributeInfoListInfosFieldInfo = (~) FileAttributeInfoList
+    type AttrGetType FileAttributeInfoListInfosFieldInfo = Maybe FileAttributeInfo
+    type AttrLabel FileAttributeInfoListInfosFieldInfo = "infos"
+    attrGet _ = fileAttributeInfoListReadInfos
+    attrSet _ = fileAttributeInfoListWriteInfos
+    attrConstruct = undefined
+    attrClear _ = fileAttributeInfoListClearInfos
+
+fileAttributeInfoListInfos :: AttrLabelProxy "infos"
+fileAttributeInfoListInfos = AttrLabelProxy
+
+
+fileAttributeInfoListReadNInfos :: MonadIO m => FileAttributeInfoList -> m Int32
+fileAttributeInfoListReadNInfos s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO Int32
     return val
 
+fileAttributeInfoListWriteNInfos :: MonadIO m => FileAttributeInfoList -> Int32 -> m ()
+fileAttributeInfoListWriteNInfos s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: Int32)
+
+data FileAttributeInfoListNInfosFieldInfo
+instance AttrInfo FileAttributeInfoListNInfosFieldInfo where
+    type AttrAllowedOps FileAttributeInfoListNInfosFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint FileAttributeInfoListNInfosFieldInfo = (~) Int32
+    type AttrBaseTypeConstraint FileAttributeInfoListNInfosFieldInfo = (~) FileAttributeInfoList
+    type AttrGetType FileAttributeInfoListNInfosFieldInfo = Int32
+    type AttrLabel FileAttributeInfoListNInfosFieldInfo = "n_infos"
+    attrGet _ = fileAttributeInfoListReadNInfos
+    attrSet _ = fileAttributeInfoListWriteNInfos
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+fileAttributeInfoListNInfos :: AttrLabelProxy "nInfos"
+fileAttributeInfoListNInfos = AttrLabelProxy
+
+
+
+type instance AttributeList FileAttributeInfoList = FileAttributeInfoListAttributeList
+type FileAttributeInfoListAttributeList = ('[ '("infos", FileAttributeInfoListInfosFieldInfo), '("nInfos", FileAttributeInfoListNInfosFieldInfo)] :: [(Symbol, *)])
+
 -- method FileAttributeInfoList::new
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfoList"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfoList")
 -- throws : False
 -- Skip return : False
 
@@ -123,7 +185,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeInfoList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TInterface "Gio" "FileAttributeType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Gio" "FileAttributeInfoFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -160,7 +222,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeInfoList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfoList"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfoList")
 -- throws : False
 -- Skip return : False
 
@@ -189,7 +251,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeInfoList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfo"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfo")
 -- throws : False
 -- Skip return : False
 
@@ -222,7 +284,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeInfoList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeInfoList"
+-- returnType : Just (TInterface "Gio" "FileAttributeInfoList")
 -- throws : False
 -- Skip return : False
 
@@ -251,7 +313,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeInfoList", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/FileAttributeInfoList.hs-boot b/GI/Gio/Structs/FileAttributeInfoList.hs-boot
--- a/GI/Gio/Structs/FileAttributeInfoList.hs-boot
+++ b/GI/Gio/Structs/FileAttributeInfoList.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.FileAttributeInfoList where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/FileAttributeMatcher.hs b/GI/Gio/Structs/FileAttributeMatcher.hs
--- a/GI/Gio/Structs/FileAttributeMatcher.hs
+++ b/GI/Gio/Structs/FileAttributeMatcher.hs
@@ -65,9 +65,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -85,11 +85,15 @@
 noFileAttributeMatcher :: Maybe FileAttributeMatcher
 noFileAttributeMatcher = Nothing
 
+
+type instance AttributeList FileAttributeMatcher = FileAttributeMatcherAttributeList
+type FileAttributeMatcherAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method FileAttributeMatcher::new
 -- method type : Constructor
 -- Args : [Arg {argCName = "attributes", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeMatcher"
+-- returnType : Just (TInterface "Gio" "FileAttributeMatcher")
 -- throws : False
 -- Skip return : False
 
@@ -114,7 +118,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "ns", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -146,7 +150,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -175,7 +179,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -207,7 +211,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attribute", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -239,7 +243,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeMatcher"
+-- returnType : Just (TInterface "Gio" "FileAttributeMatcher")
 -- throws : False
 -- Skip return : False
 
@@ -268,7 +272,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "subtract", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "FileAttributeMatcher"
+-- returnType : Just (TInterface "Gio" "FileAttributeMatcher")
 -- throws : False
 -- Skip return : False
 
@@ -301,7 +305,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -331,7 +335,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "FileAttributeMatcher", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/FileAttributeMatcher.hs-boot b/GI/Gio/Structs/FileAttributeMatcher.hs-boot
--- a/GI/Gio/Structs/FileAttributeMatcher.hs-boot
+++ b/GI/Gio/Structs/FileAttributeMatcher.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.FileAttributeMatcher where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/IOExtension.hs b/GI/Gio/Structs/IOExtension.hs
--- a/GI/Gio/Structs/IOExtension.hs
+++ b/GI/Gio/Structs/IOExtension.hs
@@ -37,9 +37,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -51,11 +51,15 @@
 noIOExtension :: Maybe IOExtension
 noIOExtension = Nothing
 
+
+type instance AttributeList IOExtension = IOExtensionAttributeList
+type IOExtensionAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method IOExtension::get_name
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtension", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -84,7 +88,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtension", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -111,7 +115,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtension", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/IOExtension.hs-boot b/GI/Gio/Structs/IOExtension.hs-boot
--- a/GI/Gio/Structs/IOExtension.hs-boot
+++ b/GI/Gio/Structs/IOExtension.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.IOExtension where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/IOExtensionPoint.hs b/GI/Gio/Structs/IOExtensionPoint.hs
--- a/GI/Gio/Structs/IOExtensionPoint.hs
+++ b/GI/Gio/Structs/IOExtensionPoint.hs
@@ -54,9 +54,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -68,11 +68,15 @@
 noIOExtensionPoint :: Maybe IOExtensionPoint
 noIOExtensionPoint = Nothing
 
+
+type instance AttributeList IOExtensionPoint = IOExtensionPointAttributeList
+type IOExtensionPointAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method IOExtensionPoint::get_extension_by_name
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtensionPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOExtension"
+-- returnType : Just (TInterface "Gio" "IOExtension")
 -- throws : False
 -- Skip return : False
 
@@ -106,7 +110,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtensionPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TGList (TInterface "Gio" "IOExtension")
+-- returnType : Just (TGList (TInterface "Gio" "IOExtension"))
 -- throws : False
 -- Skip return : False
 
@@ -122,7 +126,6 @@
 iOExtensionPointGetExtensions _obj = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     result <- g_io_extension_point_get_extensions _obj'
-    checkUnexpectedReturnNULL "g_io_extension_point_get_extensions" result
     -- XXX Wrapping a foreign struct/union with no known destructor, leak?
     result' <- unpackGList result
     result'' <- mapM (\x -> IOExtension <$> newForeignPtr_ x) result'
@@ -137,7 +140,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtensionPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TGType
+-- returnType : Just (TBasicType TGType)
 -- throws : False
 -- Skip return : False
 
@@ -165,7 +168,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOExtensionPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -193,9 +196,9 @@
 
 -- method IOExtensionPoint::implement
 -- method type : MemberFunction
--- Args : [Arg {argCName = "extension_point_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "extension_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "extension_point_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "type", argType = TBasicType TGType, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "extension_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOExtension"
+-- returnType : Just (TInterface "Gio" "IOExtension")
 -- throws : False
 -- Skip return : False
 
@@ -203,7 +206,7 @@
     CString ->                              -- extension_point_name : TBasicType TUTF8
     CGType ->                               -- type : TBasicType TGType
     CString ->                              -- extension_name : TBasicType TUTF8
-    Int32 ->                                -- priority : TBasicType TInt32
+    Int32 ->                                -- priority : TBasicType TInt
     IO (Ptr IOExtension)
 
 
@@ -230,7 +233,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOExtensionPoint"
+-- returnType : Just (TInterface "Gio" "IOExtensionPoint")
 -- throws : False
 -- Skip return : False
 
@@ -256,7 +259,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "IOExtensionPoint"
+-- returnType : Just (TInterface "Gio" "IOExtensionPoint")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/IOExtensionPoint.hs-boot b/GI/Gio/Structs/IOExtensionPoint.hs-boot
--- a/GI/Gio/Structs/IOExtensionPoint.hs-boot
+++ b/GI/Gio/Structs/IOExtensionPoint.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.IOExtensionPoint where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/IOModuleScope.hs b/GI/Gio/Structs/IOModuleScope.hs
--- a/GI/Gio/Structs/IOModuleScope.hs
+++ b/GI/Gio/Structs/IOModuleScope.hs
@@ -35,9 +35,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -49,11 +49,15 @@
 noIOModuleScope :: Maybe IOModuleScope
 noIOModuleScope = Nothing
 
+
+type instance AttributeList IOModuleScope = IOModuleScopeAttributeList
+type IOModuleScopeAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method IOModuleScope::block
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOModuleScope", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "basename", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -84,7 +88,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOModuleScope", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/IOModuleScope.hs-boot b/GI/Gio/Structs/IOModuleScope.hs-boot
--- a/GI/Gio/Structs/IOModuleScope.hs-boot
+++ b/GI/Gio/Structs/IOModuleScope.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.IOModuleScope where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/IOSchedulerJob.hs b/GI/Gio/Structs/IOSchedulerJob.hs
--- a/GI/Gio/Structs/IOSchedulerJob.hs
+++ b/GI/Gio/Structs/IOSchedulerJob.hs
@@ -31,9 +31,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -46,18 +46,22 @@
 noIOSchedulerJob :: Maybe IOSchedulerJob
 noIOSchedulerJob = Nothing
 
+
+type instance AttributeList IOSchedulerJob = IOSchedulerJobAttributeList
+type IOSchedulerJobAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method IOSchedulerJob::send_to_mainloop
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOSchedulerJob", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "func", argType = TInterface "GLib" "SourceFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOSchedulerJob", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "func", argType = TInterface "GLib" "SourceFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_io_scheduler_job_send_to_mainloop" g_io_scheduler_job_send_to_mainloop :: 
     Ptr IOSchedulerJob ->                   -- _obj : TInterface "Gio" "IOSchedulerJob"
     FunPtr GLib.SourceFuncC ->              -- func : TInterface "GLib" "SourceFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- notify : TInterface "GLib" "DestroyNotify"
     IO CInt
 
@@ -83,16 +87,16 @@
 
 -- method IOSchedulerJob::send_to_mainloop_async
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOSchedulerJob", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "func", argType = TInterface "GLib" "SourceFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "IOSchedulerJob", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "func", argType = TInterface "GLib" "SourceFunc", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 2, argDestroy = 3, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "notify", argType = TInterface "GLib" "DestroyNotify", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeAsync, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "g_io_scheduler_job_send_to_mainloop_async" g_io_scheduler_job_send_to_mainloop_async :: 
     Ptr IOSchedulerJob ->                   -- _obj : TInterface "Gio" "IOSchedulerJob"
     FunPtr GLib.SourceFuncC ->              -- func : TInterface "GLib" "SourceFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- notify : TInterface "GLib" "DestroyNotify"
     IO ()
 
diff --git a/GI/Gio/Structs/IOSchedulerJob.hs-boot b/GI/Gio/Structs/IOSchedulerJob.hs-boot
--- a/GI/Gio/Structs/IOSchedulerJob.hs-boot
+++ b/GI/Gio/Structs/IOSchedulerJob.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.IOSchedulerJob where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/IOStreamAdapter.hs b/GI/Gio/Structs/IOStreamAdapter.hs
--- a/GI/Gio/Structs/IOStreamAdapter.hs
+++ b/GI/Gio/Structs/IOStreamAdapter.hs
@@ -16,9 +16,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -29,6 +29,10 @@
 newtype IOStreamAdapter = IOStreamAdapter (ForeignPtr IOStreamAdapter)
 noIOStreamAdapter :: Maybe IOStreamAdapter
 noIOStreamAdapter = Nothing
+
+
+type instance AttributeList IOStreamAdapter = IOStreamAdapterAttributeList
+type IOStreamAdapterAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveIOStreamAdapterMethod (t :: Symbol) (o :: *) :: * where
     ResolveIOStreamAdapterMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/IOStreamAdapter.hs-boot b/GI/Gio/Structs/IOStreamAdapter.hs-boot
--- a/GI/Gio/Structs/IOStreamAdapter.hs-boot
+++ b/GI/Gio/Structs/IOStreamAdapter.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.IOStreamAdapter where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/InputVector.hs b/GI/Gio/Structs/InputVector.hs
--- a/GI/Gio/Structs/InputVector.hs
+++ b/GI/Gio/Structs/InputVector.hs
@@ -22,20 +22,25 @@
 
  -- * Properties
 -- ** Buffer
+    inputVectorBuffer                       ,
+    inputVectorClearBuffer                  ,
     inputVectorReadBuffer                   ,
+    inputVectorWriteBuffer                  ,
 
 
 -- ** Size
     inputVectorReadSize                     ,
+    inputVectorSize                         ,
+    inputVectorWriteSize                    ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -48,18 +53,73 @@
 newZeroInputVector :: MonadIO m => m InputVector
 newZeroInputVector = liftIO $ callocBytes 16 >>= wrapPtr InputVector
 
+instance tag ~ 'AttrSet => Constructible InputVector tag where
+    new _ attrs = do
+        o <- newZeroInputVector
+        GI.Attributes.set o attrs
+        return o
+
+
 noInputVector :: Maybe InputVector
 noInputVector = Nothing
 
-inputVectorReadBuffer :: InputVector -> IO (Ptr ())
-inputVectorReadBuffer s = withManagedPtr s $ \ptr -> do
+inputVectorReadBuffer :: MonadIO m => InputVector -> m (Ptr ())
+inputVectorReadBuffer s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO (Ptr ())
     return val
 
-inputVectorReadSize :: InputVector -> IO Word64
-inputVectorReadSize s = withManagedPtr s $ \ptr -> do
+inputVectorWriteBuffer :: MonadIO m => InputVector -> Ptr () -> m ()
+inputVectorWriteBuffer s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Ptr ())
+
+inputVectorClearBuffer :: MonadIO m => InputVector -> m ()
+inputVectorClearBuffer s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: Ptr ())
+
+data InputVectorBufferFieldInfo
+instance AttrInfo InputVectorBufferFieldInfo where
+    type AttrAllowedOps InputVectorBufferFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint InputVectorBufferFieldInfo = (~) (Ptr ())
+    type AttrBaseTypeConstraint InputVectorBufferFieldInfo = (~) InputVector
+    type AttrGetType InputVectorBufferFieldInfo = Ptr ()
+    type AttrLabel InputVectorBufferFieldInfo = "buffer"
+    attrGet _ = inputVectorReadBuffer
+    attrSet _ = inputVectorWriteBuffer
+    attrConstruct = undefined
+    attrClear _ = inputVectorClearBuffer
+
+inputVectorBuffer :: AttrLabelProxy "buffer"
+inputVectorBuffer = AttrLabelProxy
+
+
+inputVectorReadSize :: MonadIO m => InputVector -> m Word64
+inputVectorReadSize s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO Word64
     return val
+
+inputVectorWriteSize :: MonadIO m => InputVector -> Word64 -> m ()
+inputVectorWriteSize s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: Word64)
+
+data InputVectorSizeFieldInfo
+instance AttrInfo InputVectorSizeFieldInfo where
+    type AttrAllowedOps InputVectorSizeFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint InputVectorSizeFieldInfo = (~) Word64
+    type AttrBaseTypeConstraint InputVectorSizeFieldInfo = (~) InputVector
+    type AttrGetType InputVectorSizeFieldInfo = Word64
+    type AttrLabel InputVectorSizeFieldInfo = "size"
+    attrGet _ = inputVectorReadSize
+    attrSet _ = inputVectorWriteSize
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+inputVectorSize :: AttrLabelProxy "size"
+inputVectorSize = AttrLabelProxy
+
+
+
+type instance AttributeList InputVector = InputVectorAttributeList
+type InputVectorAttributeList = ('[ '("buffer", InputVectorBufferFieldInfo), '("size", InputVectorSizeFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveInputVectorMethod (t :: Symbol) (o :: *) :: * where
     ResolveInputVectorMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/InputVector.hs-boot b/GI/Gio/Structs/InputVector.hs-boot
--- a/GI/Gio/Structs/InputVector.hs-boot
+++ b/GI/Gio/Structs/InputVector.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.InputVector where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/NativeSocketAddress.hs b/GI/Gio/Structs/NativeSocketAddress.hs
--- a/GI/Gio/Structs/NativeSocketAddress.hs
+++ b/GI/Gio/Structs/NativeSocketAddress.hs
@@ -18,9 +18,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -31,6 +31,10 @@
 newtype NativeSocketAddress = NativeSocketAddress (ForeignPtr NativeSocketAddress)
 noNativeSocketAddress :: Maybe NativeSocketAddress
 noNativeSocketAddress = Nothing
+
+
+type instance AttributeList NativeSocketAddress = NativeSocketAddressAttributeList
+type NativeSocketAddressAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveNativeSocketAddressMethod (t :: Symbol) (o :: *) :: * where
     ResolveNativeSocketAddressMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/NativeSocketAddress.hs-boot b/GI/Gio/Structs/NativeSocketAddress.hs-boot
--- a/GI/Gio/Structs/NativeSocketAddress.hs-boot
+++ b/GI/Gio/Structs/NativeSocketAddress.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.NativeSocketAddress where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/OutputMessage.hs b/GI/Gio/Structs/OutputMessage.hs
--- a/GI/Gio/Structs/OutputMessage.hs
+++ b/GI/Gio/Structs/OutputMessage.hs
@@ -25,32 +25,44 @@
 
  -- * Properties
 -- ** Address
+    outputMessageAddress                    ,
+    outputMessageClearAddress               ,
     outputMessageReadAddress                ,
+    outputMessageWriteAddress               ,
 
 
 -- ** BytesSent
+    outputMessageBytesSent                  ,
     outputMessageReadBytesSent              ,
+    outputMessageWriteBytesSent             ,
 
 
 -- ** NumControlMessages
+    outputMessageNumControlMessages         ,
     outputMessageReadNumControlMessages     ,
+    outputMessageWriteNumControlMessages    ,
 
 
 -- ** NumVectors
+    outputMessageNumVectors                 ,
     outputMessageReadNumVectors             ,
+    outputMessageWriteNumVectors            ,
 
 
 -- ** Vectors
+    outputMessageClearVectors               ,
     outputMessageReadVectors                ,
+    outputMessageVectors                    ,
+    outputMessageWriteVectors               ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -63,37 +75,159 @@
 newZeroOutputMessage :: MonadIO m => m OutputMessage
 newZeroOutputMessage = liftIO $ callocBytes 40 >>= wrapPtr OutputMessage
 
+instance tag ~ 'AttrSet => Constructible OutputMessage tag where
+    new _ attrs = do
+        o <- newZeroOutputMessage
+        GI.Attributes.set o attrs
+        return o
+
+
 noOutputMessage :: Maybe OutputMessage
 noOutputMessage = Nothing
 
-outputMessageReadAddress :: OutputMessage -> IO SocketAddress
-outputMessageReadAddress s = withManagedPtr s $ \ptr -> do
+outputMessageReadAddress :: MonadIO m => OutputMessage -> m (Maybe SocketAddress)
+outputMessageReadAddress s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO (Ptr SocketAddress)
-    val' <- (newObject SocketAddress) val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- (newObject SocketAddress) val'
+        return val''
+    return result
 
-outputMessageReadVectors :: OutputMessage -> IO OutputVector
-outputMessageReadVectors s = withManagedPtr s $ \ptr -> do
+outputMessageWriteAddress :: MonadIO m => OutputMessage -> Ptr SocketAddress -> m ()
+outputMessageWriteAddress s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Ptr SocketAddress)
+
+outputMessageClearAddress :: MonadIO m => OutputMessage -> m ()
+outputMessageClearAddress s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: Ptr SocketAddress)
+
+data OutputMessageAddressFieldInfo
+instance AttrInfo OutputMessageAddressFieldInfo where
+    type AttrAllowedOps OutputMessageAddressFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint OutputMessageAddressFieldInfo = (~) (Ptr SocketAddress)
+    type AttrBaseTypeConstraint OutputMessageAddressFieldInfo = (~) OutputMessage
+    type AttrGetType OutputMessageAddressFieldInfo = Maybe SocketAddress
+    type AttrLabel OutputMessageAddressFieldInfo = "address"
+    attrGet _ = outputMessageReadAddress
+    attrSet _ = outputMessageWriteAddress
+    attrConstruct = undefined
+    attrClear _ = outputMessageClearAddress
+
+outputMessageAddress :: AttrLabelProxy "address"
+outputMessageAddress = AttrLabelProxy
+
+
+outputMessageReadVectors :: MonadIO m => OutputMessage -> m (Maybe OutputVector)
+outputMessageReadVectors s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO (Ptr OutputVector)
-    val' <- (newPtr 16 OutputVector) val
-    return val'
+    result <- convertIfNonNull val $ \val' -> do
+        val'' <- (newPtr 16 OutputVector) val'
+        return val''
+    return result
 
-outputMessageReadNumVectors :: OutputMessage -> IO Word32
-outputMessageReadNumVectors s = withManagedPtr s $ \ptr -> do
+outputMessageWriteVectors :: MonadIO m => OutputMessage -> Ptr OutputVector -> m ()
+outputMessageWriteVectors s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: Ptr OutputVector)
+
+outputMessageClearVectors :: MonadIO m => OutputMessage -> m ()
+outputMessageClearVectors s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (nullPtr :: Ptr OutputVector)
+
+data OutputMessageVectorsFieldInfo
+instance AttrInfo OutputMessageVectorsFieldInfo where
+    type AttrAllowedOps OutputMessageVectorsFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint OutputMessageVectorsFieldInfo = (~) (Ptr OutputVector)
+    type AttrBaseTypeConstraint OutputMessageVectorsFieldInfo = (~) OutputMessage
+    type AttrGetType OutputMessageVectorsFieldInfo = Maybe OutputVector
+    type AttrLabel OutputMessageVectorsFieldInfo = "vectors"
+    attrGet _ = outputMessageReadVectors
+    attrSet _ = outputMessageWriteVectors
+    attrConstruct = undefined
+    attrClear _ = outputMessageClearVectors
+
+outputMessageVectors :: AttrLabelProxy "vectors"
+outputMessageVectors = AttrLabelProxy
+
+
+outputMessageReadNumVectors :: MonadIO m => OutputMessage -> m Word32
+outputMessageReadNumVectors s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 16) :: IO Word32
     return val
 
-outputMessageReadBytesSent :: OutputMessage -> IO Word32
-outputMessageReadBytesSent s = withManagedPtr s $ \ptr -> do
+outputMessageWriteNumVectors :: MonadIO m => OutputMessage -> Word32 -> m ()
+outputMessageWriteNumVectors s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 16) (val :: Word32)
+
+data OutputMessageNumVectorsFieldInfo
+instance AttrInfo OutputMessageNumVectorsFieldInfo where
+    type AttrAllowedOps OutputMessageNumVectorsFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint OutputMessageNumVectorsFieldInfo = (~) Word32
+    type AttrBaseTypeConstraint OutputMessageNumVectorsFieldInfo = (~) OutputMessage
+    type AttrGetType OutputMessageNumVectorsFieldInfo = Word32
+    type AttrLabel OutputMessageNumVectorsFieldInfo = "num_vectors"
+    attrGet _ = outputMessageReadNumVectors
+    attrSet _ = outputMessageWriteNumVectors
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+outputMessageNumVectors :: AttrLabelProxy "numVectors"
+outputMessageNumVectors = AttrLabelProxy
+
+
+outputMessageReadBytesSent :: MonadIO m => OutputMessage -> m Word32
+outputMessageReadBytesSent s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 20) :: IO Word32
     return val
 
--- XXX Skipped getter for "OutputMessage:control_messages" :: Not implemented: "Don't know how to unpack C array of type TCArray False (-1) 5 (TInterface \"Gio\" \"SocketControlMessage\")"
+outputMessageWriteBytesSent :: MonadIO m => OutputMessage -> Word32 -> m ()
+outputMessageWriteBytesSent s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 20) (val :: Word32)
 
-outputMessageReadNumControlMessages :: OutputMessage -> IO Word32
-outputMessageReadNumControlMessages s = withManagedPtr s $ \ptr -> do
+data OutputMessageBytesSentFieldInfo
+instance AttrInfo OutputMessageBytesSentFieldInfo where
+    type AttrAllowedOps OutputMessageBytesSentFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint OutputMessageBytesSentFieldInfo = (~) Word32
+    type AttrBaseTypeConstraint OutputMessageBytesSentFieldInfo = (~) OutputMessage
+    type AttrGetType OutputMessageBytesSentFieldInfo = Word32
+    type AttrLabel OutputMessageBytesSentFieldInfo = "bytes_sent"
+    attrGet _ = outputMessageReadBytesSent
+    attrSet _ = outputMessageWriteBytesSent
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+outputMessageBytesSent :: AttrLabelProxy "bytesSent"
+outputMessageBytesSent = AttrLabelProxy
+
+
+-- XXX Skipped attribute for "OutputMessage:control_messages" :: Not implemented: "Don't know how to unpack C array of type TCArray False (-1) 5 (TInterface \"Gio\" \"SocketControlMessage\")"
+outputMessageReadNumControlMessages :: MonadIO m => OutputMessage -> m Word32
+outputMessageReadNumControlMessages s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 32) :: IO Word32
     return val
+
+outputMessageWriteNumControlMessages :: MonadIO m => OutputMessage -> Word32 -> m ()
+outputMessageWriteNumControlMessages s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 32) (val :: Word32)
+
+data OutputMessageNumControlMessagesFieldInfo
+instance AttrInfo OutputMessageNumControlMessagesFieldInfo where
+    type AttrAllowedOps OutputMessageNumControlMessagesFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint OutputMessageNumControlMessagesFieldInfo = (~) Word32
+    type AttrBaseTypeConstraint OutputMessageNumControlMessagesFieldInfo = (~) OutputMessage
+    type AttrGetType OutputMessageNumControlMessagesFieldInfo = Word32
+    type AttrLabel OutputMessageNumControlMessagesFieldInfo = "num_control_messages"
+    attrGet _ = outputMessageReadNumControlMessages
+    attrSet _ = outputMessageWriteNumControlMessages
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+outputMessageNumControlMessages :: AttrLabelProxy "numControlMessages"
+outputMessageNumControlMessages = AttrLabelProxy
+
+
+
+type instance AttributeList OutputMessage = OutputMessageAttributeList
+type OutputMessageAttributeList = ('[ '("address", OutputMessageAddressFieldInfo), '("vectors", OutputMessageVectorsFieldInfo), '("numVectors", OutputMessageNumVectorsFieldInfo), '("bytesSent", OutputMessageBytesSentFieldInfo), '("numControlMessages", OutputMessageNumControlMessagesFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveOutputMessageMethod (t :: Symbol) (o :: *) :: * where
     ResolveOutputMessageMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/OutputMessage.hs-boot b/GI/Gio/Structs/OutputMessage.hs-boot
--- a/GI/Gio/Structs/OutputMessage.hs-boot
+++ b/GI/Gio/Structs/OutputMessage.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.OutputMessage where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/OutputVector.hs b/GI/Gio/Structs/OutputVector.hs
--- a/GI/Gio/Structs/OutputVector.hs
+++ b/GI/Gio/Structs/OutputVector.hs
@@ -22,20 +22,25 @@
 
  -- * Properties
 -- ** Buffer
+    outputVectorBuffer                      ,
+    outputVectorClearBuffer                 ,
     outputVectorReadBuffer                  ,
+    outputVectorWriteBuffer                 ,
 
 
 -- ** Size
     outputVectorReadSize                    ,
+    outputVectorSize                        ,
+    outputVectorWriteSize                   ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -48,18 +53,73 @@
 newZeroOutputVector :: MonadIO m => m OutputVector
 newZeroOutputVector = liftIO $ callocBytes 16 >>= wrapPtr OutputVector
 
+instance tag ~ 'AttrSet => Constructible OutputVector tag where
+    new _ attrs = do
+        o <- newZeroOutputVector
+        GI.Attributes.set o attrs
+        return o
+
+
 noOutputVector :: Maybe OutputVector
 noOutputVector = Nothing
 
-outputVectorReadBuffer :: OutputVector -> IO (Ptr ())
-outputVectorReadBuffer s = withManagedPtr s $ \ptr -> do
+outputVectorReadBuffer :: MonadIO m => OutputVector -> m (Ptr ())
+outputVectorReadBuffer s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 0) :: IO (Ptr ())
     return val
 
-outputVectorReadSize :: OutputVector -> IO Word64
-outputVectorReadSize s = withManagedPtr s $ \ptr -> do
+outputVectorWriteBuffer :: MonadIO m => OutputVector -> Ptr () -> m ()
+outputVectorWriteBuffer s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (val :: Ptr ())
+
+outputVectorClearBuffer :: MonadIO m => OutputVector -> m ()
+outputVectorClearBuffer s = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 0) (nullPtr :: Ptr ())
+
+data OutputVectorBufferFieldInfo
+instance AttrInfo OutputVectorBufferFieldInfo where
+    type AttrAllowedOps OutputVectorBufferFieldInfo = '[ 'AttrSet, 'AttrGet, 'AttrClear]
+    type AttrSetTypeConstraint OutputVectorBufferFieldInfo = (~) (Ptr ())
+    type AttrBaseTypeConstraint OutputVectorBufferFieldInfo = (~) OutputVector
+    type AttrGetType OutputVectorBufferFieldInfo = Ptr ()
+    type AttrLabel OutputVectorBufferFieldInfo = "buffer"
+    attrGet _ = outputVectorReadBuffer
+    attrSet _ = outputVectorWriteBuffer
+    attrConstruct = undefined
+    attrClear _ = outputVectorClearBuffer
+
+outputVectorBuffer :: AttrLabelProxy "buffer"
+outputVectorBuffer = AttrLabelProxy
+
+
+outputVectorReadSize :: MonadIO m => OutputVector -> m Word64
+outputVectorReadSize s = liftIO $ withManagedPtr s $ \ptr -> do
     val <- peek (ptr `plusPtr` 8) :: IO Word64
     return val
+
+outputVectorWriteSize :: MonadIO m => OutputVector -> Word64 -> m ()
+outputVectorWriteSize s val = liftIO $ withManagedPtr s $ \ptr -> do
+    poke (ptr `plusPtr` 8) (val :: Word64)
+
+data OutputVectorSizeFieldInfo
+instance AttrInfo OutputVectorSizeFieldInfo where
+    type AttrAllowedOps OutputVectorSizeFieldInfo = '[ 'AttrSet, 'AttrGet]
+    type AttrSetTypeConstraint OutputVectorSizeFieldInfo = (~) Word64
+    type AttrBaseTypeConstraint OutputVectorSizeFieldInfo = (~) OutputVector
+    type AttrGetType OutputVectorSizeFieldInfo = Word64
+    type AttrLabel OutputVectorSizeFieldInfo = "size"
+    attrGet _ = outputVectorReadSize
+    attrSet _ = outputVectorWriteSize
+    attrConstruct = undefined
+    attrClear _ = undefined
+
+outputVectorSize :: AttrLabelProxy "size"
+outputVectorSize = AttrLabelProxy
+
+
+
+type instance AttributeList OutputVector = OutputVectorAttributeList
+type OutputVectorAttributeList = ('[ '("buffer", OutputVectorBufferFieldInfo), '("size", OutputVectorSizeFieldInfo)] :: [(Symbol, *)])
 
 type family ResolveOutputVectorMethod (t :: Symbol) (o :: *) :: * where
     ResolveOutputVectorMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/OutputVector.hs-boot b/GI/Gio/Structs/OutputVector.hs-boot
--- a/GI/Gio/Structs/OutputVector.hs-boot
+++ b/GI/Gio/Structs/OutputVector.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.OutputVector where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/Resource.hs b/GI/Gio/Structs/Resource.hs
--- a/GI/Gio/Structs/Resource.hs
+++ b/GI/Gio/Structs/Resource.hs
@@ -144,9 +144,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -165,11 +165,15 @@
 noResource :: Maybe Resource
 noResource = Nothing
 
+
+type instance AttributeList Resource = ResourceAttributeList
+type ResourceAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method Resource::new_from_data
 -- method type : Constructor
 -- Args : [Arg {argCName = "data", argType = TInterface "GLib" "Bytes", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Resource"
+-- returnType : Just (TInterface "Gio" "Resource")
 -- throws : True
 -- Skip return : False
 
@@ -199,7 +203,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : True
 -- Skip return : False
 
@@ -242,7 +246,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "size", argType = TBasicType TUInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "flags", argType = TBasicType TUInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -291,7 +295,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Bytes"
+-- returnType : Just (TInterface "GLib" "Bytes")
 -- throws : True
 -- Skip return : False
 
@@ -332,7 +336,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "path", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lookup_flags", argType = TInterface "Gio" "ResourceLookupFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "InputStream"
+-- returnType : Just (TInterface "Gio" "InputStream")
 -- throws : True
 -- Skip return : False
 
@@ -373,7 +377,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Resource"
+-- returnType : Just (TInterface "Gio" "Resource")
 -- throws : False
 -- Skip return : False
 
@@ -402,7 +406,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "Resource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -429,7 +433,7 @@
 -- method type : MemberFunction
 -- Args : [Arg {argCName = "filename", argType = TBasicType TFileName, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Resource"
+-- returnType : Just (TInterface "Gio" "Resource")
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/Resource.hs-boot b/GI/Gio/Structs/Resource.hs-boot
--- a/GI/Gio/Structs/Resource.hs-boot
+++ b/GI/Gio/Structs/Resource.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.Resource where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/SettingsBackend.hs b/GI/Gio/Structs/SettingsBackend.hs
--- a/GI/Gio/Structs/SettingsBackend.hs
+++ b/GI/Gio/Structs/SettingsBackend.hs
@@ -41,9 +41,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -54,6 +54,10 @@
 newtype SettingsBackend = SettingsBackend (ForeignPtr SettingsBackend)
 noSettingsBackend :: Maybe SettingsBackend
 noSettingsBackend = Nothing
+
+
+type instance AttributeList SettingsBackend = SettingsBackendAttributeList
+type SettingsBackendAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveSettingsBackendMethod (t :: Symbol) (o :: *) :: * where
     ResolveSettingsBackendMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/SettingsBackend.hs-boot b/GI/Gio/Structs/SettingsBackend.hs-boot
--- a/GI/Gio/Structs/SettingsBackend.hs-boot
+++ b/GI/Gio/Structs/SettingsBackend.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.SettingsBackend where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/SettingsSchema.hs b/GI/Gio/Structs/SettingsSchema.hs
--- a/GI/Gio/Structs/SettingsSchema.hs
+++ b/GI/Gio/Structs/SettingsSchema.hs
@@ -150,9 +150,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -170,11 +170,15 @@
 noSettingsSchema :: Maybe SettingsSchema
 noSettingsSchema = Nothing
 
+
+type instance AttributeList SettingsSchema = SettingsSchemaAttributeList
+type SettingsSchemaAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method SettingsSchema::get_id
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -203,7 +207,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchemaKey"
+-- returnType : Just (TInterface "Gio" "SettingsSchemaKey")
 -- throws : False
 -- Skip return : False
 
@@ -236,7 +240,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -265,7 +269,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -297,7 +301,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -328,7 +332,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TCArray True (-1) (-1) (TBasicType TUTF8)
+-- returnType : Just (TCArray True (-1) (-1) (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -359,7 +363,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchema"
+-- returnType : Just (TInterface "Gio" "SettingsSchema")
 -- throws : False
 -- Skip return : False
 
@@ -388,7 +392,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchema", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/SettingsSchema.hs-boot b/GI/Gio/Structs/SettingsSchema.hs-boot
--- a/GI/Gio/Structs/SettingsSchema.hs-boot
+++ b/GI/Gio/Structs/SettingsSchema.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.SettingsSchema where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/SettingsSchemaKey.hs b/GI/Gio/Structs/SettingsSchemaKey.hs
--- a/GI/Gio/Structs/SettingsSchemaKey.hs
+++ b/GI/Gio/Structs/SettingsSchemaKey.hs
@@ -67,9 +67,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -88,11 +88,15 @@
 noSettingsSchemaKey :: Maybe SettingsSchemaKey
 noSettingsSchemaKey = Nothing
 
+
+type instance AttributeList SettingsSchemaKey = SettingsSchemaKeyAttributeList
+type SettingsSchemaKeyAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method SettingsSchemaKey::get_default_value
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -121,7 +125,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -150,7 +154,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -179,7 +183,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TVariant
+-- returnType : Just TVariant
 -- throws : False
 -- Skip return : False
 
@@ -208,7 +212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -237,7 +241,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "VariantType"
+-- returnType : Just (TInterface "GLib" "VariantType")
 -- throws : False
 -- Skip return : False
 
@@ -266,7 +270,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "value", argType = TVariant, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -297,7 +301,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchemaKey"
+-- returnType : Just (TInterface "Gio" "SettingsSchemaKey")
 -- throws : False
 -- Skip return : False
 
@@ -326,7 +330,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaKey", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/SettingsSchemaKey.hs-boot b/GI/Gio/Structs/SettingsSchemaKey.hs-boot
--- a/GI/Gio/Structs/SettingsSchemaKey.hs-boot
+++ b/GI/Gio/Structs/SettingsSchemaKey.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.SettingsSchemaKey where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/SettingsSchemaSource.hs b/GI/Gio/Structs/SettingsSchemaSource.hs
--- a/GI/Gio/Structs/SettingsSchemaSource.hs
+++ b/GI/Gio/Structs/SettingsSchemaSource.hs
@@ -49,9 +49,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -69,11 +69,15 @@
 noSettingsSchemaSource :: Maybe SettingsSchemaSource
 noSettingsSchemaSource = Nothing
 
+
+type instance AttributeList SettingsSchemaSource = SettingsSchemaSourceAttributeList
+type SettingsSchemaSourceAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method SettingsSchemaSource::new_from_directory
 -- method type : Constructor
 -- Args : [Arg {argCName = "directory", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "parent", argType = TInterface "Gio" "SettingsSchemaSource", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "trusted", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchemaSource"
+-- returnType : Just (TInterface "Gio" "SettingsSchemaSource")
 -- throws : True
 -- Skip return : False
 
@@ -114,7 +118,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaSource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "recursive", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "non_relocatable", argType = TCArray True (-1) (-1) (TBasicType TUTF8), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "relocatable", argType = TCArray True (-1) (-1) (TBasicType TUTF8), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -158,7 +162,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaSource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "schema_id", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "recursive", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchema"
+-- returnType : Just (TInterface "Gio" "SettingsSchema")
 -- throws : False
 -- Skip return : False
 
@@ -174,27 +178,28 @@
     SettingsSchemaSource                    -- _obj
     -> T.Text                               -- schemaId
     -> Bool                                 -- recursive
-    -> m SettingsSchema                     -- result
+    -> m (Maybe SettingsSchema)             -- result
 settingsSchemaSourceLookup _obj schemaId recursive = liftIO $ do
     let _obj' = unsafeManagedPtrGetPtr _obj
     schemaId' <- textToCString schemaId
     let recursive' = (fromIntegral . fromEnum) recursive
     result <- g_settings_schema_source_lookup _obj' schemaId' recursive'
-    checkUnexpectedReturnNULL "g_settings_schema_source_lookup" result
-    result' <- (wrapBoxed SettingsSchema) result
+    maybeResult <- convertIfNonNull result $ \result' -> do
+        result'' <- (wrapBoxed SettingsSchema) result'
+        return result''
     touchManagedPtr _obj
     freeMem schemaId'
-    return result'
+    return maybeResult
 
 data SettingsSchemaSourceLookupMethodInfo
-instance (signature ~ (T.Text -> Bool -> m SettingsSchema), MonadIO m) => MethodInfo SettingsSchemaSourceLookupMethodInfo SettingsSchemaSource signature where
+instance (signature ~ (T.Text -> Bool -> m (Maybe SettingsSchema)), MonadIO m) => MethodInfo SettingsSchemaSourceLookupMethodInfo SettingsSchemaSource signature where
     overloadedMethod _ = settingsSchemaSourceLookup
 
 -- method SettingsSchemaSource::ref
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaSource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchemaSource"
+-- returnType : Just (TInterface "Gio" "SettingsSchemaSource")
 -- throws : False
 -- Skip return : False
 
@@ -223,7 +228,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SettingsSchemaSource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -250,7 +255,7 @@
 -- method type : MemberFunction
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Gio" "SettingsSchemaSource"
+-- returnType : Just (TInterface "Gio" "SettingsSchemaSource")
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/SettingsSchemaSource.hs-boot b/GI/Gio/Structs/SettingsSchemaSource.hs-boot
--- a/GI/Gio/Structs/SettingsSchemaSource.hs-boot
+++ b/GI/Gio/Structs/SettingsSchemaSource.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.SettingsSchemaSource where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/SrvTarget.hs b/GI/Gio/Structs/SrvTarget.hs
--- a/GI/Gio/Structs/SrvTarget.hs
+++ b/GI/Gio/Structs/SrvTarget.hs
@@ -68,9 +68,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -88,11 +88,15 @@
 noSrvTarget :: Maybe SrvTarget
 noSrvTarget = Nothing
 
+
+type instance AttributeList SrvTarget = SrvTargetAttributeList
+type SrvTargetAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method SrvTarget::new
 -- method type : Constructor
 -- Args : [Arg {argCName = "hostname", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "port", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "priority", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "weight", argType = TBasicType TUInt16, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SrvTarget"
+-- returnType : Just (TInterface "Gio" "SrvTarget")
 -- throws : False
 -- Skip return : False
 
@@ -123,7 +127,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "SrvTarget"
+-- returnType : Just (TInterface "Gio" "SrvTarget")
 -- throws : False
 -- Skip return : False
 
@@ -152,7 +156,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -179,7 +183,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -208,7 +212,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
@@ -235,7 +239,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
@@ -262,7 +266,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "SrvTarget", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUInt16
+-- returnType : Just (TBasicType TUInt16)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/SrvTarget.hs-boot b/GI/Gio/Structs/SrvTarget.hs-boot
--- a/GI/Gio/Structs/SrvTarget.hs-boot
+++ b/GI/Gio/Structs/SrvTarget.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.SrvTarget where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/StaticResource.hs b/GI/Gio/Structs/StaticResource.hs
--- a/GI/Gio/Structs/StaticResource.hs
+++ b/GI/Gio/Structs/StaticResource.hs
@@ -38,9 +38,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -53,14 +53,25 @@
 newZeroStaticResource :: MonadIO m => m StaticResource
 newZeroStaticResource = liftIO $ callocBytes 40 >>= wrapPtr StaticResource
 
+instance tag ~ 'AttrSet => Constructible StaticResource tag where
+    new _ attrs = do
+        o <- newZeroStaticResource
+        GI.Attributes.set o attrs
+        return o
+
+
 noStaticResource :: Maybe StaticResource
 noStaticResource = Nothing
 
+
+type instance AttributeList StaticResource = StaticResourceAttributeList
+type StaticResourceAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method StaticResource::fini
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "StaticResource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -87,7 +98,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "StaticResource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Resource"
+-- returnType : Just (TInterface "Gio" "Resource")
 -- throws : False
 -- Skip return : False
 
@@ -116,7 +127,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "StaticResource", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/StaticResource.hs-boot b/GI/Gio/Structs/StaticResource.hs-boot
--- a/GI/Gio/Structs/StaticResource.hs-boot
+++ b/GI/Gio/Structs/StaticResource.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.StaticResource where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/UnixMountEntry.hs b/GI/Gio/Structs/UnixMountEntry.hs
--- a/GI/Gio/Structs/UnixMountEntry.hs
+++ b/GI/Gio/Structs/UnixMountEntry.hs
@@ -19,9 +19,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -32,6 +32,10 @@
 newtype UnixMountEntry = UnixMountEntry (ForeignPtr UnixMountEntry)
 noUnixMountEntry :: Maybe UnixMountEntry
 noUnixMountEntry = Nothing
+
+
+type instance AttributeList UnixMountEntry = UnixMountEntryAttributeList
+type UnixMountEntryAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveUnixMountEntryMethod (t :: Symbol) (o :: *) :: * where
     ResolveUnixMountEntryMethod l o = MethodResolutionFailed l o
diff --git a/GI/Gio/Structs/UnixMountEntry.hs-boot b/GI/Gio/Structs/UnixMountEntry.hs-boot
--- a/GI/Gio/Structs/UnixMountEntry.hs-boot
+++ b/GI/Gio/Structs/UnixMountEntry.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.UnixMountEntry where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Gio/Structs/UnixMountPoint.hs b/GI/Gio/Structs/UnixMountPoint.hs
--- a/GI/Gio/Structs/UnixMountPoint.hs
+++ b/GI/Gio/Structs/UnixMountPoint.hs
@@ -87,9 +87,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -101,11 +101,15 @@
 noUnixMountPoint :: Maybe UnixMountPoint
 noUnixMountPoint = Nothing
 
+
+type instance AttributeList UnixMountPoint = UnixMountPointAttributeList
+type UnixMountPointAttributeList = ('[ ] :: [(Symbol, *)])
+
 -- method UnixMountPoint::compare
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mount2", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -136,7 +140,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -163,7 +167,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -192,7 +196,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -221,7 +225,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -250,7 +254,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -279,7 +283,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -307,7 +311,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -336,7 +340,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -366,7 +370,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Gio" "Icon"
+-- returnType : Just (TInterface "Gio" "Icon")
 -- throws : False
 -- Skip return : False
 
@@ -395,7 +399,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -423,7 +427,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -451,7 +455,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Gio" "UnixMountPoint", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Gio/Structs/UnixMountPoint.hs-boot b/GI/Gio/Structs/UnixMountPoint.hs-boot
--- a/GI/Gio/Structs/UnixMountPoint.hs-boot
+++ b/GI/Gio/Structs/UnixMountPoint.hs-boot
@@ -1,8 +1,8 @@
 module GI.Gio.Structs.UnixMountPoint where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/gi-gio.cabal b/gi-gio.cabal
--- a/gi-gio.cabal
+++ b/gi-gio.cabal
@@ -1,6 +1,6 @@
 -- Autogenerated, do not edit.
 name:               gi-gio
-version:            0.2.46.13
+version:            0.2.46.14
 synopsis:           Gio bindings
 description:        Bindings for Gio, autogenerated by haskell-gi.
 homepage:           https://github.com/haskell-gi/haskell-gi
@@ -14,7 +14,7 @@
 
 library
     default-language:   Haskell2010
-    default-extensions: ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts
+    default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts
     other-extensions:   PatternSynonyms ViewPatterns
     ghc-options:        -fno-warn-unused-imports -fno-warn-warnings-deprecations
     exposed-modules:    GI.Gio.Types
@@ -197,9 +197,9 @@
                         GI.Gio.Structs.UnixMountPoint
     pkgconfig-depends:  gio-2.0 >= 2.46
     build-depends: base >= 4.7 && <5,
-        haskell-gi-base >= 0.13 && < 1,
-        gi-glib >= 0.2.46.13 && < 0.2.47,
-        gi-gobject >= 0.2.46.13 && < 0.2.47,
+        haskell-gi-base >= 0.14 && < 1,
+        gi-glib >= 0.2.46.14 && < 0.2.47,
+        gi-gobject >= 0.2.46.14 && < 0.2.47,
         bytestring >= 0.10,
         containers >= 0.5,
         text >= 1.0,
