diff --git a/GI/Notify.hs b/GI/Notify.hs
--- a/GI/Notify.hs
+++ b/GI/Notify.hs
@@ -26,9 +26,9 @@
 import GI.Notify.Functions
 import GI.Notify.Objects
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.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/Notify/Callbacks.hs b/GI/Notify/Callbacks.hs
--- a/GI/Notify/Callbacks.hs
+++ b/GI/Notify/Callbacks.hs
@@ -23,9 +23,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/Notify/Constants.hs b/GI/Notify/Constants.hs
--- a/GI/Notify/Constants.hs
+++ b/GI/Notify/Constants.hs
@@ -17,9 +17,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/Notify/Enums.hs b/GI/Notify/Enums.hs
--- a/GI/Notify/Enums.hs
+++ b/GI/Notify/Enums.hs
@@ -15,9 +15,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/Notify/Functions.hs b/GI/Notify/Functions.hs
--- a/GI/Notify/Functions.hs
+++ b/GI/Notify/Functions.hs
@@ -42,9 +42,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
@@ -55,7 +55,7 @@
 -- function notify_uninit
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -74,7 +74,7 @@
 -- function notify_set_app_name
 -- Args : [Arg {argCName = "app_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
 
@@ -97,7 +97,7 @@
 -- function notify_is_initted
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -117,7 +117,7 @@
 -- function notify_init
 -- Args : [Arg {argCName = "app_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
 
@@ -141,7 +141,7 @@
 -- function notify_get_server_info
 -- Args : [Arg {argCName = "ret_name", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "ret_vendor", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "ret_version", argType = TBasicType TUTF8, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "ret_spec_version", 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 : False
 -- Skip return : False
 
@@ -185,7 +185,7 @@
 -- function notify_get_server_caps
 -- Args : []
 -- Lengths : []
--- returnType : TGList (TBasicType TUTF8)
+-- returnType : Just (TGList (TBasicType TUTF8))
 -- throws : False
 -- Skip return : False
 
@@ -198,7 +198,6 @@
     m [T.Text]                              -- result
 getServerCaps  = liftIO $ do
     result <- notify_get_server_caps
-    checkUnexpectedReturnNULL "notify_get_server_caps" result
     result' <- unpackGList result
     result'' <- mapM cstringToText result'
     mapGList freeMem result
@@ -209,7 +208,7 @@
 -- function notify_get_app_name
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Notify/Objects.hs b/GI/Notify/Objects.hs
--- a/GI/Notify/Objects.hs
+++ b/GI/Notify/Objects.hs
@@ -14,9 +14,9 @@
 
 import GI.Notify.Objects.Notification
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.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/Notify/Objects/Notification.hs b/GI/Notify/Objects/Notification.hs
--- a/GI/Notify/Objects/Notification.hs
+++ b/GI/Notify/Objects/Notification.hs
@@ -128,25 +128,31 @@
     NotificationAppNamePropertyInfo         ,
     constructNotificationAppName            ,
     getNotificationAppName                  ,
+    notificationAppName                     ,
     setNotificationAppName                  ,
 
 
 -- ** Body
     NotificationBodyPropertyInfo            ,
+    clearNotificationBody                   ,
     constructNotificationBody               ,
     getNotificationBody                     ,
+    notificationBody                        ,
     setNotificationBody                     ,
 
 
 -- ** ClosedReason
     NotificationClosedReasonPropertyInfo    ,
     getNotificationClosedReason             ,
+    notificationClosedReason                ,
 
 
 -- ** IconName
     NotificationIconNamePropertyInfo        ,
+    clearNotificationIconName               ,
     constructNotificationIconName           ,
     getNotificationIconName                 ,
+    notificationIconName                    ,
     setNotificationIconName                 ,
 
 
@@ -154,13 +160,16 @@
     NotificationIdPropertyInfo              ,
     constructNotificationId                 ,
     getNotificationId                       ,
+    notificationId                          ,
     setNotificationId                       ,
 
 
 -- ** Summary
     NotificationSummaryPropertyInfo         ,
+    clearNotificationSummary                ,
     constructNotificationSummary            ,
     getNotificationSummary                  ,
+    notificationSummary                     ,
     setNotificationSummary                  ,
 
 
@@ -183,9 +192,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
@@ -311,57 +320,65 @@
 -- VVV Prop "app-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
-getNotificationAppName :: (MonadIO m, NotificationK o) => o -> m T.Text
+getNotificationAppName :: (MonadIO m, NotificationK o) => o -> m (Maybe T.Text)
 getNotificationAppName obj = liftIO $ getObjectPropertyString obj "app-name"
 
 setNotificationAppName :: (MonadIO m, NotificationK o) => o -> T.Text -> m ()
-setNotificationAppName obj val = liftIO $ setObjectPropertyString obj "app-name" val
+setNotificationAppName obj val = liftIO $ setObjectPropertyString obj "app-name" (Just val)
 
 constructNotificationAppName :: T.Text -> IO ([Char], GValue)
-constructNotificationAppName val = constructObjectPropertyString "app-name" val
+constructNotificationAppName val = constructObjectPropertyString "app-name" (Just val)
 
 data NotificationAppNamePropertyInfo
 instance AttrInfo NotificationAppNamePropertyInfo where
     type AttrAllowedOps NotificationAppNamePropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
     type AttrSetTypeConstraint NotificationAppNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NotificationAppNamePropertyInfo = NotificationK
-    type AttrGetType NotificationAppNamePropertyInfo = T.Text
+    type AttrGetType NotificationAppNamePropertyInfo = (Maybe T.Text)
     type AttrLabel NotificationAppNamePropertyInfo = "app-name"
     attrGet _ = getNotificationAppName
     attrSet _ = setNotificationAppName
     attrConstruct _ = constructNotificationAppName
+    attrClear _ = undefined
 
 -- VVV Prop "body"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getNotificationBody :: (MonadIO m, NotificationK o) => o -> m T.Text
+getNotificationBody :: (MonadIO m, NotificationK o) => o -> m (Maybe T.Text)
 getNotificationBody obj = liftIO $ getObjectPropertyString obj "body"
 
 setNotificationBody :: (MonadIO m, NotificationK o) => o -> T.Text -> m ()
-setNotificationBody obj val = liftIO $ setObjectPropertyString obj "body" val
+setNotificationBody obj val = liftIO $ setObjectPropertyString obj "body" (Just val)
 
 constructNotificationBody :: T.Text -> IO ([Char], GValue)
-constructNotificationBody val = constructObjectPropertyString "body" val
+constructNotificationBody val = constructObjectPropertyString "body" (Just val)
 
+clearNotificationBody :: (MonadIO m, NotificationK o) => o -> m ()
+clearNotificationBody obj = liftIO $ setObjectPropertyString obj "body" (Nothing :: Maybe T.Text)
+
 data NotificationBodyPropertyInfo
 instance AttrInfo NotificationBodyPropertyInfo where
-    type AttrAllowedOps NotificationBodyPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NotificationBodyPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NotificationBodyPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NotificationBodyPropertyInfo = NotificationK
-    type AttrGetType NotificationBodyPropertyInfo = T.Text
+    type AttrGetType NotificationBodyPropertyInfo = (Maybe T.Text)
     type AttrLabel NotificationBodyPropertyInfo = "body"
     attrGet _ = getNotificationBody
     attrSet _ = setNotificationBody
     attrConstruct _ = constructNotificationBody
+    attrClear _ = clearNotificationBody
 
 -- VVV Prop "closed-reason"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getNotificationClosedReason :: (MonadIO m, NotificationK o) => o -> m Int32
-getNotificationClosedReason obj = liftIO $ getObjectPropertyCInt obj "closed-reason"
+getNotificationClosedReason obj = liftIO $ getObjectPropertyInt32 obj "closed-reason"
 
 data NotificationClosedReasonPropertyInfo
 instance AttrInfo NotificationClosedReasonPropertyInfo where
@@ -373,43 +390,50 @@
     attrGet _ = getNotificationClosedReason
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "icon-name"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getNotificationIconName :: (MonadIO m, NotificationK o) => o -> m T.Text
+getNotificationIconName :: (MonadIO m, NotificationK o) => o -> m (Maybe T.Text)
 getNotificationIconName obj = liftIO $ getObjectPropertyString obj "icon-name"
 
 setNotificationIconName :: (MonadIO m, NotificationK o) => o -> T.Text -> m ()
-setNotificationIconName obj val = liftIO $ setObjectPropertyString obj "icon-name" val
+setNotificationIconName obj val = liftIO $ setObjectPropertyString obj "icon-name" (Just val)
 
 constructNotificationIconName :: T.Text -> IO ([Char], GValue)
-constructNotificationIconName val = constructObjectPropertyString "icon-name" val
+constructNotificationIconName val = constructObjectPropertyString "icon-name" (Just val)
 
+clearNotificationIconName :: (MonadIO m, NotificationK o) => o -> m ()
+clearNotificationIconName obj = liftIO $ setObjectPropertyString obj "icon-name" (Nothing :: Maybe T.Text)
+
 data NotificationIconNamePropertyInfo
 instance AttrInfo NotificationIconNamePropertyInfo where
-    type AttrAllowedOps NotificationIconNamePropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NotificationIconNamePropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NotificationIconNamePropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NotificationIconNamePropertyInfo = NotificationK
-    type AttrGetType NotificationIconNamePropertyInfo = T.Text
+    type AttrGetType NotificationIconNamePropertyInfo = (Maybe T.Text)
     type AttrLabel NotificationIconNamePropertyInfo = "icon-name"
     attrGet _ = getNotificationIconName
     attrSet _ = setNotificationIconName
     attrConstruct _ = constructNotificationIconName
+    attrClear _ = clearNotificationIconName
 
 -- VVV Prop "id"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
 getNotificationId :: (MonadIO m, NotificationK o) => o -> m Int32
-getNotificationId obj = liftIO $ getObjectPropertyCInt obj "id"
+getNotificationId obj = liftIO $ getObjectPropertyInt32 obj "id"
 
 setNotificationId :: (MonadIO m, NotificationK o) => o -> Int32 -> m ()
-setNotificationId obj val = liftIO $ setObjectPropertyCInt obj "id" val
+setNotificationId obj val = liftIO $ setObjectPropertyInt32 obj "id" val
 
 constructNotificationId :: Int32 -> IO ([Char], GValue)
-constructNotificationId val = constructObjectPropertyCInt "id" val
+constructNotificationId val = constructObjectPropertyInt32 "id" val
 
 data NotificationIdPropertyInfo
 instance AttrInfo NotificationIdPropertyInfo where
@@ -421,34 +445,58 @@
     attrGet _ = getNotificationId
     attrSet _ = setNotificationId
     attrConstruct _ = constructNotificationId
+    attrClear _ = undefined
 
 -- VVV Prop "summary"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstruct]
+   -- Nullable: (Nothing,Nothing)
 
-getNotificationSummary :: (MonadIO m, NotificationK o) => o -> m T.Text
+getNotificationSummary :: (MonadIO m, NotificationK o) => o -> m (Maybe T.Text)
 getNotificationSummary obj = liftIO $ getObjectPropertyString obj "summary"
 
 setNotificationSummary :: (MonadIO m, NotificationK o) => o -> T.Text -> m ()
-setNotificationSummary obj val = liftIO $ setObjectPropertyString obj "summary" val
+setNotificationSummary obj val = liftIO $ setObjectPropertyString obj "summary" (Just val)
 
 constructNotificationSummary :: T.Text -> IO ([Char], GValue)
-constructNotificationSummary val = constructObjectPropertyString "summary" val
+constructNotificationSummary val = constructObjectPropertyString "summary" (Just val)
 
+clearNotificationSummary :: (MonadIO m, NotificationK o) => o -> m ()
+clearNotificationSummary obj = liftIO $ setObjectPropertyString obj "summary" (Nothing :: Maybe T.Text)
+
 data NotificationSummaryPropertyInfo
 instance AttrInfo NotificationSummaryPropertyInfo where
-    type AttrAllowedOps NotificationSummaryPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps NotificationSummaryPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint NotificationSummaryPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint NotificationSummaryPropertyInfo = NotificationK
-    type AttrGetType NotificationSummaryPropertyInfo = T.Text
+    type AttrGetType NotificationSummaryPropertyInfo = (Maybe T.Text)
     type AttrLabel NotificationSummaryPropertyInfo = "summary"
     attrGet _ = getNotificationSummary
     attrSet _ = setNotificationSummary
     attrConstruct _ = constructNotificationSummary
+    attrClear _ = clearNotificationSummary
 
 type instance AttributeList Notification = NotificationAttributeList
 type NotificationAttributeList = ('[ '("appName", NotificationAppNamePropertyInfo), '("body", NotificationBodyPropertyInfo), '("closedReason", NotificationClosedReasonPropertyInfo), '("iconName", NotificationIconNamePropertyInfo), '("id", NotificationIdPropertyInfo), '("summary", NotificationSummaryPropertyInfo)] :: [(Symbol, *)])
 
+notificationAppName :: AttrLabelProxy "appName"
+notificationAppName = AttrLabelProxy
+
+notificationBody :: AttrLabelProxy "body"
+notificationBody = AttrLabelProxy
+
+notificationClosedReason :: AttrLabelProxy "closedReason"
+notificationClosedReason = AttrLabelProxy
+
+notificationIconName :: AttrLabelProxy "iconName"
+notificationIconName = AttrLabelProxy
+
+notificationId :: AttrLabelProxy "id"
+notificationId = AttrLabelProxy
+
+notificationSummary :: AttrLabelProxy "summary"
+notificationSummary = AttrLabelProxy
+
 data NotificationClosedSignalInfo
 instance SignalInfo NotificationClosedSignalInfo where
     type HaskellCallbackType NotificationClosedSignalInfo = NotificationClosedCallback
@@ -461,7 +509,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "summary", argType = TBasicType TUTF8, 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},Arg {argCName = "icon", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Notify" "Notification"
+-- returnType : Just (TInterface "Notify" "Notification")
 -- throws : False
 -- Skip return : False
 
@@ -500,9 +548,9 @@
 
 -- method Notification::add_action
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "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 = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Notify" "ActionCallback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 4, argDestroy = 5, 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 = "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 "Notify" "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 = "label", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "callback", argType = TInterface "Notify" "ActionCallback", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeNotified, argClosure = 4, argDestroy = 5, 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 = "free_func", 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
 
@@ -511,7 +559,7 @@
     CString ->                              -- action : TBasicType TUTF8
     CString ->                              -- label : TBasicType TUTF8
     FunPtr ActionCallbackC ->               -- callback : TInterface "Notify" "ActionCallback"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     FunPtr GLib.DestroyNotifyC ->           -- free_func : TInterface "GLib" "DestroyNotify"
     IO ()
 
@@ -544,7 +592,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "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
 
@@ -571,7 +619,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "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
 
@@ -598,7 +646,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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
 
@@ -630,7 +678,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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
 
@@ -657,7 +705,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "app_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
 
@@ -688,7 +736,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "category", 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
 
@@ -719,7 +767,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -757,7 +805,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 TUInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -790,7 +838,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 TUInt8, 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 : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -825,7 +873,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -857,16 +905,16 @@
 
 -- method Notification::set_hint_int32
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 "Notify" "Notification", 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 TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "notify_notification_set_hint_int32" notify_notification_set_hint_int32 :: 
     Ptr Notification ->                     -- _obj : TInterface "Notify" "Notification"
     CString ->                              -- key : TBasicType TUTF8
-    Int32 ->                                -- value : TBasicType TInt32
+    Int32 ->                                -- value : TBasicType TInt
     IO ()
 
 {-# DEPRECATED notificationSetHintInt32 ["(Since version 0.6.)","Use notify_notification_set_hint() instead"]#-}
@@ -892,7 +940,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -925,16 +973,16 @@
 
 -- method Notification::set_hint_uint32
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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 "Notify" "Notification", 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 TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "notify_notification_set_hint_uint32" notify_notification_set_hint_uint32 :: 
     Ptr Notification ->                     -- _obj : TInterface "Notify" "Notification"
     CString ->                              -- key : TBasicType TUTF8
-    Word32 ->                               -- value : TBasicType TUInt32
+    Word32 ->                               -- value : TBasicType TUInt
     IO ()
 
 {-# DEPRECATED notificationSetHintUint32 ["(Since version 0.6.)","Use notify_notification_set_hint() instead"]#-}
@@ -960,7 +1008,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "icon", argType = TInterface "GdkPixbuf" "Pixbuf", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -991,7 +1039,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pixbuf", argType = TInterface "GdkPixbuf" "Pixbuf", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1020,15 +1068,15 @@
 
 -- method Notification::set_timeout
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "timeout", 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 "notify_notification_set_timeout" notify_notification_set_timeout :: 
     Ptr Notification ->                     -- _obj : TInterface "Notify" "Notification"
-    Int32 ->                                -- timeout : TBasicType TInt32
+    Int32 ->                                -- timeout : TBasicType TInt
     IO ()
 
 
@@ -1051,7 +1099,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "urgency", argType = TInterface "Notify" "Urgency", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -1081,7 +1129,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", 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
 
@@ -1113,7 +1161,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Notify" "Notification", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "summary", argType = TBasicType TUTF8, 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},Arg {argCName = "icon", 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
 
diff --git a/GI/Notify/Objects/Notification.hs-boot b/GI/Notify/Objects/Notification.hs-boot
--- a/GI/Notify/Objects/Notification.hs-boot
+++ b/GI/Notify/Objects/Notification.hs-boot
@@ -1,8 +1,8 @@
 module GI.Notify.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-notify.cabal b/gi-notify.cabal
--- a/gi-notify.cabal
+++ b/gi-notify.cabal
@@ -1,6 +1,6 @@
 -- Autogenerated, do not edit.
 name:               gi-notify
-version:            0.2.32.13
+version:            0.2.32.14
 synopsis:           Notify bindings
 description:        Bindings for Notify, 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.Notify.Types
@@ -27,10 +27,10 @@
                         GI.Notify.Objects.Notification
     pkgconfig-depends:  gdk-pixbuf-2.0 >= 2.32
     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,
-        gi-gdkpixbuf >= 0.2.32.13 && < 0.2.33,
+        haskell-gi-base >= 0.14 && < 1,
+        gi-glib >= 0.2.46.14 && < 0.2.47,
+        gi-gobject >= 0.2.46.14 && < 0.2.47,
+        gi-gdkpixbuf >= 0.2.32.14 && < 0.2.33,
         bytestring >= 0.10,
         containers >= 0.5,
         text >= 1.0,