diff --git a/Gir_Gst.toml b/Gir_Gst.toml
index 964f042cb..6a26027e0 100644
--- a/Gir_Gst.toml
+++ b/Gir_Gst.toml
@@ -48,8 +48,6 @@ generate = [
     "Gst.BufferCopyFlags",
     "Gst.PadMode",
     "Gst.SchedulingFlags",
-    "Gst.ChildProxy",
-    "Gst.TagSetter",
     "Gst.QOSType",
     "Gst.TocSetter",
     "Gst.ClockType",
@@ -60,7 +58,6 @@ generate = [
     "Gst.PipelineFlags",
     "Gst.PluginFlags",
     "Gst.MemoryFlags",
-    "Gst.Allocator",
     "Gst.PadLinkCheck",
     "Gst.DebugLevel",
     "Gst.DebugColorFlags",
@@ -86,9 +83,9 @@ manual = [
 ]
 
 [[object]]
-name = "Gst.ClockTime"
-status = "manual"
-conversion_type = "scalar"
+name = "Gst.Allocator"
+status = "generate"
+manual_traits = ["AllocatorExtManual"]
 
 [[object]]
 name = "Gst.Bin"
@@ -182,6 +179,16 @@ status = "generate"
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
 
+[[object]]
+name = "Gst.ChildProxy"
+status = "generate"
+manual_traits = ["ChildProxyExtManual"]
+
+[[object]]
+name = "Gst.ClockTime"
+status = "manual"
+conversion_type = "scalar"
+
 [[object]]
 name = "Gst.Format"
 status = "generate"
@@ -198,6 +205,11 @@ status = "generate"
     name = "Serialize, Deserialize"
     cfg_condition = "feature = \"ser_de\""
 
+[[object]]
+name = "Gst.TagSetter"
+status = "generate"
+manual_traits = ["TagSetterExtManual"]
+
 [[object]]
 name = "Gst.TocScope"
 status = "generate"
@@ -329,6 +341,7 @@ ref_mode = "ref"
 [[object]]
 name = "Gst.Clock"
 status = "generate"
+manual_traits = ["ClockExtManual"]
     [[object.function]]
     name = "set_master"
         [object.function.return]
@@ -360,6 +373,7 @@ status = "generate"
 [[object]]
 name = "Gst.Element"
 status = "generate"
+manual_traits = ["ElementExtManual"]
     [[object.function]]
     name = "make_from_uri"
         [object.function.return]
@@ -562,6 +576,7 @@ final_type = true
 [[object]]
 name = "Gst.DeviceProvider"
 status = "generate"
+manual_traits = ["DeviceProviderExtManual"]
     [[object.function]]
     name = "get_bus"
         [object.function.return]
@@ -584,6 +599,7 @@ status = "generate"
 [[object]]
 name = "Gst.DeviceMonitor"
 status = "generate"
+manual_traits = ["DeviceMonitorExtManual"]
     [[object.function]]
     name = "new"
     # Work-around for 1.14 switch from transfer-floating to transfer-full
@@ -671,6 +687,7 @@ trait_name = "GstObjectExt"
 [[object]]
 name = "Gst.Pad"
 status = "generate"
+manual_traits = ["PadExtManual"]
     [[object.function]]
     name = "link_maybe_ghosting"
         [object.function.return]
@@ -923,6 +940,7 @@ status = "generate"
 [[object]]
 name = "Gst.ProxyPad"
 status = "generate"
+manual_traits = ["ProxyPadExtManual"]
 
     [[object.function]]
     name = "chain_default"
@@ -1035,6 +1053,7 @@ final_type = true
 [[object]]
 name = "Gst.PluginFeature"
 status = "generate"
+manual_traits = ["PluginFeatureExtManual"]
     [[object.function]]
     pattern = "list_.*"
     ignore = true
@@ -1083,6 +1102,7 @@ final_type = true
 [[object]]
 name = "Gst.BufferPool"
 status = "generate"
+manual_traits = ["BufferPoolExtManual"]
     [[object.function]]
     pattern = "config_.*"
     # A different type
diff --git a/Gir_GstAudio.toml b/Gir_GstAudio.toml
index d0b12b918..b71999fea 100644
--- a/Gir_GstAudio.toml
+++ b/Gir_GstAudio.toml
@@ -153,6 +153,8 @@ status = "generate"
 [[object]]
 name = "GstAudio.AudioDecoder"
 status = "generate"
+manual_traits = ["AudioDecoderExtManual"]
+
     [[object.function]]
     name = "finish_frame"
     ignore = true
@@ -190,6 +192,7 @@ status = "generate"
 [[object]]
 name = "GstAudio.AudioEncoder"
 status = "generate"
+manual_traits = ["AudioEncoderExtManual"]
 
     [[object.function]]
     name = "finish_frame"
diff --git a/Gir_GstBase.toml b/Gir_GstBase.toml
index efe712300..bc6b461f2 100644
--- a/Gir_GstBase.toml
+++ b/Gir_GstBase.toml
@@ -113,6 +113,7 @@ concurrency = "none"
 [[object]]
 name = "GstBase.BaseSink"
 status = "generate"
+manual_traits = ["BaseSinkExtManual"]
 
     [[object.function]]
     name = "wait"
@@ -137,6 +138,7 @@ status = "generate"
 [[object]]
 name = "GstBase.BaseSrc"
 status = "generate"
+manual_traits = ["BaseSrcExtManual"]
 
     [[object.function]]
     name = "set_caps"
@@ -171,6 +173,7 @@ status = "generate"
 [[object]]
 name = "GstBase.BaseTransform"
 status = "generate"
+manual_traits = ["BaseTransformExtManual"]
 
     [[object.function]]
     name = "update_src_caps"
@@ -182,6 +185,7 @@ status = "generate"
 name = "GstBase.Aggregator"
 status = "generate"
 version = "1.14"
+manual_traits = ["AggregatorExtManual"]
 
     [[object.function]]
     name = "finish_buffer"
@@ -201,6 +205,7 @@ version = "1.14"
 name = "GstBase.AggregatorPad"
 status = "generate"
 version = "1.14"
+manual_traits = ["AggregatorPadExtManual"]
 
 [[object]]
 name = "GstBase.*"
@@ -278,6 +283,7 @@ ref_mode = "ref"
 [[object]]
 name = "GstBase.BaseParse"
 status = "generate"
+manual_traits = ["BaseParseExtManual"]
     [[object.function]]
     name = "finish_frame"
     ignore = true
diff --git a/Gir_GstEditingServices.toml b/Gir_GstEditingServices.toml
index 2659ccca9..9b945a03c 100644
--- a/Gir_GstEditingServices.toml
+++ b/Gir_GstEditingServices.toml
@@ -272,6 +272,7 @@ status = "generate"
 [[object]]
 name = "GES.TimelineElement"
 status = "generate"
+manual_traits = ["TimelineElementExtManual"]
     [[object.function]]
     name = "ripple"
         [object.function.return]
diff --git a/Gir_GstGL.toml b/Gir_GstGL.toml
index e338ce023..ea28961e5 100644
--- a/Gir_GstGL.toml
+++ b/Gir_GstGL.toml
@@ -94,6 +94,7 @@ ref_mode = "ref"
 [[object]]
 name = "GstGL.GLContext"
 status = "generate"
+manual_traits = ["GLContextExtManual"]
 
     [[object.function]]
     name = "new_wrapped"
diff --git a/Gir_GstRtspServer.toml b/Gir_GstRtspServer.toml
index 1aac770d1..829159779 100644
--- a/Gir_GstRtspServer.toml
+++ b/Gir_GstRtspServer.toml
@@ -109,6 +109,7 @@ conversion_type = "scalar"
 [[object]]
 name = "GstRtspServer.RTSPServer"
 status = "generate"
+manual_traits = ["RTSPServerExtManual"]
 
     [[object.function]]
     name = "attach"
@@ -127,6 +128,7 @@ status = "generate"
 [[object]]
 name = "GstRtspServer.RTSPClient"
 status = "generate"
+manual_traits = ["RTSPClientExtManual"]
 
     [[object.function]]
     name = "attach"
@@ -135,6 +137,7 @@ status = "generate"
 [[object]]
 name = "GstRtspServer.RTSPStream"
 status = "generate"
+manual_traits = ["RTSPStreamExtManual"]
 
     [[object.function]]
     name = "recv_rtcp"
@@ -198,6 +201,7 @@ concurrency = "send"
 name = "GstRtspServer.RTSPStreamTransport"
 status = "generate"
 concurrency = "none"
+manual_traits = ["RTSPStreamTransportExtManual"]
 
     [[object.function]]
     name = "recv_data"
@@ -222,6 +226,7 @@ concurrency = "none"
 [[object]]
 name = "GstRtspServer.RTSPAddressPool"
 status = "generate"
+manual_traits = ["RTSPAddressPoolExtManual"]
 
     [[object.function]]
     name = "add_range"
@@ -240,6 +245,7 @@ status = "generate"
 [[object]]
 name = "GstRtspServer.RTSPMedia"
 status = "generate"
+manual_traits = ["RTSPMediaExtManual"]
 
     [[object.function]]
     name = "suspend"
@@ -268,6 +274,7 @@ status = "generate"
 [[object]]
 name = "GstRtspServer.RTSPMediaFactory"
 status = "generate"
+manual_traits = ["RTSPMediaFactoryExtManual"]
 
     [[object.function]]
     name = "add_role_from_structure"
@@ -296,6 +303,7 @@ status = "generate"
 [[object]]
 name = "GstRtspServer.RTSPSessionPool"
 status = "generate"
+manual_traits = ["RTSPSessionPoolExtManual"]
 
     [[object.function]]
     name = "remove"
@@ -315,6 +323,8 @@ status = "generate"
 [[object]]
 name="GstRtspServer.RTSPAuth"
 status="generate"
+manual_traits = ["RTSPAuthExtManual"]
+
     [[object.function]]
     name = "check"
         [object.function.return]
diff --git a/Gir_GstVideo.toml b/Gir_GstVideo.toml
index 13b9f5a60..3f2472551 100644
--- a/Gir_GstVideo.toml
+++ b/Gir_GstVideo.toml
@@ -88,6 +88,7 @@ ref_mode = "ref"
 [[object]]
 name = "GstVideo.VideoOverlay"
 status = "generate"
+manual_traits = ["VideoOverlayExtManual"]
 
     [[object.function]]
     name = "set_render_rectangle"
@@ -97,6 +98,7 @@ status = "generate"
 [[object]]
 name = "GstVideo.VideoDecoder"
 status = "generate"
+manual_traits = ["VideoDecoderExtManual"]
 
     [[object.function]]
     name = "allocate_output_frame"
@@ -175,6 +177,7 @@ status = "generate"
 [[object]]
 name = "GstVideo.VideoEncoder"
 status = "generate"
+manual_traits = ["VideoEncoderExtManual"]
 
     [[object.function]]
     name = "allocate_output_frame"