diff --git a/Directory.Build.props b/Directory.Build.props
index de03e52..5451ee0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,7 +14,7 @@
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <RestoreConfigFile>$(MSBuildThisFileDirectory)NuGet.config</RestoreConfigFile>
 
-    <VersionPrefix>1.9.11</VersionPrefix>
+    <VersionPrefix>1.9.12</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index b995bf1..c4a3b24 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -111,6 +111,8 @@ public static class Program
         { "Graphics.Direct2D.Common.D2D_SIZE_F", "System.Drawing.SizeF" },
         { "Graphics.Direct2D.Common.D2D_POINT_2U", "System.Drawing.Point" },
         { "Graphics.Direct2D.Common.D2D_SIZE_U", "System.Drawing.Size" },
+        { "Graphics.Direct2D.Common.D2D_RECT_U", "Win32.Numerics.Rect" },
+        { "Graphics.Direct2D.Common.D2D_RECT_F", "Win32.Numerics.RectF" },
 
         { "Graphics.Imaging.WICRect", "System.Drawing.Rectangle" },
 
@@ -125,8 +127,8 @@ public static class Program
         { "Graphics.Direct3D12.D3D12_VIEWPORT", "Viewport" },
 
         // TODO: Understand those ->
-        { "Foundation.RECT", "RawRect" },
-        { "Foundation.RECTL", "RawRect" },
+        { "Foundation.RECT", "Rect" },
+        { "Foundation.RECTL", "Rect" },
         { "Foundation.POINT", "System.Drawing.Point" },
         { "Foundation.POINTL", "System.Drawing.Point" },
         { "Foundation.SIZE", "System.Drawing.Size" },
diff --git a/src/Generator/win32json/api/Graphics.CompositionSwapchain.json b/src/Generator/win32json/api/Graphics.CompositionSwapchain.json
new file mode 100644
index 0000000..c637c68
--- /dev/null
+++ b/src/Generator/win32json/api/Graphics.CompositionSwapchain.json
@@ -0,0 +1,675 @@
+{
+
+"Constants":[
+]
+
+,"Types":[
+	{
+		"Name":"SystemInterruptTime"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":0
+		,"Fields":[
+			{"Name":"value","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"PresentationTransform"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":0
+		,"Fields":[
+			{"Name":"M11","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+			,{"Name":"M12","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+			,{"Name":"M21","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+			,{"Name":"M22","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+			,{"Name":"M31","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+			,{"Name":"M32","Type":{"Kind":"Native","Name":"Single"},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"PresentStatisticsKind"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"PresentStatisticsKind_PresentStatus","Value":1}
+			,{"Name":"PresentStatisticsKind_CompositionFrame","Value":2}
+			,{"Name":"PresentStatisticsKind_IndependentFlipFrame","Value":3}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"IPresentationBuffer"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"2e217d3a-5abb-4138-9a13-a775593c89ca"
+		,"Interface":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"GetAvailableEvent"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"availableEventHandle","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"HANDLE","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"IsAvailable"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"isAvailable","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Byte"}},"Attrs":["Out","RetVal"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IPresentationContent"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"5668bb79-3d8e-415c-b215-f38020f2d252"
+		,"Interface":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"SetTag"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"Void"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"tag","Type":{"Kind":"Native","Name":"UIntPtr"},"Attrs":["In"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IPresentationSurface"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"956710fb-ea40-4eba-a3eb-4375a0eb4edc"
+		,"Interface":{"Kind":"ApiRef","Name":"IPresentationContent","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"SetBuffer"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"presentationBuffer","Type":{"Kind":"ApiRef","Name":"IPresentationBuffer","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetColorSpace"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"colorSpace","Type":{"Kind":"ApiRef","Name":"DXGI_COLOR_SPACE_TYPE","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetAlphaMode"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"alphaMode","Type":{"Kind":"ApiRef","Name":"DXGI_ALPHA_MODE","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetSourceRect"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"sourceRect","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"RECT","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["In","Const"]}
+				]
+			}
+			,{
+				"Name":"SetTransform"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"transform","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"PresentationTransform","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"RestrictToOutput"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"output","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetDisableReadback"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"value","Type":{"Kind":"Native","Name":"Byte"},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetLetterboxingMargins"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"leftLetterboxSize","Type":{"Kind":"Native","Name":"Single"},"Attrs":["In"]}
+					,{"Name":"topLetterboxSize","Type":{"Kind":"Native","Name":"Single"},"Attrs":["In"]}
+					,{"Name":"rightLetterboxSize","Type":{"Kind":"Native","Name":"Single"},"Attrs":["In"]}
+					,{"Name":"bottomLetterboxSize","Type":{"Kind":"Native","Name":"Single"},"Attrs":["In"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IPresentStatistics"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"b44b8bda-7282-495d-9dd7-ceadd8b4bb86"
+		,"Interface":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"GetPresentId"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UInt64"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetKind"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"PresentStatisticsKind","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IPresentationManager"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"fb562f82-6292-470a-88b1-843661e7f20c"
+		,"Interface":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"AddBufferFromResource"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"resource","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In"]}
+					,{"Name":"presentationBuffer","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IPresentationBuffer","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"CreatePresentationSurface"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"compositionSurfaceHandle","Type":{"Kind":"ApiRef","Name":"HANDLE","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In"]}
+					,{"Name":"presentationSurface","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IPresentationSurface","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"GetNextPresentId"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UInt64"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"SetTargetTime"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"targetTime","Type":{"Kind":"ApiRef","Name":"SystemInterruptTime","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"SetPreferredPresentDuration"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"preferredDuration","Type":{"Kind":"ApiRef","Name":"SystemInterruptTime","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":["In"]}
+					,{"Name":"deviationTolerance","Type":{"Kind":"ApiRef","Name":"SystemInterruptTime","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"ForceVSyncInterrupt"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"forceVsyncInterrupt","Type":{"Kind":"Native","Name":"Byte"},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"Present"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetPresentRetiringFence"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"riid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
+					,{"Name":"fence","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"CancelPresentsFrom"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"presentIdToCancelFrom","Type":{"Kind":"Native","Name":"UInt64"},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"GetLostEvent"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"lostEventHandle","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"HANDLE","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"GetPresentStatisticsAvailableEvent"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"presentStatisticsAvailableEventHandle","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"HANDLE","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+			,{
+				"Name":"EnablePresentStatisticsKind"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"presentStatisticsKind","Type":{"Kind":"ApiRef","Name":"PresentStatisticsKind","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":["In"]}
+					,{"Name":"enabled","Type":{"Kind":"Native","Name":"Byte"},"Attrs":["In"]}
+				]
+			}
+			,{
+				"Name":"GetNextPresentStatistics"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"nextPresentStatistics","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IPresentStatistics","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IPresentationFactory"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"8fb37b58-1d74-4f64-a49c-1f97a80a2ec0"
+		,"Interface":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"IsPresentationSupported"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"Byte"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"IsPresentationSupportedWithIndependentFlip"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"Byte"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"CreatePresentationManager"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"ppPresentationManager","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IPresentationManager","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}},"Attrs":["Out","RetVal"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"PresentStatus"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"PresentStatus_Queued","Value":0}
+			,{"Name":"PresentStatus_Skipped","Value":1}
+			,{"Name":"PresentStatus_Canceled","Value":2}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"IPresentStatusPresentStatistics"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"c9ed2a41-79cb-435e-964e-c8553055420c"
+		,"Interface":{"Kind":"ApiRef","Name":"IPresentStatistics","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"GetCompositionFrameId"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UInt64"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetPresentStatus"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"PresentStatus","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+		]
+	}
+	,{
+		"Name":"CompositionFrameInstanceKind"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Enum"
+		,"Flags":false
+		,"Scoped":false
+		,"Values":[
+			{"Name":"CompositionFrameInstanceKind_ComposedOnScreen","Value":0}
+			,{"Name":"CompositionFrameInstanceKind_ScanoutOnScreen","Value":1}
+			,{"Name":"CompositionFrameInstanceKind_ComposedToIntermediate","Value":2}
+		]
+		,"IntegerBase":"Int32"
+	}
+	,{
+		"Name":"CompositionFrameDisplayInstance"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Struct"
+		,"Size":0
+		,"PackingSize":0
+		,"Fields":[
+			{"Name":"displayAdapterLUID","Type":{"Kind":"ApiRef","Name":"LUID","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"displayVidPnSourceId","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"displayUniqueId","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":[]}
+			,{"Name":"renderAdapterLUID","Type":{"Kind":"ApiRef","Name":"LUID","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":[]}
+			,{"Name":"instanceKind","Type":{"Kind":"ApiRef","Name":"CompositionFrameInstanceKind","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":[]}
+			,{"Name":"finalTransform","Type":{"Kind":"ApiRef","Name":"PresentationTransform","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]},"Attrs":[]}
+			,{"Name":"requiredCrossAdapterCopy","Type":{"Kind":"Native","Name":"Byte"},"Attrs":[]}
+			,{"Name":"colorSpace","Type":{"Kind":"ApiRef","Name":"DXGI_COLOR_SPACE_TYPE","TargetKind":"Default","Api":"Graphics.Dxgi.Common","Parents":[]},"Attrs":[]}
+		]
+		,"NestedTypes":[
+		]
+	}
+	,{
+		"Name":"ICompositionFramePresentStatistics"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"ab41d127-c101-4c0a-911d-f9f2e9d08e64"
+		,"Interface":{"Kind":"ApiRef","Name":"IPresentStatistics","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"GetContentTag"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UIntPtr"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetCompositionFrameId"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UInt64"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetDisplayInstanceArray"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"Void"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+					{"Name":"displayInstanceArrayCount","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["Out"]}
+					,{"Name":"displayInstanceArray","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"CompositionFrameDisplayInstance","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}}},"Attrs":["Out","Const"]}
+				]
+			}
+		]
+	}
+	,{
+		"Name":"IIndependentFlipFramePresentStatistics"
+		,"Architectures":[]
+		,"Platform":null
+		,"Kind":"Com"
+		,"Guid":"8c93be27-ad94-4da0-8fd4-2413132d124e"
+		,"Interface":{"Kind":"ApiRef","Name":"IPresentStatistics","TargetKind":"Com","Api":"Graphics.CompositionSwapchain","Parents":[]}
+		,"Methods":[
+			{
+				"Name":"GetOutputAdapterLUID"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"LUID","TargetKind":"Default","Api":"Foundation","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetOutputVidPnSourceId"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UInt32"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetContentTag"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"Native","Name":"UIntPtr"}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetDisplayedTime"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"SystemInterruptTime","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+			,{
+				"Name":"GetPresentDuration"
+				,"SetLastError":false
+				,"ReturnType":{"Kind":"ApiRef","Name":"SystemInterruptTime","TargetKind":"Default","Api":"Graphics.CompositionSwapchain","Parents":[]}
+				,"ReturnAttrs":[]
+				,"Architectures":[]
+				,"Platform":null
+				,"Attrs":[]
+				,"Params":[
+				]
+			}
+		]
+	}
+]
+
+,"Functions":[
+	{
+		"Name":"CreatePresentationFactory"
+		,"SetLastError":false
+		,"DllImport":"dcomp.dll"
+		,"ReturnType":{"Kind":"ApiRef","Name":"HRESULT","TargetKind":"Default","Api":"Foundation","Parents":[]}
+		,"ReturnAttrs":[]
+		,"Architectures":[]
+		,"Platform":null
+		,"Attrs":[]
+		,"Params":[
+			{"Name":"d3dDevice","Type":{"Kind":"ApiRef","Name":"IUnknown","TargetKind":"Com","Api":"System.Com","Parents":[]},"Attrs":["In"]}
+			,{"Name":"riid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
+			,{"Name":"presentationFactory","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
+		]
+	}
+]
+
+,"UnicodeAliases":[
+]
+
+}
diff --git a/src/Generator/win32json/api/Graphics.Direct2D.json b/src/Generator/win32json/api/Graphics.Direct2D.json
index 1ae5d86..b1b4656 100644
--- a/src/Generator/win32json/api/Graphics.Direct2D.json
+++ b/src/Generator/win32json/api/Graphics.Direct2D.json
@@ -1164,7 +1164,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Factory","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
+					{"Name":"factory","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Factory","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 		]
@@ -1488,7 +1488,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"bitmap","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Bitmap","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"bitmap","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Bitmap","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 		]
@@ -2428,7 +2428,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"textRenderingParams","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteRenderingParams","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"textRenderingParams","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteRenderingParams","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 		]
@@ -2915,7 +2915,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"textRenderingParams","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteRenderingParams","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"textRenderingParams","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteRenderingParams","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -5525,7 +5525,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"image","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"image","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -5806,7 +5806,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"index","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
-					,{"Name":"subProperties","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Properties","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"subProperties","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Properties","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 		]
@@ -5855,7 +5855,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"index","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
-					,{"Name":"input","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					,{"Name":"input","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -5900,7 +5900,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"colorContext","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1ColorContext","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"colorContext","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1ColorContext","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -5923,7 +5923,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"dxgiSurface","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDXGISurface","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					{"Name":"dxgiSurface","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDXGISurface","TargetKind":"Com","Api":"Graphics.Dxgi","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -6363,7 +6363,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"image","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"image","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Image","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9164,7 +9164,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"element","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"element","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9566,7 +9566,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"document","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgDocument","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"document","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgDocument","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9613,7 +9613,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"parent","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"parent","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9636,7 +9636,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"child","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"child","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9648,7 +9648,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"child","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"child","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -9661,7 +9661,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"referenceChild","Type":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]},"Attrs":["In"]}
-					,{"Name":"previousChild","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"previousChild","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -9674,7 +9674,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"referenceChild","Type":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]},"Attrs":["In"]}
-					,{"Name":"nextChild","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"nextChild","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -9895,7 +9895,7 @@
 				,"Params":[
 					{"Name":"name","Type":{"Kind":"ApiRef","Name":"PWSTR","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Const"]}
 					,{"Name":"riid","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
-					,{"Name":"value","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"value","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -9996,7 +9996,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"root","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"root","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -10009,7 +10009,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"id","Type":{"Kind":"ApiRef","Name":"PWSTR","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Const"]}
-					,{"Name":"svgElement","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"svgElement","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1SvgElement","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -10667,7 +10667,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"wicBitmapSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IWICBitmapSource","TargetKind":"Com","Api":"Graphics.Imaging","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"wicBitmapSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IWICBitmapSource","TargetKind":"Com","Api":"Graphics.Imaging","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 		]
@@ -10689,7 +10689,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"imageSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1ImageSource","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"imageSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1ImageSource","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -11292,7 +11292,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"brush","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Brush","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"brush","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID2D1Brush","TargetKind":"Com","Api":"Graphics.Direct2D","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
diff --git a/src/Generator/win32json/api/Graphics.Direct3D.Dxc.json b/src/Generator/win32json/api/Graphics.Direct3D.Dxc.json
index a4eb9e7..4864001 100644
--- a/src/Generator/win32json/api/Graphics.Direct3D.Dxc.json
+++ b/src/Generator/win32json/api/Graphics.Direct3D.Dxc.json
@@ -487,7 +487,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"pFilename","Type":{"Kind":"ApiRef","Name":"PWSTR","TargetKind":"Default","Api":"Foundation","Parents":[]},"Attrs":["In","Const"]}
-					,{"Name":"ppIncludeSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlob","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"ppIncludeSource","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlob","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 		]
@@ -769,7 +769,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppResult","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlob","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					{"Name":"ppResult","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlob","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -781,7 +781,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppErrors","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlobEncoding","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					{"Name":"ppErrors","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDxcBlobEncoding","TargetKind":"Com","Api":"Graphics.Direct3D.Dxc","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 		]
diff --git a/src/Generator/win32json/api/Graphics.Direct3D11.json b/src/Generator/win32json/api/Graphics.Direct3D11.json
index f0bf468..c49fa2e 100644
--- a/src/Generator/win32json/api/Graphics.Direct3D11.json
+++ b/src/Generator/win32json/api/Graphics.Direct3D11.json
@@ -7290,7 +7290,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppPixelShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11PixelShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppPixelShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11PixelShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
@@ -7318,7 +7318,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppVertexShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11VertexShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppVertexShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11VertexShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
@@ -7346,7 +7346,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppInputLayout","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11InputLayout","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppInputLayout","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11InputLayout","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -7402,7 +7402,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppGeometryShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11GeometryShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppGeometryShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11GeometryShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
@@ -7568,7 +7568,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppRasterizerState","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11RasterizerState","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppRasterizerState","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11RasterizerState","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -7620,7 +7620,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppHullShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11HullShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppHullShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11HullShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
@@ -7676,7 +7676,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppDomainShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11DomainShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppDomainShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11DomainShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
@@ -7746,7 +7746,7 @@
 				,"Platform":null
 				,"Attrs":[]
 				,"Params":[
-					{"Name":"ppComputeShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11ComputeShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
+					{"Name":"ppComputeShader","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"ID3D11ComputeShader","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out"]}
 					,{"Name":"ppClassInstances","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"ID3D11ClassInstance","TargetKind":"Com","Api":"Graphics.Direct3D11","Parents":[]}},"Attrs":["Out","Optional"]}
 					,{"Name":"pNumClassInstances","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out","Optional"]}
 				]
diff --git a/src/Generator/win32json/api/Graphics.DirectWrite.json b/src/Generator/win32json/api/Graphics.DirectWrite.json
index 362872e..9ce6bf4 100644
--- a/src/Generator/win32json/api/Graphics.DirectWrite.json
+++ b/src/Generator/win32json/api/Graphics.DirectWrite.json
@@ -1257,7 +1257,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"informationalStringID","Type":{"Kind":"ApiRef","Name":"DWRITE_INFORMATIONAL_STRING_ID","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
-					,{"Name":"informationalStrings","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"informationalStrings","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 					,{"Name":"exists","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
@@ -5690,7 +5690,7 @@
 					,{"Name":"baseStyle","Type":{"Kind":"ApiRef","Name":"DWRITE_FONT_STYLE","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
 					,{"Name":"baseStretch","Type":{"Kind":"ApiRef","Name":"DWRITE_FONT_STRETCH","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
 					,{"Name":"mappedLength","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"UInt32"}},"Attrs":["In","Out"]}
-					,{"Name":"mappedFont","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteFont","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"mappedFont","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteFont","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 					,{"Name":"scale","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Single"}},"Attrs":["Out"]}
 				]
 			}
@@ -6355,7 +6355,7 @@
 					{"Name":"listIndex","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
 					,{"Name":"propertyId","Type":{"Kind":"ApiRef","Name":"DWRITE_FONT_PROPERTY_ID","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
 					,{"Name":"exists","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
-					,{"Name":"values","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"values","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 			,{
@@ -6938,7 +6938,7 @@
 				,"Attrs":[]
 				,"Params":[
 					{"Name":"informationalStringID","Type":{"Kind":"ApiRef","Name":"DWRITE_INFORMATIONAL_STRING_ID","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
-					,{"Name":"informationalStrings","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"informationalStrings","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteLocalizedStrings","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 					,{"Name":"exists","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"BOOL","TargetKind":"Default","Api":"Foundation","Parents":[]}},"Attrs":["Out"]}
 				]
 			}
@@ -7518,7 +7518,7 @@
 					,{"Name":"pixelsPerEm","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
 					,{"Name":"glyphImageFormat","Type":{"Kind":"ApiRef","Name":"DWRITE_GLYPH_IMAGE_FORMATS","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]},"Attrs":["In"]}
 					,{"Name":"glyphData","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"DWRITE_GLYPH_IMAGE_DATA","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out"]}
-					,{"Name":"glyphDataContext","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out","Optional"]}
+					,{"Name":"glyphDataContext","Type":{"Kind":"PointerTo","Child":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Void"}}},"Attrs":["Out"]}
 				]
 			}
 			,{
@@ -7720,7 +7720,7 @@
 					{"Name":"downloadOperationID","Type":{"Kind":"PointerTo","Child":{"Kind":"Native","Name":"Guid"}},"Attrs":["In","Const"]}
 					,{"Name":"fileFragments","Type":{"Kind":"LPArray","NullNullTerm":false,"CountConst":-1,"CountParamIndex":2,"Child":{"Kind":"ApiRef","Name":"DWRITE_FILE_FRAGMENT","TargetKind":"Default","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["In","Const"]}
 					,{"Name":"fragmentCount","Type":{"Kind":"Native","Name":"UInt32"},"Attrs":["In"]}
-					,{"Name":"asyncResult","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteAsyncResult","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr","Optional"]}
+					,{"Name":"asyncResult","Type":{"Kind":"PointerTo","Child":{"Kind":"ApiRef","Name":"IDWriteAsyncResult","TargetKind":"Com","Api":"Graphics.DirectWrite","Parents":[]}},"Attrs":["Out","ComOutPtr"]}
 				]
 			}
 		]
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs
index bc21d94..c815fa3 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/Graphics.Direct2D.Structs.cs
@@ -151,7 +151,7 @@ public partial struct Ellipse
 public partial struct RoundedRect
 {
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_ROUNDED_RECT::rect"]/*' />
-	public Common.RectF rect;
+	public Win32.Numerics.RectF rect;
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_ROUNDED_RECT::radiusX"]/*' />
 	public float radiusX;
@@ -191,7 +191,7 @@ public partial struct StrokeStyleProperties
 public partial struct LayerParameters
 {
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LAYER_PARAMETERS::contentBounds"]/*' />
-	public Common.RectF contentBounds;
+	public Win32.Numerics.RectF contentBounds;
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LAYER_PARAMETERS::geometricMask"]/*' />
 	public unsafe ID2D1Geometry* geometricMask;
@@ -330,7 +330,7 @@ public partial struct EffectInputDescription
 	public uint inputIndex;
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_EFFECT_INPUT_DESCRIPTION::inputRectangle"]/*' />
-	public Common.RectF inputRectangle;
+	public Win32.Numerics.RectF inputRectangle;
 }
 
 /// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_POINT_DESCRIPTION"]/*' />
@@ -358,7 +358,7 @@ public partial struct PointDescription
 public partial struct ImageBrushProperties
 {
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_IMAGE_BRUSH_PROPERTIES::sourceRectangle"]/*' />
-	public Common.RectF sourceRectangle;
+	public Win32.Numerics.RectF sourceRectangle;
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_IMAGE_BRUSH_PROPERTIES::extendModeX"]/*' />
 	public ExtendMode extendModeX;
@@ -418,7 +418,7 @@ public partial struct StrokeStyleProperties1
 public partial struct LayerParameters1
 {
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LAYER_PARAMETERS1::contentBounds"]/*' />
-	public Common.RectF contentBounds;
+	public Win32.Numerics.RectF contentBounds;
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="D2D1_LAYER_PARAMETERS1::geometricMask"]/*' />
 	public unsafe ID2D1Geometry* geometricMask;
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs
index 4e3a258..afb47c5 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap.cs
@@ -120,25 +120,25 @@ public unsafe partial struct ID2D1Bitmap : ID2D1Bitmap.Interface, INativeGuid
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Bitmap::CopyFromBitmap"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Common.RectU* srcRect)
+	public HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Win32.Numerics.Rect* srcRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, System.Drawing.Point*, ID2D1Bitmap*, Common.RectU*, int>)(lpVtbl[8]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), destPoint, bitmap, srcRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, System.Drawing.Point*, ID2D1Bitmap*, Win32.Numerics.Rect*, int>)(lpVtbl[8]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), destPoint, bitmap, srcRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Bitmap::CopyFromRenderTarget"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Common.RectU* srcRect)
+	public HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Win32.Numerics.Rect* srcRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, System.Drawing.Point*, ID2D1RenderTarget*, Common.RectU*, int>)(lpVtbl[9]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), destPoint, renderTarget, srcRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, System.Drawing.Point*, ID2D1RenderTarget*, Win32.Numerics.Rect*, int>)(lpVtbl[9]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), destPoint, renderTarget, srcRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Bitmap::CopyFromMemory"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(10)]
-	public HResult CopyFromMemory(Common.RectU* dstRect, void* srcData, uint pitch)
+	public HResult CopyFromMemory(Win32.Numerics.Rect* dstRect, void* srcData, uint pitch)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, Common.RectU*, void*, uint, int>)(lpVtbl[10]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), dstRect, srcData, pitch);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap*, Win32.Numerics.Rect*, void*, uint, int>)(lpVtbl[10]))((ID2D1Bitmap*)Unsafe.AsPointer(ref this), dstRect, srcData, pitch);
 	}
 
 	public interface Interface : ID2D1Image.Interface
@@ -156,13 +156,13 @@ public unsafe partial struct ID2D1Bitmap : ID2D1Bitmap.Interface, INativeGuid
 		void GetDpi(float* dpiX, float* dpiY);
 
 		[VtblIndex(8)]
-		HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Common.RectU* srcRect);
+		HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Win32.Numerics.Rect* srcRect);
 
 		[VtblIndex(9)]
-		HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Common.RectU* srcRect);
+		HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Win32.Numerics.Rect* srcRect);
 
 		[VtblIndex(10)]
-		HResult CopyFromMemory(Common.RectU* dstRect, void* srcData, uint pitch);
+		HResult CopyFromMemory(Win32.Numerics.Rect* dstRect, void* srcData, uint pitch);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs
index 3f396a8..4f2cca1 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Bitmap1.cs
@@ -120,25 +120,25 @@ public unsafe partial struct ID2D1Bitmap1 : ID2D1Bitmap1.Interface, INativeGuid
 	/// <inheritdoc cref="ID2D1Bitmap.CopyFromBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Common.RectU* srcRect)
+	public HResult CopyFromBitmap(System.Drawing.Point* destPoint, ID2D1Bitmap* bitmap, Win32.Numerics.Rect* srcRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, System.Drawing.Point*, ID2D1Bitmap*, Common.RectU*, int>)(lpVtbl[8]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), destPoint, bitmap, srcRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, System.Drawing.Point*, ID2D1Bitmap*, Win32.Numerics.Rect*, int>)(lpVtbl[8]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), destPoint, bitmap, srcRect);
 	}
 
 	/// <inheritdoc cref="ID2D1Bitmap.CopyFromRenderTarget" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Common.RectU* srcRect)
+	public HResult CopyFromRenderTarget(System.Drawing.Point* destPoint, ID2D1RenderTarget* renderTarget, Win32.Numerics.Rect* srcRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, System.Drawing.Point*, ID2D1RenderTarget*, Common.RectU*, int>)(lpVtbl[9]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), destPoint, renderTarget, srcRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, System.Drawing.Point*, ID2D1RenderTarget*, Win32.Numerics.Rect*, int>)(lpVtbl[9]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), destPoint, renderTarget, srcRect);
 	}
 
 	/// <inheritdoc cref="ID2D1Bitmap.CopyFromMemory" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(10)]
-	public HResult CopyFromMemory(Common.RectU* dstRect, void* srcData, uint pitch)
+	public HResult CopyFromMemory(Win32.Numerics.Rect* dstRect, void* srcData, uint pitch)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, Common.RectU*, void*, uint, int>)(lpVtbl[10]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), dstRect, srcData, pitch);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Bitmap1*, Win32.Numerics.Rect*, void*, uint, int>)(lpVtbl[10]))((ID2D1Bitmap1*)Unsafe.AsPointer(ref this), dstRect, srcData, pitch);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Bitmap1::GetColorContext"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
index ff02fa2..8754405 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BitmapRenderTarget.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1BitmapRenderTarget : ID2D1BitmapRenderTarget.I
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1BitmapRenderTarget : ID2D1BitmapRenderTarget.I
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1BitmapRenderTarget : ID2D1BitmapRenderTarget.I
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1BitmapRenderTarget*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1BitmapRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
index c0cd7c8..411585e 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1BoundsAdjustmentTransform.cs
@@ -85,26 +85,26 @@ public unsafe partial struct ID2D1BoundsAdjustmentTransform : ID2D1BoundsAdjustm
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1BoundsAdjustmentTransform::SetOutputBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public void SetOutputBounds(RawRect* outputBounds)
+	public void SetOutputBounds(Rect* outputBounds)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BoundsAdjustmentTransform*, RawRect*, void>)(lpVtbl[4]))((ID2D1BoundsAdjustmentTransform*)Unsafe.AsPointer(ref this), outputBounds);
+		((delegate* unmanaged[Stdcall]<ID2D1BoundsAdjustmentTransform*, Rect*, void>)(lpVtbl[4]))((ID2D1BoundsAdjustmentTransform*)Unsafe.AsPointer(ref this), outputBounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1BoundsAdjustmentTransform::GetOutputBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public void GetOutputBounds(RawRect* outputBounds)
+	public void GetOutputBounds(Rect* outputBounds)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1BoundsAdjustmentTransform*, RawRect*, void>)(lpVtbl[5]))((ID2D1BoundsAdjustmentTransform*)Unsafe.AsPointer(ref this), outputBounds);
+		((delegate* unmanaged[Stdcall]<ID2D1BoundsAdjustmentTransform*, Rect*, void>)(lpVtbl[5]))((ID2D1BoundsAdjustmentTransform*)Unsafe.AsPointer(ref this), outputBounds);
 	}
 
 	public interface Interface : ID2D1TransformNode.Interface
 	{
 		[VtblIndex(4)]
-		void SetOutputBounds(RawRect* outputBounds);
+		void SetOutputBounds(Rect* outputBounds);
 
 		[VtblIndex(5)]
-		void GetOutputBounds(RawRect* outputBounds);
+		void GetOutputBounds(Rect* outputBounds);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs
index 689ae6e..56b42b3 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INat
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::DrawRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::DrawBitmap"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::DrawImage"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::DrawGdiMetafile"]/*' />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INat
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::FillOpacityMask"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::FillGeometry"]/*' />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INat
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::FillRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::PushAxisAlignedClip"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink::PushLayer"]/*' />
@@ -316,13 +316,13 @@ public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INat
 		HResult DrawGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
 
 		[VtblIndex(16)]
-		HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+		HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
 
 		[VtblIndex(17)]
-		HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
+		HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
 
 		[VtblIndex(18)]
-		HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
+		HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
 
 		[VtblIndex(19)]
 		HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Vector2* targetOffset);
@@ -331,16 +331,16 @@ public unsafe partial struct ID2D1CommandSink : ID2D1CommandSink.Interface, INat
 		HResult FillMesh(ID2D1Mesh* mesh, ID2D1Brush* brush);
 
 		[VtblIndex(21)]
-		HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+		HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle);
 
 		[VtblIndex(22)]
 		HResult FillGeometry(ID2D1Geometry* geometry, ID2D1Brush* brush, ID2D1Brush* opacityBrush);
 
 		[VtblIndex(23)]
-		HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush);
+		HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush);
 
 		[VtblIndex(24)]
-		HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode);
+		HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode);
 
 		[VtblIndex(25)]
 		HResult PushLayer(LayerParameters1* layerParameters1, ID2D1Layer* layer);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs
index f862497..be5d958 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink1.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink1 : ID2D1CommandSink1.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawGdiMetafile" />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink1 : ID2D1CommandSink1.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.FillGeometry" />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink1 : ID2D1CommandSink1.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink1*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink1*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushLayer" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs
index 3f6cfaa..b2b7444 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink2.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawGdiMetafile" />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.FillGeometry" />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushLayer" />
@@ -301,9 +301,9 @@ public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink2::DrawGdiMetafile"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink2*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink2*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	public interface Interface : ID2D1CommandSink1.Interface
@@ -315,7 +315,7 @@ public unsafe partial struct ID2D1CommandSink2 : ID2D1CommandSink2.Interface, IN
 		HResult DrawGradientMesh(ID2D1GradientMesh* gradientMesh);
 
 		[VtblIndex(31)]
-		HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+		HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs
index 9a1d115..720bbdf 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink3.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink3 : ID2D1CommandSink3.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawGdiMetafile" />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink3 : ID2D1CommandSink3.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.FillGeometry" />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink3 : ID2D1CommandSink3.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushLayer" />
@@ -301,9 +301,9 @@ public unsafe partial struct ID2D1CommandSink3 : ID2D1CommandSink3.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink3*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink3*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink3::DrawSpriteBatch"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs
index b32b727..c3c83ac 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink4.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink4 : ID2D1CommandSink4.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawGdiMetafile" />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink4 : ID2D1CommandSink4.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.FillGeometry" />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink4 : ID2D1CommandSink4.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushLayer" />
@@ -301,9 +301,9 @@ public unsafe partial struct ID2D1CommandSink4 : ID2D1CommandSink4.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink4*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink4*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink3.DrawSpriteBatch" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs
index a11717d..9b712c6 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1CommandSink5.cs
@@ -181,25 +181,25 @@ public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public HResult DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public HResult DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, int>)(lpVtbl[16]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public HResult DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, int>)(lpVtbl[17]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(18)]
-	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public HResult DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, int>)(lpVtbl[18]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.DrawGdiMetafile" />
@@ -221,9 +221,9 @@ public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(21)]
-	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[21]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.FillGeometry" />
@@ -237,17 +237,17 @@ public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(23)]
-	public HResult FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public HResult FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Common.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), rect, brush);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Win32.Numerics.RectF*, ID2D1Brush*, int>)(lpVtbl[23]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(24)]
-	public HResult PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public HResult PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Common.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, Win32.Numerics.RectF*, AntialiasMode, int>)(lpVtbl[24]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink.PushLayer" />
@@ -301,9 +301,9 @@ public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, IN
 	/// <inheritdoc cref="ID2D1CommandSink2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public HResult DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, int>)(lpVtbl[31]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1CommandSink3.DrawSpriteBatch" />
@@ -325,15 +325,15 @@ public unsafe partial struct ID2D1CommandSink5 : ID2D1CommandSink5.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1CommandSink5::BlendImage"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(34)]
-	public HResult BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode)
+	public HResult BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Image*, Common.BlendMode, Vector2*, Common.RectF*, InterpolationMode, int>)(lpVtbl[34]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
+		return ((delegate* unmanaged[Stdcall]<ID2D1CommandSink5*, ID2D1Image*, Common.BlendMode, Vector2*, Win32.Numerics.RectF*, InterpolationMode, int>)(lpVtbl[34]))((ID2D1CommandSink5*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
 	}
 
 	public interface Interface : ID2D1CommandSink4.Interface
 	{
 		[VtblIndex(34)]
-		HResult BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode);
+		HResult BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
index ce749d6..77d291f 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ComputeTransform.cs
@@ -85,25 +85,25 @@ public unsafe partial struct ID2D1ComputeTransform : ID2D1ComputeTransform.Inter
 	/// <inheritdoc cref="ID2D1Transform.MapOutputRectToInputRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult MapOutputRectToInputRects(RawRect* outputRect, RawRect* inputRects, uint inputRectsCount)
+	public HResult MapOutputRectToInputRects(Rect* outputRect, Rect* inputRects, uint inputRectsCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, RawRect*, RawRect*, uint, int>)(lpVtbl[4]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, Rect*, Rect*, uint, int>)(lpVtbl[4]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInputRectsToOutputRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult MapInputRectsToOutputRect(RawRect* inputRects, RawRect* inputOpaqueSubRects, uint inputRectCount, RawRect* outputRect, RawRect* outputOpaqueSubRect)
+	public HResult MapInputRectsToOutputRect(Rect* inputRects, Rect* inputOpaqueSubRects, uint inputRectCount, Rect* outputRect, Rect* outputOpaqueSubRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, RawRect*, RawRect*, uint, RawRect*, RawRect*, int>)(lpVtbl[5]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, Rect*, Rect*, uint, Rect*, Rect*, int>)(lpVtbl[5]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, Rect invalidInputRect, Rect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, uint, Rect, Rect*, int>)(lpVtbl[6]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ComputeTransform::SetComputeInfo"]/*' />
@@ -117,9 +117,9 @@ public unsafe partial struct ID2D1ComputeTransform : ID2D1ComputeTransform.Inter
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ComputeTransform::CalculateThreadgroups"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult CalculateThreadgroups(RawRect* outputRect, uint* dimensionX, uint* dimensionY, uint* dimensionZ)
+	public HResult CalculateThreadgroups(Rect* outputRect, uint* dimensionX, uint* dimensionY, uint* dimensionZ)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, RawRect*, uint*, uint*, uint*, int>)(lpVtbl[8]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), outputRect, dimensionX, dimensionY, dimensionZ);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ComputeTransform*, Rect*, uint*, uint*, uint*, int>)(lpVtbl[8]))((ID2D1ComputeTransform*)Unsafe.AsPointer(ref this), outputRect, dimensionX, dimensionY, dimensionZ);
 	}
 
 	public interface Interface : ID2D1Transform.Interface
@@ -128,7 +128,7 @@ public unsafe partial struct ID2D1ComputeTransform : ID2D1ComputeTransform.Inter
 		HResult SetComputeInfo(ID2D1ComputeInfo* computeInfo);
 
 		[VtblIndex(8)]
-		HResult CalculateThreadgroups(RawRect* outputRect, uint* dimensionX, uint* dimensionY, uint* dimensionZ);
+		HResult CalculateThreadgroups(Rect* outputRect, uint* dimensionX, uint* dimensionY, uint* dimensionZ);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs
index ea4f268..5a7c432 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DCRenderTarget.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DCRenderTarget : ID2D1DCRenderTarget.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DCRenderTarget : ID2D1DCRenderTarget.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DCRenderTarget : ID2D1DCRenderTarget.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -512,15 +512,15 @@ public unsafe partial struct ID2D1DCRenderTarget : ID2D1DCRenderTarget.Interface
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DCRenderTarget::BindDC"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(57)]
-	public HResult BindDC(IntPtr hDC, RawRect* pSubRect)
+	public HResult BindDC(IntPtr hDC, Rect* pSubRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, IntPtr, RawRect*, int>)(lpVtbl[57]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), hDC, pSubRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DCRenderTarget*, IntPtr, Rect*, int>)(lpVtbl[57]))((ID2D1DCRenderTarget*)Unsafe.AsPointer(ref this), hDC, pSubRect);
 	}
 
 	public interface Interface : ID2D1RenderTarget.Interface
 	{
 		[VtblIndex(57)]
-		HResult BindDC(IntPtr hDC, RawRect* pSubRect);
+		HResult BindDC(IntPtr hDC, Rect* pSubRect);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs
index 502a7a3..3c8b675 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetImageLocalBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetImageWorldBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetGlyphRunWorldBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetDevice"]/*' />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::DrawImage"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::DrawGdiMetafile"]/*' />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::DrawBitmap"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::PushLayer"]/*' />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::InvalidateEffectInputRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetEffectInvalidRectangleCount"]/*' />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetEffectInvalidRectangles"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::GetEffectRequiredInputRectangles"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext::FillOpacityMask"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	public interface Interface : ID2D1RenderTarget.Interface
@@ -831,13 +831,13 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 		Bool32 IsBufferPrecisionSupported(BufferPrecision bufferPrecision);
 
 		[VtblIndex(70)]
-		HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds);
+		HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds);
 
 		[VtblIndex(71)]
-		HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds);
+		HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds);
 
 		[VtblIndex(72)]
-		HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds);
+		HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds);
 
 		[VtblIndex(73)]
 		void GetDevice(ID2D1Device** device);
@@ -870,31 +870,31 @@ public unsafe partial struct ID2D1DeviceContext : ID2D1DeviceContext.Interface,
 		void DrawGlyphRun(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.GlyphRunDescription* glyphRunDescription, ID2D1Brush* foregroundBrush, Graphics.DirectWrite.MeasuringMode measuringMode);
 
 		[VtblIndex(83)]
-		void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
+		void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode);
 
 		[VtblIndex(84)]
 		void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Vector2* targetOffset);
 
 		[VtblIndex(85)]
-		void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
+		void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform);
 
 		[VtblIndex(86)]
 		void PushLayer(LayerParameters1* layerParameters, ID2D1Layer* layer);
 
 		[VtblIndex(87)]
-		HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle);
+		HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle);
 
 		[VtblIndex(88)]
 		HResult GetEffectInvalidRectangleCount(ID2D1Effect* effect, uint* rectangleCount);
 
 		[VtblIndex(89)]
-		HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount);
+		HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount);
 
 		[VtblIndex(90)]
-		HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount);
+		HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount);
 
 		[VtblIndex(91)]
-		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs
index 8bac572..2f9d399 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext1.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext1 : ID2D1DeviceContext1.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext1*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext1*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext1::CreateFilledGeometryRealization"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs
index 4e98450..439dbd2 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext2.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext1.CreateFilledGeometryRealization" />
@@ -864,9 +864,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext2::GetGradientMeshWorldBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(101)]
-	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds)
+	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1GradientMesh*, Common.RectF*, int>)(lpVtbl[101]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1GradientMesh*, Win32.Numerics.RectF**, int>)(lpVtbl[101]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext2::DrawInk"]/*' />
@@ -888,9 +888,9 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext2::DrawGdiMetafile"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(104)]
-	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext2*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext2*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext2::CreateTransformedImageSource"]/*' />
@@ -922,7 +922,7 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 		HResult CreateImageSourceFromDxgi(Graphics.Dxgi.IDXGISurface** surfaces, uint surfaceCount, Graphics.Dxgi.Common.ColorSpaceType colorSpace, ImageSourceFromDxgiOptions options, ID2D1ImageSource** imageSource);
 
 		[VtblIndex(101)]
-		HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds);
+		HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds);
 
 		[VtblIndex(102)]
 		void DrawInk(ID2D1Ink* ink, ID2D1Brush* brush, ID2D1InkStyle* inkStyle);
@@ -931,7 +931,7 @@ public unsafe partial struct ID2D1DeviceContext2 : ID2D1DeviceContext2.Interface
 		void DrawGradientMesh(ID2D1GradientMesh* gradientMesh);
 
 		[VtblIndex(104)]
-		void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+		void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle);
 
 		[VtblIndex(105)]
 		HResult CreateTransformedImageSource(ID2D1ImageSource* imageSource, TransformedImageSourceProperties* properties, ID2D1TransformedImageSource** transformedImageSource);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs
index c9c7a8c..95ebd0e 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext3.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext1.CreateFilledGeometryRealization" />
@@ -864,9 +864,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.GetGradientMeshWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(101)]
-	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds)
+	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1GradientMesh*, Common.RectF*, int>)(lpVtbl[101]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1GradientMesh*, Win32.Numerics.RectF**, int>)(lpVtbl[101]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawInk" />
@@ -888,9 +888,9 @@ public unsafe partial struct ID2D1DeviceContext3 : ID2D1DeviceContext3.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(104)]
-	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext3*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext3*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.CreateTransformedImageSource" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs
index ccdf51a..8d34c71 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext4.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext1.CreateFilledGeometryRealization" />
@@ -864,9 +864,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.GetGradientMeshWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(101)]
-	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds)
+	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1GradientMesh*, Common.RectF*, int>)(lpVtbl[101]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1GradientMesh*, Win32.Numerics.RectF**, int>)(lpVtbl[101]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawInk" />
@@ -888,9 +888,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(104)]
-	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.CreateTransformedImageSource" />
@@ -928,9 +928,9 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext4::DrawText"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(109)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext4*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext4*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext4::DrawTextLayout"]/*' />
@@ -979,7 +979,7 @@ public unsafe partial struct ID2D1DeviceContext4 : ID2D1DeviceContext4.Interface
 		HResult CreateSvgGlyphStyle(ID2D1SvgGlyphStyle** svgGlyphStyle);
 
 		[VtblIndex(109)]
-		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
+		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
 
 		[VtblIndex(110)]
 		void DrawTextLayout(Vector2 origin, Graphics.DirectWrite.IDWriteTextLayout* textLayout, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs
index d6bd66a..33eb93a 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext5.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext1.CreateFilledGeometryRealization" />
@@ -864,9 +864,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.GetGradientMeshWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(101)]
-	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds)
+	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1GradientMesh*, Common.RectF*, int>)(lpVtbl[101]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1GradientMesh*, Win32.Numerics.RectF**, int>)(lpVtbl[101]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawInk" />
@@ -888,9 +888,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(104)]
-	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.CreateTransformedImageSource" />
@@ -928,9 +928,9 @@ public unsafe partial struct ID2D1DeviceContext5 : ID2D1DeviceContext5.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext4.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(109)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext5*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext5*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext4.DrawTextLayout" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs
index 5df5aca..cc5e091 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DeviceContext6.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
@@ -616,25 +616,25 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageLocalBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(70)]
-	public HResult GetImageLocalBounds(ID2D1Image* image, Common.RectF* localBounds)
+	public HResult GetImageLocalBounds(ID2D1Image* image, Win32.Numerics.RectF** localBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[70]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, localBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[70]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, localBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetImageWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(71)]
-	public HResult GetImageWorldBounds(ID2D1Image* image, Common.RectF* worldBounds)
+	public HResult GetImageWorldBounds(ID2D1Image* image, Win32.Numerics.RectF** worldBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Common.RectF*, int>)(lpVtbl[71]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, worldBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Win32.Numerics.RectF**, int>)(lpVtbl[71]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, worldBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetGlyphRunWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(72)]
-	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Common.RectF* bounds)
+	public HResult GetGlyphRunWorldBounds(Vector2 baselineOrigin, Graphics.DirectWrite.GlyphRun* glyphRun, Graphics.DirectWrite.MeasuringMode measuringMode, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Common.RectF*, int>)(lpVtbl[72]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, Vector2, Graphics.DirectWrite.GlyphRun*, Graphics.DirectWrite.MeasuringMode, Win32.Numerics.RectF**, int>)(lpVtbl[72]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), baselineOrigin, glyphRun, measuringMode, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetDevice" />
@@ -720,9 +720,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawImage" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(83)]
-	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
+	public void DrawImage(ID2D1Image* image, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode, Common.CompositeMode compositeMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Vector2*, Common.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Vector2*, Win32.Numerics.RectF*, InterpolationMode, Common.CompositeMode, void>)(lpVtbl[83]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, targetOffset, imageRectangle, interpolationMode, compositeMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawGdiMetafile" />
@@ -736,9 +736,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(85)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Common.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, InterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle, Matrix4x4* perspectiveTransform)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, Common.RectF*, float, InterpolationMode, Common.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, InterpolationMode, Win32.Numerics.RectF*, Matrix4x4*, void>)(lpVtbl[85]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.PushLayer" />
@@ -752,9 +752,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.InvalidateEffectInputRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(87)]
-	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Common.RectF* inputRectangle)
+	public HResult InvalidateEffectInputRectangle(ID2D1Effect* effect, uint input, Win32.Numerics.RectF* inputRectangle)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, uint, Common.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, uint, Win32.Numerics.RectF*, int>)(lpVtbl[87]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), effect, input, inputRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangleCount" />
@@ -768,25 +768,25 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectInvalidRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(89)]
-	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Common.RectF* rectangles, uint rectanglesCount)
+	public HResult GetEffectInvalidRectangles(ID2D1Effect* effect, Win32.Numerics.RectF** rectangles, uint rectanglesCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, Common.RectF*, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[89]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), effect, rectangles, rectanglesCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.GetEffectRequiredInputRectangles" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(90)]
-	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Common.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Common.RectF* requiredInputRects, uint inputCount)
+	public HResult GetEffectRequiredInputRectangles(ID2D1Effect* renderEffect, Win32.Numerics.RectF* renderImageRectangle, EffectInputDescription* inputDescriptions, Win32.Numerics.RectF** requiredInputRects, uint inputCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, Common.RectF*, EffectInputDescription*, Common.RectF*, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Effect*, Win32.Numerics.RectF*, EffectInputDescription*, Win32.Numerics.RectF**, uint, int>)(lpVtbl[90]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), renderEffect, renderImageRectangle, inputDescriptions, requiredInputRects, inputCount);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(91)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, ID2D1Brush*, Common.RectF*, Common.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Bitmap*, ID2D1Brush*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[91]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), opacityMask, brush, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext1.CreateFilledGeometryRealization" />
@@ -864,9 +864,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.GetGradientMeshWorldBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(101)]
-	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Common.RectF* pBounds)
+	public HResult GetGradientMeshWorldBounds(ID2D1GradientMesh* gradientMesh, Win32.Numerics.RectF** pBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1GradientMesh*, Common.RectF*, int>)(lpVtbl[101]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1GradientMesh*, Win32.Numerics.RectF**, int>)(lpVtbl[101]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), gradientMesh, pBounds);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawInk" />
@@ -888,9 +888,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext2.DrawGdiMetafile" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(104)]
-	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void DrawGdiMetafile(ID2D1GdiMetafile* gdiMetafile, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1GdiMetafile*, Common.RectF*, Common.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1GdiMetafile*, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[104]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), gdiMetafile, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext2.CreateTransformedImageSource" />
@@ -928,9 +928,9 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <inheritdoc cref="ID2D1DeviceContext4.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(109)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, ID2D1SvgGlyphStyle* svgGlyphStyle, uint colorPaletteIndex, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, ID2D1SvgGlyphStyle*, uint, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[109]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1DeviceContext4.DrawTextLayout" />
@@ -1008,15 +1008,15 @@ public unsafe partial struct ID2D1DeviceContext6 : ID2D1DeviceContext6.Interface
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DeviceContext6::BlendImage"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(119)]
-	public void BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode)
+	public void BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Common.BlendMode, Vector2*, Common.RectF*, InterpolationMode, void>)(lpVtbl[119]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
+		((delegate* unmanaged[Stdcall]<ID2D1DeviceContext6*, ID2D1Image*, Common.BlendMode, Vector2*, Win32.Numerics.RectF*, InterpolationMode, void>)(lpVtbl[119]))((ID2D1DeviceContext6*)Unsafe.AsPointer(ref this), image, blendMode, targetOffset, imageRectangle, interpolationMode);
 	}
 
 	public interface Interface : ID2D1DeviceContext5.Interface
 	{
 		[VtblIndex(119)]
-		void BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Common.RectF* imageRectangle, InterpolationMode interpolationMode);
+		void BlendImage(ID2D1Image* image, Common.BlendMode blendMode, Vector2* targetOffset, Win32.Numerics.RectF* imageRectangle, InterpolationMode interpolationMode);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
index cd4cafc..6cf690e 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1DrawTransform.cs
@@ -85,25 +85,25 @@ public unsafe partial struct ID2D1DrawTransform : ID2D1DrawTransform.Interface,
 	/// <inheritdoc cref="ID2D1Transform.MapOutputRectToInputRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult MapOutputRectToInputRects(RawRect* outputRect, RawRect* inputRects, uint inputRectsCount)
+	public HResult MapOutputRectToInputRects(Rect* outputRect, Rect* inputRects, uint inputRectsCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, RawRect*, RawRect*, uint, int>)(lpVtbl[4]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, Rect*, Rect*, uint, int>)(lpVtbl[4]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInputRectsToOutputRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult MapInputRectsToOutputRect(RawRect* inputRects, RawRect* inputOpaqueSubRects, uint inputRectCount, RawRect* outputRect, RawRect* outputOpaqueSubRect)
+	public HResult MapInputRectsToOutputRect(Rect* inputRects, Rect* inputOpaqueSubRects, uint inputRectCount, Rect* outputRect, Rect* outputOpaqueSubRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, RawRect*, RawRect*, uint, RawRect*, RawRect*, int>)(lpVtbl[5]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, Rect*, Rect*, uint, Rect*, Rect*, int>)(lpVtbl[5]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, Rect invalidInputRect, Rect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1DrawTransform*, uint, Rect, Rect*, int>)(lpVtbl[6]))((ID2D1DrawTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1DrawTransform::SetDrawInfo"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs
index c106a50..3858fa3 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext.cs
@@ -133,9 +133,9 @@ public unsafe partial struct ID2D1EffectContext : ID2D1EffectContext.Interface,
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1EffectContext::CreateBoundsAdjustmentTransform"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(10)]
-	public HResult CreateBoundsAdjustmentTransform(RawRect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
+	public HResult CreateBoundsAdjustmentTransform(Rect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext*, RawRect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext*)Unsafe.AsPointer(ref this), outputRectangle, transform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext*, Rect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext*)Unsafe.AsPointer(ref this), outputRectangle, transform);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1EffectContext::LoadPixelShader"]/*' />
@@ -266,7 +266,7 @@ public unsafe partial struct ID2D1EffectContext : ID2D1EffectContext.Interface,
 		HResult CreateOffsetTransform(System.Drawing.Point offset, ID2D1OffsetTransform** transform);
 
 		[VtblIndex(10)]
-		HResult CreateBoundsAdjustmentTransform(RawRect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform);
+		HResult CreateBoundsAdjustmentTransform(Rect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform);
 
 		[VtblIndex(11)]
 		HResult LoadPixelShader(Guid* shaderId, byte* shaderBuffer, uint shaderBufferCount);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs
index 8324035..331a475 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext1.cs
@@ -133,9 +133,9 @@ public unsafe partial struct ID2D1EffectContext1 : ID2D1EffectContext1.Interface
 	/// <inheritdoc cref="ID2D1EffectContext.CreateBoundsAdjustmentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(10)]
-	public HResult CreateBoundsAdjustmentTransform(RawRect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
+	public HResult CreateBoundsAdjustmentTransform(Rect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext1*, RawRect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext1*)Unsafe.AsPointer(ref this), outputRectangle, transform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext1*, Rect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext1*)Unsafe.AsPointer(ref this), outputRectangle, transform);
 	}
 
 	/// <inheritdoc cref="ID2D1EffectContext.LoadPixelShader" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs
index d04701e..2f992ad 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EffectContext2.cs
@@ -133,9 +133,9 @@ public unsafe partial struct ID2D1EffectContext2 : ID2D1EffectContext2.Interface
 	/// <inheritdoc cref="ID2D1EffectContext.CreateBoundsAdjustmentTransform" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(10)]
-	public HResult CreateBoundsAdjustmentTransform(RawRect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
+	public HResult CreateBoundsAdjustmentTransform(Rect* outputRectangle, ID2D1BoundsAdjustmentTransform** transform)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext2*, RawRect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext2*)Unsafe.AsPointer(ref this), outputRectangle, transform);
+		return ((delegate* unmanaged[Stdcall]<ID2D1EffectContext2*, Rect*, ID2D1BoundsAdjustmentTransform**, int>)(lpVtbl[10]))((ID2D1EffectContext2*)Unsafe.AsPointer(ref this), outputRectangle, transform);
 	}
 
 	/// <inheritdoc cref="ID2D1EffectContext.LoadPixelShader" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs
index 274bc92..8a52b4a 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1EllipseGeometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1EllipseGeometry : ID2D1EllipseGeometry.Interfa
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1EllipseGeometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1EllipseGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1EllipseGeometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1EllipseGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1EllipseGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1EllipseGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1EllipseGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1EllipseGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs
index 3f80823..2281a71 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory : ID2D1Factory.Interface, INativeGuid
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Factory::CreateRectangleGeometry"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Factory::CreateRoundedRectangleGeometry"]/*' />
@@ -195,7 +195,7 @@ public unsafe partial struct ID2D1Factory : ID2D1Factory.Interface, INativeGuid
 		void GetDesktopDpi(float* dpiX, float* dpiY);
 
 		[VtblIndex(5)]
-		HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry);
+		HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry);
 
 		[VtblIndex(6)]
 		HResult CreateRoundedRectangleGeometry(RoundedRect* roundedRectangle, ID2D1RoundedRectangleGeometry** roundedRectangleGeometry);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs
index 2136b71..6f197a7 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory1.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory1 : ID2D1Factory1.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory1*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory1*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory1*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory1*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs
index ee63138..78450bd 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory2.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory2 : ID2D1Factory2.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory2*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory2*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory2*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory2*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs
index f5923bd..c0d0b9d 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory3.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory3 : ID2D1Factory3.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory3*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory3*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory3*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory3*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs
index 2da4f38..92aef6d 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory4.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory4 : ID2D1Factory4.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory4*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory4*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory4*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory4*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs
index 8042ad7..ce42646 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory5.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory5 : ID2D1Factory5.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory5*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory5*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory5*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory5*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs
index 8098c03..c66691a 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory6.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory6 : ID2D1Factory6.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory6*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory6*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory6*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory6*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs
index bdb72b4..b9b8bdc 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Factory7.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1Factory7 : ID2D1Factory7.Interface, INativeGui
 	/// <inheritdoc cref="ID2D1Factory.CreateRectangleGeometry" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult CreateRectangleGeometry(Common.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
+	public HResult CreateRectangleGeometry(Win32.Numerics.RectF* rectangle, ID2D1RectangleGeometry** rectangleGeometry)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Factory7*, Common.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory7*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Factory7*, Win32.Numerics.RectF*, ID2D1RectangleGeometry**, int>)(lpVtbl[5]))((ID2D1Factory7*)Unsafe.AsPointer(ref this), rectangle, rectangleGeometry);
 	}
 
 	/// <inheritdoc cref="ID2D1Factory.CreateRoundedRectangleGeometry" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
index 19ddf4c..d190e1b 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiInteropRenderTarget.cs
@@ -85,9 +85,9 @@ public unsafe partial struct ID2D1GdiInteropRenderTarget : ID2D1GdiInteropRender
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1GdiInteropRenderTarget::ReleaseDC"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult ReleaseDC(RawRect* update)
+	public HResult ReleaseDC(Rect* update)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GdiInteropRenderTarget*, RawRect*, int>)(lpVtbl[4]))((ID2D1GdiInteropRenderTarget*)Unsafe.AsPointer(ref this), update);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GdiInteropRenderTarget*, Rect*, int>)(lpVtbl[4]))((ID2D1GdiInteropRenderTarget*)Unsafe.AsPointer(ref this), update);
 	}
 
 	public interface Interface : IUnknown.Interface
@@ -96,7 +96,7 @@ public unsafe partial struct ID2D1GdiInteropRenderTarget : ID2D1GdiInteropRender
 		HResult GetDC(DCInitializeMode mode, IntPtr* hdc);
 
 		[VtblIndex(4)]
-		HResult ReleaseDC(RawRect* update);
+		HResult ReleaseDC(Rect* update);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs
index 1d62eb3..42c906b 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1GdiMetafile : ID2D1GdiMetafile.Interface, INat
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1GdiMetafile::GetBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetBounds(Common.RectF* bounds)
+	public HResult GetBounds(Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile*, Common.RectF*, int>)(lpVtbl[5]))((ID2D1GdiMetafile*)Unsafe.AsPointer(ref this), bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile*, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1GdiMetafile*)Unsafe.AsPointer(ref this), bounds);
 	}
 
 	public interface Interface : ID2D1Resource.Interface
@@ -104,7 +104,7 @@ public unsafe partial struct ID2D1GdiMetafile : ID2D1GdiMetafile.Interface, INat
 		HResult Stream(ID2D1GdiMetafileSink* sink);
 
 		[VtblIndex(5)]
-		HResult GetBounds(Common.RectF* bounds);
+		HResult GetBounds(Win32.Numerics.RectF** bounds);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs
index 9410154..7efd919 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GdiMetafile1.cs
@@ -93,9 +93,9 @@ public unsafe partial struct ID2D1GdiMetafile1 : ID2D1GdiMetafile1.Interface, IN
 	/// <inheritdoc cref="ID2D1GdiMetafile.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetBounds(Common.RectF* bounds)
+	public HResult GetBounds(Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile1*, Common.RectF*, int>)(lpVtbl[5]))((ID2D1GdiMetafile1*)Unsafe.AsPointer(ref this), bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile1*, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1GdiMetafile1*)Unsafe.AsPointer(ref this), bounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1GdiMetafile1::GetDpi"]/*' />
@@ -109,9 +109,9 @@ public unsafe partial struct ID2D1GdiMetafile1 : ID2D1GdiMetafile1.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1GdiMetafile1::GetSourceBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult GetSourceBounds(Common.RectF* bounds)
+	public HResult GetSourceBounds(Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile1*, Common.RectF*, int>)(lpVtbl[7]))((ID2D1GdiMetafile1*)Unsafe.AsPointer(ref this), bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GdiMetafile1*, Win32.Numerics.RectF**, int>)(lpVtbl[7]))((ID2D1GdiMetafile1*)Unsafe.AsPointer(ref this), bounds);
 	}
 
 	public interface Interface : ID2D1GdiMetafile.Interface
@@ -120,7 +120,7 @@ public unsafe partial struct ID2D1GdiMetafile1 : ID2D1GdiMetafile1.Interface, IN
 		HResult GetDpi(float* dpiX, float* dpiY);
 
 		[VtblIndex(7)]
-		HResult GetSourceBounds(Common.RectF* bounds);
+		HResult GetSourceBounds(Win32.Numerics.RectF** bounds);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs
index c8bd0bc..462298a 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Geometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1Geometry : ID2D1Geometry.Interface, INativeGui
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Geometry::GetBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Geometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1Geometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Geometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1Geometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Geometry::GetWidenedBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Geometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1Geometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Geometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1Geometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Geometry::StrokeContainsPoint"]/*' />
@@ -189,10 +189,10 @@ public unsafe partial struct ID2D1Geometry : ID2D1Geometry.Interface, INativeGui
 	public interface Interface : ID2D1Resource.Interface
 	{
 		[VtblIndex(4)]
-		HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds);
+		HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds);
 
 		[VtblIndex(5)]
-		HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds);
+		HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds);
 
 		[VtblIndex(6)]
 		HResult StrokeContainsPoint(Vector2 point, float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Bool32* contains);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs
index 964eba6..71da1f1 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1GeometryGroup.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1GeometryGroup : ID2D1GeometryGroup.Interface,
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GeometryGroup*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1GeometryGroup*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GeometryGroup*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1GeometryGroup*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1GeometryGroup*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1GeometryGroup*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1GeometryGroup*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1GeometryGroup*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs
index d4a3a82..5f30d12 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1HwndRenderTarget.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1HwndRenderTarget : ID2D1HwndRenderTarget.Inter
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.FillRectangle" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawRoundedRectangle" />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1HwndRenderTarget : ID2D1HwndRenderTarget.Inter
 	/// <inheritdoc cref="ID2D1RenderTarget.FillOpacityMask" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawBitmap" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawText" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.DrawTextLayout" />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1HwndRenderTarget : ID2D1HwndRenderTarget.Inter
 	/// <inheritdoc cref="ID2D1RenderTarget.PushAxisAlignedClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1HwndRenderTarget*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1HwndRenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <inheritdoc cref="ID2D1RenderTarget.PopAxisAlignedClip" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs
index 1186dcc..0f5480e 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageBrush.cs
@@ -149,9 +149,9 @@ public unsafe partial struct ID2D1ImageBrush : ID2D1ImageBrush.Interface, INativ
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageBrush::SetSourceRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(12)]
-	public void SetSourceRectangle(Common.RectF* sourceRectangle)
+	public void SetSourceRectangle(Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1ImageBrush*, Common.RectF*, void>)(lpVtbl[12]))((ID2D1ImageBrush*)Unsafe.AsPointer(ref this), sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1ImageBrush*, Win32.Numerics.RectF*, void>)(lpVtbl[12]))((ID2D1ImageBrush*)Unsafe.AsPointer(ref this), sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageBrush::GetImage"]/*' />
@@ -189,9 +189,9 @@ public unsafe partial struct ID2D1ImageBrush : ID2D1ImageBrush.Interface, INativ
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageBrush::GetSourceRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void GetSourceRectangle(Common.RectF* sourceRectangle)
+	public void GetSourceRectangle(Win32.Numerics.RectF** sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1ImageBrush*, Common.RectF*, void>)(lpVtbl[17]))((ID2D1ImageBrush*)Unsafe.AsPointer(ref this), sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1ImageBrush*, Win32.Numerics.RectF**, void>)(lpVtbl[17]))((ID2D1ImageBrush*)Unsafe.AsPointer(ref this), sourceRectangle);
 	}
 
 	public interface Interface : ID2D1Brush.Interface
@@ -209,7 +209,7 @@ public unsafe partial struct ID2D1ImageBrush : ID2D1ImageBrush.Interface, INativ
 		void SetInterpolationMode(InterpolationMode interpolationMode);
 
 		[VtblIndex(12)]
-		void SetSourceRectangle(Common.RectF* sourceRectangle);
+		void SetSourceRectangle(Win32.Numerics.RectF* sourceRectangle);
 
 		[VtblIndex(13)]
 		void GetImage(ID2D1Image** image);
@@ -224,7 +224,7 @@ public unsafe partial struct ID2D1ImageBrush : ID2D1ImageBrush.Interface, INativ
 		InterpolationMode GetInterpolationMode();
 
 		[VtblIndex(17)]
-		void GetSourceRectangle(Common.RectF* sourceRectangle);
+		void GetSourceRectangle(Win32.Numerics.RectF** sourceRectangle);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
index 06518ca..cc25423 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1ImageSourceFromWic.cs
@@ -101,17 +101,17 @@ public unsafe partial struct ID2D1ImageSourceFromWic : ID2D1ImageSourceFromWic.I
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageSourceFromWic::EnsureCached"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult EnsureCached(Common.RectU* rectangleToFill)
+	public HResult EnsureCached(Win32.Numerics.Rect* rectangleToFill)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ImageSourceFromWic*, Common.RectU*, int>)(lpVtbl[6]))((ID2D1ImageSourceFromWic*)Unsafe.AsPointer(ref this), rectangleToFill);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ImageSourceFromWic*, Win32.Numerics.Rect*, int>)(lpVtbl[6]))((ID2D1ImageSourceFromWic*)Unsafe.AsPointer(ref this), rectangleToFill);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageSourceFromWic::TrimCache"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult TrimCache(Common.RectU* rectangleToPreserve)
+	public HResult TrimCache(Win32.Numerics.Rect* rectangleToPreserve)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1ImageSourceFromWic*, Common.RectU*, int>)(lpVtbl[7]))((ID2D1ImageSourceFromWic*)Unsafe.AsPointer(ref this), rectangleToPreserve);
+		return ((delegate* unmanaged[Stdcall]<ID2D1ImageSourceFromWic*, Win32.Numerics.Rect*, int>)(lpVtbl[7]))((ID2D1ImageSourceFromWic*)Unsafe.AsPointer(ref this), rectangleToPreserve);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1ImageSourceFromWic::GetSource"]/*' />
@@ -125,10 +125,10 @@ public unsafe partial struct ID2D1ImageSourceFromWic : ID2D1ImageSourceFromWic.I
 	public interface Interface : ID2D1ImageSource.Interface
 	{
 		[VtblIndex(6)]
-		HResult EnsureCached(Common.RectU* rectangleToFill);
+		HResult EnsureCached(Win32.Numerics.Rect* rectangleToFill);
 
 		[VtblIndex(7)]
-		HResult TrimCache(Common.RectU* rectangleToPreserve);
+		HResult TrimCache(Win32.Numerics.Rect* rectangleToPreserve);
 
 		[VtblIndex(8)]
 		void GetSource(Graphics.Imaging.IWICBitmapSource** wicBitmapSource);
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs
index b262830..d4c3010 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Ink.cs
@@ -158,9 +158,9 @@ public unsafe partial struct ID2D1Ink : ID2D1Ink.Interface, INativeGuid
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Ink::GetBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public HResult GetBounds(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Ink*, ID2D1InkStyle*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[13]))((ID2D1Ink*)Unsafe.AsPointer(ref this), inkStyle, worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Ink*, ID2D1InkStyle*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[13]))((ID2D1Ink*)Unsafe.AsPointer(ref this), inkStyle, worldTransform, bounds);
 	}
 
 	public interface Interface : ID2D1Resource.Interface
@@ -193,7 +193,7 @@ public unsafe partial struct ID2D1Ink : ID2D1Ink.Interface, INativeGuid
 		HResult StreamAsGeometry(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.ID2D1SimplifiedGeometrySink* geometrySink);
 
 		[VtblIndex(13)]
-		HResult GetBounds(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, Common.RectF* bounds);
+		HResult GetBounds(ID2D1InkStyle* inkStyle, Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs
index cb2e533..388c6c6 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1PathGeometry : ID2D1PathGeometry.Interface, IN
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1PathGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1PathGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1PathGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1PathGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs
index 5045134..fc84499 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1PathGeometry1.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1PathGeometry1 : ID2D1PathGeometry1.Interface,
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry1*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1PathGeometry1*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry1*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1PathGeometry1*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry1*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1PathGeometry1*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1PathGeometry1*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1PathGeometry1*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs
index c1314c5..fe5dad8 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RectangleGeometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1RectangleGeometry : ID2D1RectangleGeometry.Int
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
@@ -189,15 +189,15 @@ public unsafe partial struct ID2D1RectangleGeometry : ID2D1RectangleGeometry.Int
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RectangleGeometry::GetRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void GetRect(Common.RectF* rect)
+	public void GetRect(Win32.Numerics.RectF** rect)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, Common.RectF*, void>)(lpVtbl[17]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), rect);
+		((delegate* unmanaged[Stdcall]<ID2D1RectangleGeometry*, Win32.Numerics.RectF**, void>)(lpVtbl[17]))((ID2D1RectangleGeometry*)Unsafe.AsPointer(ref this), rect);
 	}
 
 	public interface Interface : ID2D1Geometry.Interface
 	{
 		[VtblIndex(17)]
-		void GetRect(Common.RectF* rect);
+		void GetRect(Win32.Numerics.RectF** rect);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs
index 3c83388..536ac11 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RenderTarget.cs
@@ -181,17 +181,17 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::DrawRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(16)]
-	public void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
+	public void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Common.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, float, ID2D1StrokeStyle*, void>)(lpVtbl[16]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), rect, brush, strokeWidth, strokeStyle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::FillRectangle"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(17)]
-	public void FillRectangle(Common.RectF* rect, ID2D1Brush* brush)
+	public void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Common.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Win32.Numerics.RectF*, ID2D1Brush*, void>)(lpVtbl[17]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), rect, brush);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::DrawRoundedRectangle"]/*' />
@@ -253,25 +253,25 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::FillOpacityMask"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(25)]
-	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle)
+	public void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Common.RectF*, Common.RectF*, void>)(lpVtbl[25]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ID2D1Bitmap*, ID2D1Brush*, OpacityMaskContent, Win32.Numerics.RectF*, Win32.Numerics.RectF*, void>)(lpVtbl[25]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), opacityMask, brush, content, destinationRectangle, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::DrawBitmap"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(26)]
-	public void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle)
+	public void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ID2D1Bitmap*, Common.RectF*, float, BitmapInterpolationMode, Common.RectF*, void>)(lpVtbl[26]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ID2D1Bitmap*, Win32.Numerics.RectF*, float, BitmapInterpolationMode, Win32.Numerics.RectF*, void>)(lpVtbl[26]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), bitmap, destinationRectangle, opacity, interpolationMode, sourceRectangle);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::DrawText"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(27)]
-	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
+	public void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Common.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, ushort*, uint, Graphics.DirectWrite.IDWriteTextFormat*, Win32.Numerics.RectF*, ID2D1Brush*, DrawTextOptions, Graphics.DirectWrite.MeasuringMode, void>)(lpVtbl[27]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), @string, stringLength, textFormat, layoutRect, defaultFillBrush, options, measuringMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::DrawTextLayout"]/*' />
@@ -413,9 +413,9 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::PushAxisAlignedClip"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode)
+	public void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Common.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
+		((delegate* unmanaged[Stdcall]<ID2D1RenderTarget*, Win32.Numerics.RectF*, AntialiasMode, void>)(lpVtbl[45]))((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), clipRect, antialiasMode);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1RenderTarget::PopAxisAlignedClip"]/*' />
@@ -548,10 +548,10 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 		void DrawLine(Vector2 point0, Vector2 point1, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
 
 		[VtblIndex(16)]
-		void DrawRectangle(Common.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
+		void DrawRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
 
 		[VtblIndex(17)]
-		void FillRectangle(Common.RectF* rect, ID2D1Brush* brush);
+		void FillRectangle(Win32.Numerics.RectF* rect, ID2D1Brush* brush);
 
 		[VtblIndex(18)]
 		void DrawRoundedRectangle(RoundedRect* roundedRect, ID2D1Brush* brush, float strokeWidth, ID2D1StrokeStyle* strokeStyle);
@@ -575,13 +575,13 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 		void FillMesh(ID2D1Mesh* mesh, ID2D1Brush* brush);
 
 		[VtblIndex(25)]
-		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Common.RectF* destinationRectangle, Common.RectF* sourceRectangle);
+		void FillOpacityMask(ID2D1Bitmap* opacityMask, ID2D1Brush* brush, OpacityMaskContent content, Win32.Numerics.RectF* destinationRectangle, Win32.Numerics.RectF* sourceRectangle);
 
 		[VtblIndex(26)]
-		void DrawBitmap(ID2D1Bitmap* bitmap, Common.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Common.RectF* sourceRectangle);
+		void DrawBitmap(ID2D1Bitmap* bitmap, Win32.Numerics.RectF* destinationRectangle, float opacity, BitmapInterpolationMode interpolationMode, Win32.Numerics.RectF* sourceRectangle);
 
 		[VtblIndex(27)]
-		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Common.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
+		void DrawText(ushort* @string, uint stringLength, Graphics.DirectWrite.IDWriteTextFormat* textFormat, Win32.Numerics.RectF* layoutRect, ID2D1Brush* defaultFillBrush, DrawTextOptions options, Graphics.DirectWrite.MeasuringMode measuringMode);
 
 		[VtblIndex(28)]
 		void DrawTextLayout(Vector2 origin, Graphics.DirectWrite.IDWriteTextLayout* textLayout, ID2D1Brush* defaultFillBrush, DrawTextOptions options);
@@ -635,7 +635,7 @@ public unsafe partial struct ID2D1RenderTarget : ID2D1RenderTarget.Interface, IN
 		void RestoreDrawingState(ID2D1DrawingStateBlock* drawingStateBlock);
 
 		[VtblIndex(45)]
-		void PushAxisAlignedClip(Common.RectF* clipRect, AntialiasMode antialiasMode);
+		void PushAxisAlignedClip(Win32.Numerics.RectF* clipRect, AntialiasMode antialiasMode);
 
 		[VtblIndex(46)]
 		void PopAxisAlignedClip();
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
index 02b9686..e085ad2 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1RoundedRectangleGeometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1RoundedRectangleGeometry : ID2D1RoundedRectang
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1RoundedRectangleGeometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1RoundedRectangleGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1RoundedRectangleGeometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1RoundedRectangleGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1RoundedRectangleGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1RoundedRectangleGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1RoundedRectangleGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1RoundedRectangleGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
index cceb380..c44bbf6 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SourceTransform.cs
@@ -85,25 +85,25 @@ public unsafe partial struct ID2D1SourceTransform : ID2D1SourceTransform.Interfa
 	/// <inheritdoc cref="ID2D1Transform.MapOutputRectToInputRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult MapOutputRectToInputRects(RawRect* outputRect, RawRect* inputRects, uint inputRectsCount)
+	public HResult MapOutputRectToInputRects(Rect* outputRect, Rect* inputRects, uint inputRectsCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, RawRect*, RawRect*, uint, int>)(lpVtbl[4]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, Rect*, Rect*, uint, int>)(lpVtbl[4]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInputRectsToOutputRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult MapInputRectsToOutputRect(RawRect* inputRects, RawRect* inputOpaqueSubRects, uint inputRectCount, RawRect* outputRect, RawRect* outputOpaqueSubRect)
+	public HResult MapInputRectsToOutputRect(Rect* inputRects, Rect* inputOpaqueSubRects, uint inputRectCount, Rect* outputRect, Rect* outputOpaqueSubRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, RawRect*, RawRect*, uint, RawRect*, RawRect*, int>)(lpVtbl[5]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, Rect*, Rect*, uint, Rect*, Rect*, int>)(lpVtbl[5]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
 	}
 
 	/// <inheritdoc cref="ID2D1Transform.MapInvalidRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, Rect invalidInputRect, Rect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, uint, Rect, Rect*, int>)(lpVtbl[6]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SourceTransform::SetRenderInfo"]/*' />
@@ -117,9 +117,9 @@ public unsafe partial struct ID2D1SourceTransform : ID2D1SourceTransform.Interfa
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SourceTransform::Draw"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult Draw(ID2D1Bitmap1* target, RawRect* drawRect, System.Drawing.Point targetOrigin)
+	public HResult Draw(ID2D1Bitmap1* target, Rect* drawRect, System.Drawing.Point targetOrigin)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, ID2D1Bitmap1*, RawRect*, System.Drawing.Point, int>)(lpVtbl[8]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), target, drawRect, targetOrigin);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SourceTransform*, ID2D1Bitmap1*, Rect*, System.Drawing.Point, int>)(lpVtbl[8]))((ID2D1SourceTransform*)Unsafe.AsPointer(ref this), target, drawRect, targetOrigin);
 	}
 
 	public interface Interface : ID2D1Transform.Interface
@@ -128,7 +128,7 @@ public unsafe partial struct ID2D1SourceTransform : ID2D1SourceTransform.Interfa
 		HResult SetRenderInfo(ID2D1RenderInfo* renderInfo);
 
 		[VtblIndex(8)]
-		HResult Draw(ID2D1Bitmap1* target, RawRect* drawRect, System.Drawing.Point targetOrigin);
+		HResult Draw(ID2D1Bitmap1* target, Rect* drawRect, System.Drawing.Point targetOrigin);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs
index 660f455..10c9426 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1SpriteBatch.cs
@@ -85,25 +85,25 @@ public unsafe partial struct ID2D1SpriteBatch : ID2D1SpriteBatch.Interface, INat
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SpriteBatch::AddSprites"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult AddSprites(uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride)
+	public HResult AddSprites(uint spriteCount, Win32.Numerics.RectF* destinationRectangles, Win32.Numerics.Rect* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, Common.RectF*, Common.RectU*, Color4*, Matrix3x2*, uint, uint, uint, uint, int>)(lpVtbl[4]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), spriteCount, destinationRectangles, sourceRectangles, colors, transforms, destinationRectanglesStride, sourceRectanglesStride, colorsStride, transformsStride);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, Win32.Numerics.RectF*, Win32.Numerics.Rect*, Color4*, Matrix3x2*, uint, uint, uint, uint, int>)(lpVtbl[4]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), spriteCount, destinationRectangles, sourceRectangles, colors, transforms, destinationRectanglesStride, sourceRectanglesStride, colorsStride, transformsStride);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SpriteBatch::SetSprites"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult SetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride)
+	public HResult SetSprites(uint startIndex, uint spriteCount, Win32.Numerics.RectF* destinationRectangles, Win32.Numerics.Rect* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, uint, Common.RectF*, Common.RectU*, Color4*, Matrix3x2*, uint, uint, uint, uint, int>)(lpVtbl[5]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), startIndex, spriteCount, destinationRectangles, sourceRectangles, colors, transforms, destinationRectanglesStride, sourceRectanglesStride, colorsStride, transformsStride);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, uint, Win32.Numerics.RectF*, Win32.Numerics.Rect*, Color4*, Matrix3x2*, uint, uint, uint, uint, int>)(lpVtbl[5]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), startIndex, spriteCount, destinationRectangles, sourceRectangles, colors, transforms, destinationRectanglesStride, sourceRectanglesStride, colorsStride, transformsStride);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SpriteBatch::GetSprites"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult GetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4** colors, Matrix3x2* transforms)
+	public HResult GetSprites(uint startIndex, uint spriteCount, Win32.Numerics.RectF** destinationRectangles, Win32.Numerics.Rect** sourceRectangles, Color4** colors, Matrix3x2* transforms)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, uint, Common.RectF*, Common.RectU*, Color4**, Matrix3x2*, int>)(lpVtbl[6]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), startIndex, spriteCount, destinationRectangles, sourceRectangles, colors, transforms);
+		return ((delegate* unmanaged[Stdcall]<ID2D1SpriteBatch*, uint, uint, Win32.Numerics.RectF**, Win32.Numerics.Rect**, Color4**, Matrix3x2*, int>)(lpVtbl[6]))((ID2D1SpriteBatch*)Unsafe.AsPointer(ref this), startIndex, spriteCount, destinationRectangles, sourceRectangles, colors, transforms);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1SpriteBatch::GetSpriteCount"]/*' />
@@ -125,13 +125,13 @@ public unsafe partial struct ID2D1SpriteBatch : ID2D1SpriteBatch.Interface, INat
 	public interface Interface : ID2D1Resource.Interface
 	{
 		[VtblIndex(4)]
-		HResult AddSprites(uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
+		HResult AddSprites(uint spriteCount, Win32.Numerics.RectF* destinationRectangles, Win32.Numerics.Rect* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
 
 		[VtblIndex(5)]
-		HResult SetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
+		HResult SetSprites(uint startIndex, uint spriteCount, Win32.Numerics.RectF* destinationRectangles, Win32.Numerics.Rect* sourceRectangles, Color4* colors, Matrix3x2* transforms, uint destinationRectanglesStride, uint sourceRectanglesStride, uint colorsStride, uint transformsStride);
 
 		[VtblIndex(6)]
-		HResult GetSprites(uint startIndex, uint spriteCount, Common.RectF* destinationRectangles, Common.RectU* sourceRectangles, Color4** colors, Matrix3x2* transforms);
+		HResult GetSprites(uint startIndex, uint spriteCount, Win32.Numerics.RectF** destinationRectangles, Win32.Numerics.Rect** sourceRectangles, Color4** colors, Matrix3x2* transforms);
 
 		[VtblIndex(7)]
 		uint GetSpriteCount();
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
index 629179b..99b03d0 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1Transform.cs
@@ -85,37 +85,37 @@ public unsafe partial struct ID2D1Transform : ID2D1Transform.Interface, INativeG
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Transform::MapOutputRectToInputRects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult MapOutputRectToInputRects(RawRect* outputRect, RawRect* inputRects, uint inputRectsCount)
+	public HResult MapOutputRectToInputRects(Rect* outputRect, Rect* inputRects, uint inputRectsCount)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, RawRect*, RawRect*, uint, int>)(lpVtbl[4]))((ID2D1Transform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, Rect*, Rect*, uint, int>)(lpVtbl[4]))((ID2D1Transform*)Unsafe.AsPointer(ref this), outputRect, inputRects, inputRectsCount);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Transform::MapInputRectsToOutputRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult MapInputRectsToOutputRect(RawRect* inputRects, RawRect* inputOpaqueSubRects, uint inputRectCount, RawRect* outputRect, RawRect* outputOpaqueSubRect)
+	public HResult MapInputRectsToOutputRect(Rect* inputRects, Rect* inputOpaqueSubRects, uint inputRectCount, Rect* outputRect, Rect* outputOpaqueSubRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, RawRect*, RawRect*, uint, RawRect*, RawRect*, int>)(lpVtbl[5]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, Rect*, Rect*, uint, Rect*, Rect*, int>)(lpVtbl[5]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputRects, inputOpaqueSubRects, inputRectCount, outputRect, outputOpaqueSubRect);
 	}
 
 	/// <include file='../Direct2D.xml' path='doc/member[@name="ID2D1Transform::MapInvalidRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(6)]
-	public HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect)
+	public HResult MapInvalidRect(uint inputIndex, Rect invalidInputRect, Rect* invalidOutputRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, uint, RawRect, RawRect*, int>)(lpVtbl[6]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
+		return ((delegate* unmanaged[Stdcall]<ID2D1Transform*, uint, Rect, Rect*, int>)(lpVtbl[6]))((ID2D1Transform*)Unsafe.AsPointer(ref this), inputIndex, invalidInputRect, invalidOutputRect);
 	}
 
 	public interface Interface : ID2D1TransformNode.Interface
 	{
 		[VtblIndex(4)]
-		HResult MapOutputRectToInputRects(RawRect* outputRect, RawRect* inputRects, uint inputRectsCount);
+		HResult MapOutputRectToInputRects(Rect* outputRect, Rect* inputRects, uint inputRectsCount);
 
 		[VtblIndex(5)]
-		HResult MapInputRectsToOutputRect(RawRect* inputRects, RawRect* inputOpaqueSubRects, uint inputRectCount, RawRect* outputRect, RawRect* outputOpaqueSubRect);
+		HResult MapInputRectsToOutputRect(Rect* inputRects, Rect* inputOpaqueSubRects, uint inputRectCount, Rect* outputRect, Rect* outputOpaqueSubRect);
 
 		[VtblIndex(6)]
-		HResult MapInvalidRect(uint inputIndex, RawRect invalidInputRect, RawRect* invalidOutputRect);
+		HResult MapInvalidRect(uint inputIndex, Rect invalidInputRect, Rect* invalidOutputRect);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs
index 1cc2a15..b3bc551 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/Generated/ID2D1TransformedGeometry.cs
@@ -85,17 +85,17 @@ public unsafe partial struct ID2D1TransformedGeometry : ID2D1TransformedGeometry
 	/// <inheritdoc cref="ID2D1Geometry.GetBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult GetBounds(Matrix3x2* worldTransform, Common.RectF* bounds)
+	public HResult GetBounds(Matrix3x2* worldTransform, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1TransformedGeometry*, Matrix3x2*, Common.RectF*, int>)(lpVtbl[4]))((ID2D1TransformedGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1TransformedGeometry*, Matrix3x2*, Win32.Numerics.RectF**, int>)(lpVtbl[4]))((ID2D1TransformedGeometry*)Unsafe.AsPointer(ref this), worldTransform, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.GetWidenedBounds" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Common.RectF* bounds)
+	public HResult GetWidenedBounds(float strokeWidth, ID2D1StrokeStyle* strokeStyle, Matrix3x2* worldTransform, float flatteningTolerance, Win32.Numerics.RectF** bounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<ID2D1TransformedGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Common.RectF*, int>)(lpVtbl[5]))((ID2D1TransformedGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
+		return ((delegate* unmanaged[Stdcall]<ID2D1TransformedGeometry*, float, ID2D1StrokeStyle*, Matrix3x2*, float, Win32.Numerics.RectF**, int>)(lpVtbl[5]))((ID2D1TransformedGeometry*)Unsafe.AsPointer(ref this), strokeWidth, strokeStyle, worldTransform, flatteningTolerance, bounds);
 	}
 
 	/// <inheritdoc cref="ID2D1Geometry.StrokeContainsPoint" />
diff --git a/src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs
index ee013bb..084d492 100644
--- a/src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct2D/ID2D1DeviceContext.cs
@@ -115,7 +115,7 @@ public unsafe partial struct ID2D1DeviceContext
     public void DrawImage(
         ID2D1Effect* effect,
         Vector2* targetOffset = null,
-        Common.RectF* imageRectangle = null,
+        RectF* imageRectangle = null,
         InterpolationMode interpolationMode = InterpolationMode.Linear,
         CompositeMode compositeMode = CompositeMode.SourceOver)
     {
@@ -159,7 +159,7 @@ public unsafe partial struct ID2D1DeviceContext
 
     public void DrawImage(ID2D1Image* image,
         Vector2 targetOffset,
-        Common.RectF* imageRectangle,
+        RectF* imageRectangle,
         InterpolationMode interpolationMode = InterpolationMode.Linear,
         CompositeMode compositeMode = CompositeMode.SourceOver)
     {
@@ -168,7 +168,7 @@ public unsafe partial struct ID2D1DeviceContext
 
     public void DrawImage(ID2D1Effect* effect,
         Vector2 targetOffset,
-        Common.RectF* imageRectangle,
+        RectF* imageRectangle,
         InterpolationMode interpolationMode = InterpolationMode.Linear,
         CompositeMode compositeMode = CompositeMode.SourceOver)
     {
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs
index 6857bec..8a5050f 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext.cs
@@ -413,9 +413,9 @@ public unsafe partial struct ID3D11DeviceContext : ID3D11DeviceContext.Interface
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext::RSSetScissorRects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext*, uint, RawRect*, void>)(lpVtbl[45]))((ID3D11DeviceContext*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext*, uint, Rect*, void>)(lpVtbl[45]))((ID3D11DeviceContext*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext::CopySubresourceRegion"]/*' />
@@ -821,9 +821,9 @@ public unsafe partial struct ID3D11DeviceContext : ID3D11DeviceContext.Interface
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext::RSGetScissorRects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(96)]
-	public void RSGetScissorRects(uint* pNumRects, RawRect* pRects)
+	public void RSGetScissorRects(uint* pNumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext*, uint*, RawRect*, void>)(lpVtbl[96]))((ID3D11DeviceContext*)Unsafe.AsPointer(ref this), pNumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext*, uint*, Rect*, void>)(lpVtbl[96]))((ID3D11DeviceContext*)Unsafe.AsPointer(ref this), pNumRects, pRects);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext::HSGetShaderResources"]/*' />
@@ -1087,7 +1087,7 @@ public unsafe partial struct ID3D11DeviceContext : ID3D11DeviceContext.Interface
 		void RSSetViewports(uint NumViewports, Viewport* pViewports);
 
 		[VtblIndex(45)]
-		void RSSetScissorRects(uint NumRects, RawRect* pRects);
+		void RSSetScissorRects(uint NumRects, Rect* pRects);
 
 		[VtblIndex(46)]
 		void CopySubresourceRegion(ID3D11Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, uint DstZ, ID3D11Resource* pSrcResource, uint SrcSubresource, Box* pSrcBox);
@@ -1240,7 +1240,7 @@ public unsafe partial struct ID3D11DeviceContext : ID3D11DeviceContext.Interface
 		void RSGetViewports(uint* pNumViewports, Viewport* pViewports);
 
 		[VtblIndex(96)]
-		void RSGetScissorRects(uint* pNumRects, RawRect* pRects);
+		void RSGetScissorRects(uint* pNumRects, Rect* pRects);
 
 		[VtblIndex(97)]
 		void HSGetShaderResources(uint StartSlot, uint NumViews, ID3D11ShaderResourceView** ppShaderResourceViews);
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs
index e0a4fb9..e6d64fe 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext1.cs
@@ -413,9 +413,9 @@ public unsafe partial struct ID3D11DeviceContext1 : ID3D11DeviceContext1.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, uint, RawRect*, void>)(lpVtbl[45]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, uint, Rect*, void>)(lpVtbl[45]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.CopySubresourceRegion" />
@@ -821,9 +821,9 @@ public unsafe partial struct ID3D11DeviceContext1 : ID3D11DeviceContext1.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSGetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(96)]
-	public void RSGetScissorRects(uint* pNumRects, RawRect* pRects)
+	public void RSGetScissorRects(uint* pNumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, uint*, RawRect*, void>)(lpVtbl[96]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pNumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, uint*, Rect*, void>)(lpVtbl[96]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pNumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.HSGetShaderResources" />
@@ -1109,17 +1109,17 @@ public unsafe partial struct ID3D11DeviceContext1 : ID3D11DeviceContext1.Interfa
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext1::ClearView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(132)]
-	public void ClearView(ID3D11View* pView, float* Color, RawRect* pRect, uint NumRects)
+	public void ClearView(ID3D11View* pView, float* Color, Rect* pRect, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, ID3D11View*, float*, RawRect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, ID3D11View*, float*, Rect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext1::DiscardView1"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(133)]
-	public void DiscardView1(ID3D11View* pResourceView, RawRect* pRects, uint NumRects)
+	public void DiscardView1(ID3D11View* pResourceView, Rect* pRects, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, ID3D11View*, RawRect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext1*, ID3D11View*, Rect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext1*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
 	}
 
 	public interface Interface : ID3D11DeviceContext.Interface
@@ -1176,10 +1176,10 @@ public unsafe partial struct ID3D11DeviceContext1 : ID3D11DeviceContext1.Interfa
 		void SwapDeviceContextState(ID3DDeviceContextState* pState, ID3DDeviceContextState** ppPreviousState);
 
 		[VtblIndex(132)]
-		void ClearView(ID3D11View* pView, float* Color, RawRect* pRect, uint NumRects);
+		void ClearView(ID3D11View* pView, float* Color, Rect* pRect, uint NumRects);
 
 		[VtblIndex(133)]
-		void DiscardView1(ID3D11View* pResourceView, RawRect* pRects, uint NumRects);
+		void DiscardView1(ID3D11View* pResourceView, Rect* pRects, uint NumRects);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs
index 5ef94de..b794857 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext2.cs
@@ -413,9 +413,9 @@ public unsafe partial struct ID3D11DeviceContext2 : ID3D11DeviceContext2.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, uint, RawRect*, void>)(lpVtbl[45]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, uint, Rect*, void>)(lpVtbl[45]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.CopySubresourceRegion" />
@@ -821,9 +821,9 @@ public unsafe partial struct ID3D11DeviceContext2 : ID3D11DeviceContext2.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSGetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(96)]
-	public void RSGetScissorRects(uint* pNumRects, RawRect* pRects)
+	public void RSGetScissorRects(uint* pNumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, uint*, RawRect*, void>)(lpVtbl[96]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pNumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, uint*, Rect*, void>)(lpVtbl[96]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pNumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.HSGetShaderResources" />
@@ -1109,17 +1109,17 @@ public unsafe partial struct ID3D11DeviceContext2 : ID3D11DeviceContext2.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext1.ClearView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(132)]
-	public void ClearView(ID3D11View* pView, float* Color, RawRect* pRect, uint NumRects)
+	public void ClearView(ID3D11View* pView, float* Color, Rect* pRect, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, ID3D11View*, float*, RawRect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, ID3D11View*, float*, Rect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext1.DiscardView1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(133)]
-	public void DiscardView1(ID3D11View* pResourceView, RawRect* pRects, uint NumRects)
+	public void DiscardView1(ID3D11View* pResourceView, Rect* pRects, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, ID3D11View*, RawRect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext2*, ID3D11View*, Rect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext2*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11DeviceContext2::UpdateTileMappings"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs
index 5a0de28..95081d2 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext3.cs
@@ -413,9 +413,9 @@ public unsafe partial struct ID3D11DeviceContext3 : ID3D11DeviceContext3.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, uint, RawRect*, void>)(lpVtbl[45]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, uint, Rect*, void>)(lpVtbl[45]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.CopySubresourceRegion" />
@@ -821,9 +821,9 @@ public unsafe partial struct ID3D11DeviceContext3 : ID3D11DeviceContext3.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSGetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(96)]
-	public void RSGetScissorRects(uint* pNumRects, RawRect* pRects)
+	public void RSGetScissorRects(uint* pNumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, uint*, RawRect*, void>)(lpVtbl[96]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pNumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, uint*, Rect*, void>)(lpVtbl[96]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pNumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.HSGetShaderResources" />
@@ -1109,17 +1109,17 @@ public unsafe partial struct ID3D11DeviceContext3 : ID3D11DeviceContext3.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext1.ClearView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(132)]
-	public void ClearView(ID3D11View* pView, float* Color, RawRect* pRect, uint NumRects)
+	public void ClearView(ID3D11View* pView, float* Color, Rect* pRect, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ID3D11View*, float*, RawRect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ID3D11View*, float*, Rect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext1.DiscardView1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(133)]
-	public void DiscardView1(ID3D11View* pResourceView, RawRect* pRects, uint NumRects)
+	public void DiscardView1(ID3D11View* pResourceView, Rect* pRects, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ID3D11View*, RawRect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext3*, ID3D11View*, Rect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext3*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext2.UpdateTileMappings" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs
index 9e7cd8b..5364f59 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11DeviceContext4.cs
@@ -413,9 +413,9 @@ public unsafe partial struct ID3D11DeviceContext4 : ID3D11DeviceContext4.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(45)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, uint, RawRect*, void>)(lpVtbl[45]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, uint, Rect*, void>)(lpVtbl[45]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.CopySubresourceRegion" />
@@ -821,9 +821,9 @@ public unsafe partial struct ID3D11DeviceContext4 : ID3D11DeviceContext4.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext.RSGetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(96)]
-	public void RSGetScissorRects(uint* pNumRects, RawRect* pRects)
+	public void RSGetScissorRects(uint* pNumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, uint*, RawRect*, void>)(lpVtbl[96]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pNumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, uint*, Rect*, void>)(lpVtbl[96]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pNumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext.HSGetShaderResources" />
@@ -1109,17 +1109,17 @@ public unsafe partial struct ID3D11DeviceContext4 : ID3D11DeviceContext4.Interfa
 	/// <inheritdoc cref="ID3D11DeviceContext1.ClearView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(132)]
-	public void ClearView(ID3D11View* pView, float* Color, RawRect* pRect, uint NumRects)
+	public void ClearView(ID3D11View* pView, float* Color, Rect* pRect, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ID3D11View*, float*, RawRect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ID3D11View*, float*, Rect*, uint, void>)(lpVtbl[132]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pView, Color, pRect, NumRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext1.DiscardView1" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(133)]
-	public void DiscardView1(ID3D11View* pResourceView, RawRect* pRects, uint NumRects)
+	public void DiscardView1(ID3D11View* pResourceView, Rect* pRects, uint NumRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ID3D11View*, RawRect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
+		((delegate* unmanaged[Stdcall]<ID3D11DeviceContext4*, ID3D11View*, Rect*, uint, void>)(lpVtbl[133]))((ID3D11DeviceContext4*)Unsafe.AsPointer(ref this), pResourceView, pRects, NumRects);
 	}
 
 	/// <inheritdoc cref="ID3D11DeviceContext2.UpdateTileMappings" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs
index 057da26..4b4ad32 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext.cs
@@ -157,9 +157,9 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorSetOutputTargetRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, Bool32, RawRect*, void>)(lpVtbl[13]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, Bool32, Rect*, void>)(lpVtbl[13]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorSetOutputBackgroundColor"]/*' />
@@ -213,9 +213,9 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorGetOutputTargetRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, RawRect* pRect)
+	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, Bool32*, RawRect*, void>)(lpVtbl[20]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, Bool32*, Rect*, void>)(lpVtbl[20]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorGetOutputBackgroundColor"]/*' />
@@ -293,17 +293,17 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorSetStreamSourceRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[30]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[30]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorSetStreamDestRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[31]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[31]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorSetStreamAlpha"]/*' />
@@ -397,17 +397,17 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorGetStreamSourceRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(43)]
-	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[43]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[43]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorGetStreamDestRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[44]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[44]))((ID3D11VideoContext*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <include file='../Direct3D11.xml' path='doc/member[@name="ID3D11VideoContext::VideoProcessorGetStreamAlpha"]/*' />
@@ -591,7 +591,7 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 		int DecoderExtension(ID3D11VideoDecoder* pDecoder, VideoDecoderExtension* pExtensionData);
 
 		[VtblIndex(13)]
-		void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, RawRect* pRect);
+		void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, Rect* pRect);
 
 		[VtblIndex(14)]
 		void VideoProcessorSetOutputBackgroundColor(ID3D11VideoProcessor* pVideoProcessor, Bool32 YCbCr, VideoColor* pColor);
@@ -612,7 +612,7 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 		int VideoProcessorSetOutputExtension(ID3D11VideoProcessor* pVideoProcessor, Guid* pExtensionGuid, uint DataSize, void* pData);
 
 		[VtblIndex(20)]
-		void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, RawRect* pRect);
+		void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, Rect* pRect);
 
 		[VtblIndex(21)]
 		void VideoProcessorGetOutputBackgroundColor(ID3D11VideoProcessor* pVideoProcessor, Bool32* pYCbCr, VideoColor* pColor);
@@ -642,10 +642,10 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 		void VideoProcessorSetStreamOutputRate(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, VideoProcessorOutputRate OutputRate, Bool32 RepeatFrame, Graphics.Dxgi.Common.Rational* pCustomRate);
 
 		[VtblIndex(30)]
-		void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect);
+		void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect);
 
 		[VtblIndex(31)]
-		void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect);
+		void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect);
 
 		[VtblIndex(32)]
 		void VideoProcessorSetStreamAlpha(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, float Alpha);
@@ -681,10 +681,10 @@ public unsafe partial struct ID3D11VideoContext : ID3D11VideoContext.Interface,
 		void VideoProcessorGetStreamOutputRate(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, VideoProcessorOutputRate* pOutputRate, Bool32* pRepeatFrame, Graphics.Dxgi.Common.Rational* pCustomRate);
 
 		[VtblIndex(43)]
-		void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect);
+		void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect);
 
 		[VtblIndex(44)]
-		void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect);
+		void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect);
 
 		[VtblIndex(45)]
 		void VideoProcessorGetStreamAlpha(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, float* pAlpha);
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs
index 852430d..554626f 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext1.cs
@@ -157,9 +157,9 @@ public unsafe partial struct ID3D11VideoContext1 : ID3D11VideoContext1.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, Bool32, RawRect*, void>)(lpVtbl[13]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, Bool32, Rect*, void>)(lpVtbl[13]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputBackgroundColor" />
@@ -213,9 +213,9 @@ public unsafe partial struct ID3D11VideoContext1 : ID3D11VideoContext1.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, RawRect* pRect)
+	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, Bool32*, RawRect*, void>)(lpVtbl[20]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, Bool32*, Rect*, void>)(lpVtbl[20]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputBackgroundColor" />
@@ -293,17 +293,17 @@ public unsafe partial struct ID3D11VideoContext1 : ID3D11VideoContext1.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[30]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[30]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[31]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[31]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamAlpha" />
@@ -397,17 +397,17 @@ public unsafe partial struct ID3D11VideoContext1 : ID3D11VideoContext1.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(43)]
-	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[43]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[43]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[44]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext1*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[44]))((ID3D11VideoContext1*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamAlpha" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs
index 1d0df0b..218ad63 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext2.cs
@@ -157,9 +157,9 @@ public unsafe partial struct ID3D11VideoContext2 : ID3D11VideoContext2.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, Bool32, RawRect*, void>)(lpVtbl[13]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, Bool32, Rect*, void>)(lpVtbl[13]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputBackgroundColor" />
@@ -213,9 +213,9 @@ public unsafe partial struct ID3D11VideoContext2 : ID3D11VideoContext2.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, RawRect* pRect)
+	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, Bool32*, RawRect*, void>)(lpVtbl[20]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, Bool32*, Rect*, void>)(lpVtbl[20]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputBackgroundColor" />
@@ -293,17 +293,17 @@ public unsafe partial struct ID3D11VideoContext2 : ID3D11VideoContext2.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[30]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[30]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[31]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[31]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamAlpha" />
@@ -397,17 +397,17 @@ public unsafe partial struct ID3D11VideoContext2 : ID3D11VideoContext2.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(43)]
-	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[43]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[43]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[44]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext2*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[44]))((ID3D11VideoContext2*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamAlpha" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs
index 92f551a..5f027c7 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/Generated/ID3D11VideoContext3.cs
@@ -157,9 +157,9 @@ public unsafe partial struct ID3D11VideoContext3 : ID3D11VideoContext3.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(13)]
-	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, Bool32, RawRect*, void>)(lpVtbl[13]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, Bool32, Rect*, void>)(lpVtbl[13]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetOutputBackgroundColor" />
@@ -213,9 +213,9 @@ public unsafe partial struct ID3D11VideoContext3 : ID3D11VideoContext3.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputTargetRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(20)]
-	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, RawRect* pRect)
+	public void VideoProcessorGetOutputTargetRect(ID3D11VideoProcessor* pVideoProcessor, Bool32* Enabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, Bool32*, RawRect*, void>)(lpVtbl[20]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, Bool32*, Rect*, void>)(lpVtbl[20]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, Enabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetOutputBackgroundColor" />
@@ -293,17 +293,17 @@ public unsafe partial struct ID3D11VideoContext3 : ID3D11VideoContext3.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(30)]
-	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[30]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[30]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(31)]
-	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, RawRect* pRect)
+	public void VideoProcessorSetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32 Enable, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32, RawRect*, void>)(lpVtbl[31]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32, Rect*, void>)(lpVtbl[31]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, Enable, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorSetStreamAlpha" />
@@ -397,17 +397,17 @@ public unsafe partial struct ID3D11VideoContext3 : ID3D11VideoContext3.Interface
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamSourceRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(43)]
-	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamSourceRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[43]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[43]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamDestRect" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(44)]
-	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, RawRect* pRect)
+	public void VideoProcessorGetStreamDestRect(ID3D11VideoProcessor* pVideoProcessor, uint StreamIndex, Bool32* pEnabled, Rect* pRect)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32*, RawRect*, void>)(lpVtbl[44]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
+		((delegate* unmanaged[Stdcall]<ID3D11VideoContext3*, ID3D11VideoProcessor*, uint, Bool32*, Rect*, void>)(lpVtbl[44]))((ID3D11VideoContext3*)Unsafe.AsPointer(ref this), pVideoProcessor, StreamIndex, pEnabled, pRect);
 	}
 
 	/// <inheritdoc cref="ID3D11VideoContext.VideoProcessorGetStreamAlpha" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs
index c4e00e5..fc0c18c 100644
--- a/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D11/ID3D11DeviceContext.cs
@@ -6,50 +6,66 @@ using static Win32.Graphics.Direct3D11.Apis;
 
 namespace Win32.Graphics.Direct3D11;
 
-public unsafe partial struct ID3D11DeviceContext
+public static unsafe class ID3D11DeviceContextExtensions
 {
-    public void RSSetViewport(float x, float y, float width, float height, float minDepth = 0.0f, float maxDepth = 1.0f)
+    public static void RSSetViewport<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        float x, float y, float width, float height, float minDepth = 0.0f, float maxDepth = 1.0f)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
         var viewport = new Viewport(x, y, width, height, minDepth, maxDepth);
-        RSSetViewports(1, &viewport);
+        self.RSSetViewports(1, &viewport);
     }
 
-    public void RSSetViewport(Viewport viewport)
+    public static void RSSetViewport<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        Viewport viewport)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
-        RSSetViewports(1, &viewport);
+        self.RSSetViewports(1, &viewport);
     }
 
-    public void RSSetScissorRect(int x, int y, int width, int height)
+    public static void RSSetScissorRect<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        int x, int y, int width, int height)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
-        RawRect rawRect = new(x, y, x + width, y + height);
-        RSSetScissorRects(1, &rawRect);
+        Rect rawRect = Rect.Create(x, y, width, height);
+        self.RSSetScissorRects(1, &rawRect);
     }
 
-    public void RSSetScissorRect(RawRect rect)
+    public static void RSSetScissorRect<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        Rect rect)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
-        RSSetScissorRects(1, &rect);
+        self.RSSetScissorRects(1, &rect);
     }
 
-    public void OMSetBlendState(ID3D11BlendState* blendState, float* blendFactor)
+    public static void OMSetBlendState<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        ID3D11BlendState* blendState)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
-        OMSetBlendState(blendState, blendFactor, D3D11_DEFAULT_SAMPLE_MASK);
+        self.OMSetBlendState(blendState, null, D3D11_DEFAULT_SAMPLE_MASK);
     }
 
-    public void OMSetBlendState(ID3D11BlendState* blendState)
+    public static void OMSetBlendState<TD3D11DeviceContext>(
+        ref this TD3D11DeviceContext self,
+        ID3D11BlendState* blendState, float* blendFactor)
+        where TD3D11DeviceContext : unmanaged, ID3D11DeviceContext.Interface
     {
-        OMSetBlendState(blendState, null, D3D11_DEFAULT_SAMPLE_MASK);
+        self.OMSetBlendState(blendState, blendFactor, D3D11_DEFAULT_SAMPLE_MASK);
     }
+}
 
+public unsafe partial struct ID3D11DeviceContext
+{
     public void IASetVertexBuffer(int slot, ID3D11Buffer* buffer, uint stride, uint offset = 0)
     {
         IASetVertexBuffers((uint)slot, 1, buffer == null ? null : &buffer, &stride, &offset);
     }
 
-    public void VSSetShader(ID3D11VertexShader* shader)
-    {
-        VSSetShader(shader, null, 0);
-    }
-
     public void VSSetShaderResource(uint slot, ID3D11ShaderResourceView* view)
     {
         VSSetShaderResources(slot, 1, view != null ? &view : null);
@@ -65,11 +81,6 @@ public unsafe partial struct ID3D11DeviceContext
         VSSetConstantBuffers(slot, 1, constantBuffer != null ? &constantBuffer : null);
     }
 
-    public void PSSetShader(ID3D11PixelShader* shader)
-    {
-        PSSetShader(shader, null, 0);
-    }
-
     public void PSSetShaderResource(uint slot, ID3D11ShaderResourceView* view)
     {
         PSSetShaderResources(slot, 1, view != null ? &view : null);
@@ -85,11 +96,6 @@ public unsafe partial struct ID3D11DeviceContext
         PSSetConstantBuffers(slot, 1, constantBuffer != null ? &constantBuffer : null);
     }
 
-    public void CSSetShader(ID3D11ComputeShader* shader)
-    {
-        CSSetShader(shader, null, 0);
-    }
-
     public void CSSetShaderResource(uint slot, ID3D11ShaderResourceView* view)
     {
         CSSetShaderResources(slot, 1, view != null ? &view : null);
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Agility/ID3D12GraphicsCommandList7.cs b/src/Vortice.Win32.Graphics.Direct3D12/Agility/ID3D12GraphicsCommandList7.cs
index f332984..9dc5e3a 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Agility/ID3D12GraphicsCommandList7.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Agility/ID3D12GraphicsCommandList7.cs
@@ -223,9 +223,9 @@ public unsafe partial struct ID3D12GraphicsCommandList7 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -423,33 +423,33 @@ public unsafe partial struct ID3D12GraphicsCommandList7 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -559,9 +559,9 @@ public unsafe partial struct ID3D12GraphicsCommandList7 : INativeGuid
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList7*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList7*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs
index d946209..e575dc2 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/Graphics.Direct3D12.Structs.cs
@@ -2833,7 +2833,7 @@ public partial struct DiscardRegion
 	public uint NumRects;
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_DISCARD_REGION::pRects"]/*' />
-	public unsafe RawRect* pRects;
+	public unsafe Rect* pRects;
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_DISCARD_REGION::FirstSubresource"]/*' />
 	public uint FirstSubresource;
@@ -4172,7 +4172,7 @@ public partial struct RenderPassEndingAccessResolveSubresourceParameters
 	public uint DstY;
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS::SrcRect"]/*' />
-	public RawRect SrcRect;
+	public Rect SrcRect;
 }
 
 /// <include file='../Direct3D12.xml' path='doc/member[@name="D3D12_RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS"]/*' />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
index 5df1640..bcddcb1 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList : ID3D12GraphicsCommandLi
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::RSSetScissorRects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::OMSetBlendFactor"]/*' />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList : ID3D12GraphicsCommandLi
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearDepthStencilView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearRenderTargetView"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearUnorderedAccessViewUint"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::ClearUnorderedAccessViewFloat"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList::DiscardResource"]/*' />
@@ -572,7 +572,7 @@ public unsafe partial struct ID3D12GraphicsCommandList : ID3D12GraphicsCommandLi
 		void RSSetViewports(uint NumViewports, Viewport* pViewports);
 
 		[VtblIndex(22)]
-		void RSSetScissorRects(uint NumRects, RawRect* pRects);
+		void RSSetScissorRects(uint NumRects, Rect* pRects);
 
 		[VtblIndex(23)]
 		void OMSetBlendFactor(float* BlendFactor);
@@ -647,16 +647,16 @@ public unsafe partial struct ID3D12GraphicsCommandList : ID3D12GraphicsCommandLi
 		void OMSetRenderTargets(uint NumRenderTargetDescriptors, CpuDescriptorHandle* pRenderTargetDescriptors, Bool32 RTsSingleHandleToDescriptorRange, CpuDescriptorHandle* pDepthStencilDescriptor);
 
 		[VtblIndex(47)]
-		void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects);
+		void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects);
 
 		[VtblIndex(48)]
-		void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects);
+		void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects);
 
 		[VtblIndex(49)]
-		void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects);
+		void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects);
 
 		[VtblIndex(50)]
-		void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects);
+		void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects);
 
 		[VtblIndex(51)]
 		void DiscardResource(ID3D12Resource* pResource, DiscardRegion* pRegion);
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
index 030c960..636da91 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList1.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandL
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList1::ResolveSubresourceRegion"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList1*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList1*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <include file='../Direct3D12.xml' path='doc/member[@name="ID3D12GraphicsCommandList1::SetViewInstanceMask"]/*' />
@@ -593,7 +593,7 @@ public unsafe partial struct ID3D12GraphicsCommandList1 : ID3D12GraphicsCommandL
 		void SetSamplePositions(uint NumSamplesPerPixel, uint NumPixels, SamplePosition* pSamplePositions);
 
 		[VtblIndex(64)]
-		void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode);
+		void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode);
 
 		[VtblIndex(65)]
 		void SetViewInstanceMask(uint Mask);
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
index a945147..1a7a4ba 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList2.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList2 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList2*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList2*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
index b816d1b..c1d40d8 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList3.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList3 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList3*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList3*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
index 0be00ae..76f6883 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList4.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList4 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList4*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList4*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
index b4c9b51..f527ddd 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList5.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList5 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList5*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList5*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
index 63bed21..d82520b 100644
--- a/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D12/Generated/ID3D12GraphicsCommandList6.cs
@@ -229,9 +229,9 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.RSSetScissorRects" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(22)]
-	public void RSSetScissorRects(uint NumRects, RawRect* pRects)
+	public void RSSetScissorRects(uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, RawRect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, uint, Rect*, void>)(lpVtbl[22]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.OMSetBlendFactor" />
@@ -429,33 +429,33 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearDepthStencilView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(47)]
-	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, RawRect* pRects)
+	public void ClearDepthStencilView(CpuDescriptorHandle DepthStencilView, ClearFlags ClearFlags, float Depth, byte Stencil, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, ClearFlags, float, byte, uint, RawRect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, ClearFlags, float, byte, uint, Rect*, void>)(lpVtbl[47]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), DepthStencilView, ClearFlags, Depth, Stencil, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearRenderTargetView" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(48)]
-	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, RawRect* pRects)
+	public void ClearRenderTargetView(CpuDescriptorHandle RenderTargetView, float* ColorRGBA, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, float*, uint, RawRect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, CpuDescriptorHandle, float*, uint, Rect*, void>)(lpVtbl[48]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), RenderTargetView, ColorRGBA, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewUint" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(49)]
-	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewUint(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, uint* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, RawRect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, uint*, uint, Rect*, void>)(lpVtbl[49]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.ClearUnorderedAccessViewFloat" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(50)]
-	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, RawRect* pRects)
+	public void ClearUnorderedAccessViewFloat(GpuDescriptorHandle ViewGPUHandleInCurrentHeap, CpuDescriptorHandle ViewCPUHandle, ID3D12Resource* pResource, float* Values, uint NumRects, Rect* pRects)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, RawRect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, GpuDescriptorHandle, CpuDescriptorHandle, ID3D12Resource*, float*, uint, Rect*, void>)(lpVtbl[50]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), ViewGPUHandleInCurrentHeap, ViewCPUHandle, pResource, Values, NumRects, pRects);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList.DiscardResource" />
@@ -565,9 +565,9 @@ public unsafe partial struct ID3D12GraphicsCommandList6 : ID3D12GraphicsCommandL
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.ResolveSubresourceRegion" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(64)]
-	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, RawRect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
+	public void ResolveSubresourceRegion(ID3D12Resource* pDstResource, uint DstSubresource, uint DstX, uint DstY, ID3D12Resource* pSrcResource, uint SrcSubresource, Rect* pSrcRect, Graphics.Dxgi.Common.Format Format, ResolveMode ResolveMode)
 	{
-		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, RawRect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
+		((delegate* unmanaged[Stdcall]<ID3D12GraphicsCommandList6*, ID3D12Resource*, uint, uint, uint, ID3D12Resource*, uint, Rect*, Graphics.Dxgi.Common.Format, ResolveMode, void>)(lpVtbl[64]))((ID3D12GraphicsCommandList6*)Unsafe.AsPointer(ref this), pDstResource, DstSubresource, DstX, DstY, pSrcResource, SrcSubresource, pSrcRect, Format, ResolveMode);
 	}
 
 	/// <inheritdoc cref="ID3D12GraphicsCommandList1.SetViewInstanceMask" />
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionSurface.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionSurface.cs
index 5d732e6..e3f1db8 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionSurface.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionSurface.cs
@@ -77,9 +77,9 @@ public unsafe partial struct IDCompositionSurface : IDCompositionSurface.Interfa
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionSurface::BeginDraw"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult BeginDraw(RawRect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset)
+	public HResult BeginDraw(Rect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionSurface*, RawRect*, Guid*, void**, System.Drawing.Point*, int>)(lpVtbl[3]))((IDCompositionSurface*)Unsafe.AsPointer(ref this), updateRect, iid, updateObject, updateOffset);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionSurface*, Rect*, Guid*, void**, System.Drawing.Point*, int>)(lpVtbl[3]))((IDCompositionSurface*)Unsafe.AsPointer(ref this), updateRect, iid, updateObject, updateOffset);
 	}
 
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionSurface::EndDraw"]/*' />
@@ -109,15 +109,15 @@ public unsafe partial struct IDCompositionSurface : IDCompositionSurface.Interfa
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionSurface::Scroll"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult Scroll(RawRect* scrollRect, RawRect* clipRect, int offsetX, int offsetY)
+	public HResult Scroll(Rect* scrollRect, Rect* clipRect, int offsetX, int offsetY)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionSurface*, RawRect*, RawRect*, int, int, int>)(lpVtbl[7]))((IDCompositionSurface*)Unsafe.AsPointer(ref this), scrollRect, clipRect, offsetX, offsetY);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionSurface*, Rect*, Rect*, int, int, int>)(lpVtbl[7]))((IDCompositionSurface*)Unsafe.AsPointer(ref this), scrollRect, clipRect, offsetX, offsetY);
 	}
 
 	public interface Interface : IUnknown.Interface
 	{
 		[VtblIndex(3)]
-		HResult BeginDraw(RawRect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset);
+		HResult BeginDraw(Rect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset);
 
 		[VtblIndex(4)]
 		HResult EndDraw();
@@ -129,7 +129,7 @@ public unsafe partial struct IDCompositionSurface : IDCompositionSurface.Interfa
 		HResult ResumeDraw();
 
 		[VtblIndex(7)]
-		HResult Scroll(RawRect* scrollRect, RawRect* clipRect, int offsetX, int offsetY);
+		HResult Scroll(Rect* scrollRect, Rect* clipRect, int offsetX, int offsetY);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVirtualSurface.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVirtualSurface.cs
index d673b9d..c582ad0 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVirtualSurface.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVirtualSurface.cs
@@ -77,9 +77,9 @@ public unsafe partial struct IDCompositionVirtualSurface : IDCompositionVirtualS
 	/// <inheritdoc cref="IDCompositionSurface.BeginDraw" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult BeginDraw(RawRect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset)
+	public HResult BeginDraw(Rect* updateRect, Guid* iid, void** updateObject, System.Drawing.Point* updateOffset)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, RawRect*, Guid*, void**, System.Drawing.Point*, int>)(lpVtbl[3]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), updateRect, iid, updateObject, updateOffset);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, Rect*, Guid*, void**, System.Drawing.Point*, int>)(lpVtbl[3]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), updateRect, iid, updateObject, updateOffset);
 	}
 
 	/// <inheritdoc cref="IDCompositionSurface.EndDraw" />
@@ -109,9 +109,9 @@ public unsafe partial struct IDCompositionVirtualSurface : IDCompositionVirtualS
 	/// <inheritdoc cref="IDCompositionSurface.Scroll" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult Scroll(RawRect* scrollRect, RawRect* clipRect, int offsetX, int offsetY)
+	public HResult Scroll(Rect* scrollRect, Rect* clipRect, int offsetX, int offsetY)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, RawRect*, RawRect*, int, int, int>)(lpVtbl[7]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), scrollRect, clipRect, offsetX, offsetY);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, Rect*, Rect*, int, int, int>)(lpVtbl[7]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), scrollRect, clipRect, offsetX, offsetY);
 	}
 
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionVirtualSurface::Resize"]/*' />
@@ -125,9 +125,9 @@ public unsafe partial struct IDCompositionVirtualSurface : IDCompositionVirtualS
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionVirtualSurface::Trim"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult Trim(RawRect* rectangles, uint count)
+	public HResult Trim(Rect* rectangles, uint count)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, RawRect*, uint, int>)(lpVtbl[9]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), rectangles, count);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVirtualSurface*, Rect*, uint, int>)(lpVtbl[9]))((IDCompositionVirtualSurface*)Unsafe.AsPointer(ref this), rectangles, count);
 	}
 
 	public interface Interface : IDCompositionSurface.Interface
@@ -136,7 +136,7 @@ public unsafe partial struct IDCompositionVirtualSurface : IDCompositionVirtualS
 		HResult Resize(uint width, uint height);
 
 		[VtblIndex(9)]
-		HResult Trim(RawRect* rectangles, uint count);
+		HResult Trim(Rect* rectangles, uint count);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual.cs
index 49fda85..228ea81 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual.cs
@@ -165,9 +165,9 @@ public unsafe partial struct IDCompositionVisual : IDCompositionVisual.Interface
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionVisual::SetClip"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult SetClip(Graphics.Direct2D.Common.RectF* rect)
+	public HResult SetClip(Win32.Numerics.RectF* rect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual*, Graphics.Direct2D.Common.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual*)Unsafe.AsPointer(ref this), rect);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual*, Win32.Numerics.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual*)Unsafe.AsPointer(ref this), rect);
 	}
 
 	/// <include file='../DirectComposition.xml' path='doc/member[@name="IDCompositionVisual::SetContent"]/*' />
@@ -246,7 +246,7 @@ public unsafe partial struct IDCompositionVisual : IDCompositionVisual.Interface
 		HResult SetClip(IDCompositionClip* clip);
 
 		[VtblIndex(14)]
-		HResult SetClip(Graphics.Direct2D.Common.RectF* rect);
+		HResult SetClip(Win32.Numerics.RectF* rect);
 
 		[VtblIndex(15)]
 		HResult SetContent(IUnknown* content);
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual2.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual2.cs
index 00ac4f9..9e9ed3c 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual2.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual2.cs
@@ -165,9 +165,9 @@ public unsafe partial struct IDCompositionVisual2 : IDCompositionVisual2.Interfa
 	/// <inheritdoc cref="IDCompositionVisual.SetClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult SetClip(Graphics.Direct2D.Common.RectF* rect)
+	public HResult SetClip(Win32.Numerics.RectF* rect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual2*, Graphics.Direct2D.Common.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual2*)Unsafe.AsPointer(ref this), rect);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual2*, Win32.Numerics.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual2*)Unsafe.AsPointer(ref this), rect);
 	}
 
 	/// <inheritdoc cref="IDCompositionVisual.SetContent" />
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual3.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual3.cs
index 521f3ab..a3493bd 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual3.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisual3.cs
@@ -165,9 +165,9 @@ public unsafe partial struct IDCompositionVisual3 : IDCompositionVisual3.Interfa
 	/// <inheritdoc cref="IDCompositionVisual.SetClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult SetClip(Graphics.Direct2D.Common.RectF* rect)
+	public HResult SetClip(Win32.Numerics.RectF* rect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual3*, Graphics.Direct2D.Common.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual3*)Unsafe.AsPointer(ref this), rect);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVisual3*, Win32.Numerics.RectF*, int>)(lpVtbl[14]))((IDCompositionVisual3*)Unsafe.AsPointer(ref this), rect);
 	}
 
 	/// <inheritdoc cref="IDCompositionVisual.SetContent" />
diff --git a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisualDebug.cs b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisualDebug.cs
index b186e11..d189173 100644
--- a/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisualDebug.cs
+++ b/src/Vortice.Win32.Graphics.DirectComposition/Generated/IDCompositionVisualDebug.cs
@@ -165,9 +165,9 @@ public unsafe partial struct IDCompositionVisualDebug : IDCompositionVisualDebug
 	/// <inheritdoc cref="IDCompositionVisual.SetClip" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(14)]
-	public HResult SetClip(Graphics.Direct2D.Common.RectF* rect)
+	public HResult SetClip(Win32.Numerics.RectF* rect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDCompositionVisualDebug*, Graphics.Direct2D.Common.RectF*, int>)(lpVtbl[14]))((IDCompositionVisualDebug*)Unsafe.AsPointer(ref this), rect);
+		return ((delegate* unmanaged[Stdcall]<IDCompositionVisualDebug*, Win32.Numerics.RectF*, int>)(lpVtbl[14]))((IDCompositionVisualDebug*)Unsafe.AsPointer(ref this), rect);
 	}
 
 	/// <inheritdoc cref="IDCompositionVisual.SetContent" />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
index 26a1fd9..0e11bb1 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget.cs
@@ -77,9 +77,9 @@ public unsafe partial struct IDWriteBitmapRenderTarget : IDWriteBitmapRenderTarg
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteBitmapRenderTarget::DrawGlyphRun"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, RawRect* blackBoxRect)
+	public HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, Rect* blackBoxRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, float, float, MeasuringMode, GlyphRun*, IDWriteRenderingParams*, uint, RawRect*, int>)(lpVtbl[3]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, measuringMode, glyphRun, renderingParams, textColor, blackBoxRect);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget*, float, float, MeasuringMode, GlyphRun*, IDWriteRenderingParams*, uint, Rect*, int>)(lpVtbl[3]))((IDWriteBitmapRenderTarget*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, measuringMode, glyphRun, renderingParams, textColor, blackBoxRect);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteBitmapRenderTarget::GetMemoryDC"]/*' />
@@ -141,7 +141,7 @@ public unsafe partial struct IDWriteBitmapRenderTarget : IDWriteBitmapRenderTarg
 	public interface Interface : IUnknown.Interface
 	{
 		[VtblIndex(3)]
-		HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, RawRect* blackBoxRect);
+		HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, Rect* blackBoxRect);
 
 		[VtblIndex(4)]
 		IntPtr GetMemoryDC();
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
index 6d2793b..f1db8c9 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteBitmapRenderTarget1.cs
@@ -77,9 +77,9 @@ public unsafe partial struct IDWriteBitmapRenderTarget1 : IDWriteBitmapRenderTar
 	/// <inheritdoc cref="IDWriteBitmapRenderTarget.DrawGlyphRun" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, RawRect* blackBoxRect)
+	public HResult DrawGlyphRun(float baselineOriginX, float baselineOriginY, MeasuringMode measuringMode, GlyphRun* glyphRun, IDWriteRenderingParams* renderingParams, uint textColor, Rect* blackBoxRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, float, float, MeasuringMode, GlyphRun*, IDWriteRenderingParams*, uint, RawRect*, int>)(lpVtbl[3]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, measuringMode, glyphRun, renderingParams, textColor, blackBoxRect);
+		return ((delegate* unmanaged[Stdcall]<IDWriteBitmapRenderTarget1*, float, float, MeasuringMode, GlyphRun*, IDWriteRenderingParams*, uint, Rect*, int>)(lpVtbl[3]))((IDWriteBitmapRenderTarget1*)Unsafe.AsPointer(ref this), baselineOriginX, baselineOriginY, measuringMode, glyphRun, renderingParams, textColor, blackBoxRect);
 	}
 
 	/// <inheritdoc cref="IDWriteBitmapRenderTarget.GetMemoryDC" />
diff --git a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
index caa652c..c40875f 100644
--- a/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
+++ b/src/Vortice.Win32.Graphics.DirectWrite/Generated/IDWriteGlyphRunAnalysis.cs
@@ -77,17 +77,17 @@ public unsafe partial struct IDWriteGlyphRunAnalysis : IDWriteGlyphRunAnalysis.I
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteGlyphRunAnalysis::GetAlphaTextureBounds"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(3)]
-	public HResult GetAlphaTextureBounds(TextureType textureType, RawRect* textureBounds)
+	public HResult GetAlphaTextureBounds(TextureType textureType, Rect* textureBounds)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteGlyphRunAnalysis*, TextureType, RawRect*, int>)(lpVtbl[3]))((IDWriteGlyphRunAnalysis*)Unsafe.AsPointer(ref this), textureType, textureBounds);
+		return ((delegate* unmanaged[Stdcall]<IDWriteGlyphRunAnalysis*, TextureType, Rect*, int>)(lpVtbl[3]))((IDWriteGlyphRunAnalysis*)Unsafe.AsPointer(ref this), textureType, textureBounds);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteGlyphRunAnalysis::CreateAlphaTexture"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult CreateAlphaTexture(TextureType textureType, RawRect* textureBounds, byte* alphaValues, uint bufferSize)
+	public HResult CreateAlphaTexture(TextureType textureType, Rect* textureBounds, byte* alphaValues, uint bufferSize)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDWriteGlyphRunAnalysis*, TextureType, RawRect*, byte*, uint, int>)(lpVtbl[4]))((IDWriteGlyphRunAnalysis*)Unsafe.AsPointer(ref this), textureType, textureBounds, alphaValues, bufferSize);
+		return ((delegate* unmanaged[Stdcall]<IDWriteGlyphRunAnalysis*, TextureType, Rect*, byte*, uint, int>)(lpVtbl[4]))((IDWriteGlyphRunAnalysis*)Unsafe.AsPointer(ref this), textureType, textureBounds, alphaValues, bufferSize);
 	}
 
 	/// <include file='../DirectWrite.xml' path='doc/member[@name="IDWriteGlyphRunAnalysis::GetAlphaBlendParams"]/*' />
@@ -101,10 +101,10 @@ public unsafe partial struct IDWriteGlyphRunAnalysis : IDWriteGlyphRunAnalysis.I
 	public interface Interface : IUnknown.Interface
 	{
 		[VtblIndex(3)]
-		HResult GetAlphaTextureBounds(TextureType textureType, RawRect* textureBounds);
+		HResult GetAlphaTextureBounds(TextureType textureType, Rect* textureBounds);
 
 		[VtblIndex(4)]
-		HResult CreateAlphaTexture(TextureType textureType, RawRect* textureBounds, byte* alphaValues, uint bufferSize);
+		HResult CreateAlphaTexture(TextureType textureType, Rect* textureBounds, byte* alphaValues, uint bufferSize);
 
 		[VtblIndex(5)]
 		HResult GetAlphaBlendParams(IDWriteRenderingParams* renderingParams, float* blendGamma, float* blendEnhancedContrast, float* blendClearTypeLevel);
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Structs.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Structs.cs
index 8aa12a5..eb6f370 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Structs.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/Graphics.Dxgi.Structs.cs
@@ -80,7 +80,7 @@ public partial struct OutputDescription
 	public unsafe fixed ushort DeviceName[32];
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTPUT_DESC::DesktopCoordinates"]/*' />
-	public RawRect DesktopCoordinates;
+	public Rect DesktopCoordinates;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTPUT_DESC::AttachedToDesktop"]/*' />
 	public Bool32 AttachedToDesktop;
@@ -200,7 +200,7 @@ public partial struct OutduplMoveRect
 	public System.Drawing.Point SourcePoint;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTDUPL_MOVE_RECT::DestinationRect"]/*' />
-	public RawRect DestinationRect;
+	public Rect DestinationRect;
 }
 
 /// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTDUPL_DESC"]/*' />
@@ -366,10 +366,10 @@ public partial struct PresentParameters
 	public uint DirtyRectsCount;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_PRESENT_PARAMETERS::pDirtyRects"]/*' />
-	public unsafe RawRect* pDirtyRects;
+	public unsafe Rect* pDirtyRects;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_PRESENT_PARAMETERS::pScrollRect"]/*' />
-	public unsafe RawRect* pScrollRect;
+	public unsafe Rect* pScrollRect;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_PRESENT_PARAMETERS::pScrollOffset"]/*' />
 	public unsafe System.Drawing.Point* pScrollOffset;
@@ -553,7 +553,7 @@ public partial struct OutputDescription1
 	public unsafe fixed ushort DeviceName[32];
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTPUT_DESC1::DesktopCoordinates"]/*' />
-	public RawRect DesktopCoordinates;
+	public Rect DesktopCoordinates;
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="DXGI_OUTPUT_DESC1::AttachedToDesktop"]/*' />
 	public Bool32 AttachedToDesktop;
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDecodeSwapChain.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDecodeSwapChain.cs
index 4e2a067..f0544b6 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDecodeSwapChain.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIDecodeSwapChain.cs
@@ -85,17 +85,17 @@ public unsafe partial struct IDXGIDecodeSwapChain : IDXGIDecodeSwapChain.Interfa
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::SetSourceRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(4)]
-	public HResult SetSourceRect(RawRect* pRect)
+	public HResult SetSourceRect(Rect* pRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, RawRect*, int>)(lpVtbl[4]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, Rect*, int>)(lpVtbl[4]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::SetTargetRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(5)]
-	public HResult SetTargetRect(RawRect* pRect)
+	public HResult SetTargetRect(Rect* pRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, RawRect*, int>)(lpVtbl[5]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, Rect*, int>)(lpVtbl[5]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::SetDestSize"]/*' />
@@ -109,17 +109,17 @@ public unsafe partial struct IDXGIDecodeSwapChain : IDXGIDecodeSwapChain.Interfa
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::GetSourceRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(7)]
-	public HResult GetSourceRect(RawRect* pRect)
+	public HResult GetSourceRect(Rect* pRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, RawRect*, int>)(lpVtbl[7]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, Rect*, int>)(lpVtbl[7]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::GetTargetRect"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(8)]
-	public HResult GetTargetRect(RawRect* pRect)
+	public HResult GetTargetRect(Rect* pRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, RawRect*, int>)(lpVtbl[8]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGIDecodeSwapChain*, Rect*, int>)(lpVtbl[8]))((IDXGIDecodeSwapChain*)Unsafe.AsPointer(ref this), pRect);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIDecodeSwapChain::GetDestSize"]/*' />
@@ -152,19 +152,19 @@ public unsafe partial struct IDXGIDecodeSwapChain : IDXGIDecodeSwapChain.Interfa
 		HResult PresentBuffer(uint BufferToPresent, uint SyncInterval, uint Flags);
 
 		[VtblIndex(4)]
-		HResult SetSourceRect(RawRect* pRect);
+		HResult SetSourceRect(Rect* pRect);
 
 		[VtblIndex(5)]
-		HResult SetTargetRect(RawRect* pRect);
+		HResult SetTargetRect(Rect* pRect);
 
 		[VtblIndex(6)]
 		HResult SetDestSize(uint Width, uint Height);
 
 		[VtblIndex(7)]
-		HResult GetSourceRect(RawRect* pRect);
+		HResult GetSourceRect(Rect* pRect);
 
 		[VtblIndex(8)]
-		HResult GetTargetRect(RawRect* pRect);
+		HResult GetTargetRect(Rect* pRect);
 
 		[VtblIndex(9)]
 		HResult GetDestSize(uint* pWidth, uint* pHeight);
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutputDuplication.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutputDuplication.cs
index 91c5402..771e500 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutputDuplication.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGIOutputDuplication.cs
@@ -125,9 +125,9 @@ public unsafe partial struct IDXGIOutputDuplication : IDXGIOutputDuplication.Int
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIOutputDuplication::GetFrameDirtyRects"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(9)]
-	public HResult GetFrameDirtyRects(uint DirtyRectsBufferSize, RawRect* pDirtyRectsBuffer, uint* pDirtyRectsBufferSizeRequired)
+	public HResult GetFrameDirtyRects(uint DirtyRectsBufferSize, Rect* pDirtyRectsBuffer, uint* pDirtyRectsBufferSizeRequired)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGIOutputDuplication*, uint, RawRect*, uint*, int>)(lpVtbl[9]))((IDXGIOutputDuplication*)Unsafe.AsPointer(ref this), DirtyRectsBufferSize, pDirtyRectsBuffer, pDirtyRectsBufferSizeRequired);
+		return ((delegate* unmanaged[Stdcall]<IDXGIOutputDuplication*, uint, Rect*, uint*, int>)(lpVtbl[9]))((IDXGIOutputDuplication*)Unsafe.AsPointer(ref this), DirtyRectsBufferSize, pDirtyRectsBuffer, pDirtyRectsBufferSizeRequired);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGIOutputDuplication::GetFrameMoveRects"]/*' />
@@ -179,7 +179,7 @@ public unsafe partial struct IDXGIOutputDuplication : IDXGIOutputDuplication.Int
 		HResult AcquireNextFrame(uint TimeoutInMilliseconds, OutduplFrameInfo* pFrameInfo, IDXGIResource** ppDesktopResource);
 
 		[VtblIndex(9)]
-		HResult GetFrameDirtyRects(uint DirtyRectsBufferSize, RawRect* pDirtyRectsBuffer, uint* pDirtyRectsBufferSizeRequired);
+		HResult GetFrameDirtyRects(uint DirtyRectsBufferSize, Rect* pDirtyRectsBuffer, uint* pDirtyRectsBufferSizeRequired);
 
 		[VtblIndex(10)]
 		HResult GetFrameMoveRects(uint MoveRectsBufferSize, OutduplMoveRect* pMoveRectBuffer, uint* pMoveRectsBufferSizeRequired);
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface1.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface1.cs
index 9b2ecc1..1c1938c 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface1.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface1.cs
@@ -149,9 +149,9 @@ public unsafe partial struct IDXGISurface1 : IDXGISurface1.Interface, INativeGui
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGISurface1::ReleaseDC"]/*' />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(12)]
-	public HResult ReleaseDC(RawRect* pDirtyRect)
+	public HResult ReleaseDC(Rect* pDirtyRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISurface1*, RawRect*, int>)(lpVtbl[12]))((IDXGISurface1*)Unsafe.AsPointer(ref this), pDirtyRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGISurface1*, Rect*, int>)(lpVtbl[12]))((IDXGISurface1*)Unsafe.AsPointer(ref this), pDirtyRect);
 	}
 
 	public interface Interface : IDXGISurface.Interface
@@ -160,7 +160,7 @@ public unsafe partial struct IDXGISurface1 : IDXGISurface1.Interface, INativeGui
 		HResult GetDC(Bool32 Discard, IntPtr* phdc);
 
 		[VtblIndex(12)]
-		HResult ReleaseDC(RawRect* pDirtyRect);
+		HResult ReleaseDC(Rect* pDirtyRect);
 	}
 }
 
diff --git a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface2.cs b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface2.cs
index 29b0a99..fb50417 100644
--- a/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface2.cs
+++ b/src/Vortice.Win32.Graphics.Dxgi/Generated/IDXGISurface2.cs
@@ -149,9 +149,9 @@ public unsafe partial struct IDXGISurface2 : IDXGISurface2.Interface, INativeGui
 	/// <inheritdoc cref="IDXGISurface1.ReleaseDC" />
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	[VtblIndex(12)]
-	public HResult ReleaseDC(RawRect* pDirtyRect)
+	public HResult ReleaseDC(Rect* pDirtyRect)
 	{
-		return ((delegate* unmanaged[Stdcall]<IDXGISurface2*, RawRect*, int>)(lpVtbl[12]))((IDXGISurface2*)Unsafe.AsPointer(ref this), pDirtyRect);
+		return ((delegate* unmanaged[Stdcall]<IDXGISurface2*, Rect*, int>)(lpVtbl[12]))((IDXGISurface2*)Unsafe.AsPointer(ref this), pDirtyRect);
 	}
 
 	/// <include file='../Dxgi.xml' path='doc/member[@name="IDXGISurface2::GetResource"]/*' />
diff --git a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/Graphics.Direct2D.Common.Structs.cs b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/Graphics.Direct2D.Common.Structs.cs
index 8d6d79b..f29e60f 100644
--- a/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/Graphics.Direct2D.Common.Structs.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct2D.Common/Graphics.Direct2D.Common.Structs.cs
@@ -20,40 +20,6 @@ public partial struct PixelFormat
 	public AlphaMode alphaMode;
 }
 
-/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F"]/*' />
-/// <unmanaged>D2D_RECT_F</unmanaged>
-public partial struct RectF
-{
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::left"]/*' />
-	public float left;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::top"]/*' />
-	public float top;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::right"]/*' />
-	public float right;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_F::bottom"]/*' />
-	public float bottom;
-}
-
-/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U"]/*' />
-/// <unmanaged>D2D_RECT_U</unmanaged>
-public partial struct RectU
-{
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::left"]/*' />
-	public uint left;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::top"]/*' />
-	public uint top;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::right"]/*' />
-	public uint right;
-
-	/// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D_RECT_U::bottom"]/*' />
-	public uint bottom;
-}
-
 /// <include file='../../../../Vortice.Win32.Graphics.Direct2D/Direct2D.xml' path='doc/member[@name="D2D1_BEZIER_SEGMENT"]/*' />
 /// <unmanaged>D2D1_BEZIER_SEGMENT</unmanaged>
 public partial struct BezierSegment
diff --git a/src/Vortice.Win32/Graphics/Gdi/RgnDataHeader.cs b/src/Vortice.Win32/Graphics/Gdi/RgnDataHeader.cs
index 499a407..e03a419 100644
--- a/src/Vortice.Win32/Graphics/Gdi/RgnDataHeader.cs
+++ b/src/Vortice.Win32/Graphics/Gdi/RgnDataHeader.cs
@@ -30,5 +30,5 @@ public partial struct RgnDataHeader
     /// <summary>
     /// A bounding rectangle for the region in logical units.
     /// </summary>
-    public RawRect rcBound;
+    public Rect rcBound;
 }
diff --git a/src/Vortice.Win32/Numerics/Rect.cs b/src/Vortice.Win32/Numerics/Rect.cs
new file mode 100644
index 0000000..819b518
--- /dev/null
+++ b/src/Vortice.Win32/Numerics/Rect.cs
@@ -0,0 +1,221 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System.Drawing;
+
+namespace Win32.Numerics;
+
+/// <summary>
+/// Defines an integer rectangle (Left, Top, Right, Bottom)
+/// </summary>
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+[DebuggerDisplay("Left: {Left}, Top: {Top}, Right: {Right}, Bottom: {Bottom}")]
+public struct Rect : IEquatable<Rect>
+{
+    public static Rect Empty => new();
+
+    public Rect(int left, int top, int right, int bottom)
+    {
+        Left = left;
+        Top = top;
+        Right = right;
+        Bottom = bottom;
+    }
+
+    /// <summary>
+    /// The left position.
+    /// </summary>
+    public int Left;
+
+    /// <summary>
+    /// The top position.
+    /// </summary>
+    public int Top;
+
+    /// <summary>
+    /// The right position
+    /// </summary>
+    public int Right;
+
+    /// <summary>
+    /// The bottom position.
+    /// </summary>
+    public int Bottom;
+
+    public readonly int Width => Right - Left;
+
+    public readonly int Height => Bottom - Top;
+
+    public Point Location
+    {
+        readonly get => new Point(Left, Top);
+        set => this = Rect.Create(value, Size);
+    }
+
+    public Size Size
+    {
+        readonly get => new(Width, Height);
+        set
+        {
+            Right = Left + value.Width;
+            Bottom = Top + value.Height;
+        }
+    }
+
+    public readonly int CenterX => Left + (Width / 2);
+
+    public readonly int CenterY => Top + (Height / 2);
+
+    public void Offset(int x, int y)
+    {
+        Left += x;
+        Top += y;
+        Right += x;
+        Bottom += y;
+    }
+
+    public void Offset(Point pos) => Offset(pos.X, pos.Y);
+
+    public static Rect Create(Point location, Size size) => Create(location.X, location.Y, size.Width, size.Height);
+
+    public static Rect Create(Size size) => Create(Point.Empty, size);
+
+    public static Rect Create(int width, int height) => new(0, 0, width, height);
+
+    public static Rect Create(int x, int y, int width, int height) => new(x, y, x + width, y + height);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => obj is Rect value && Equals(value);
+
+    public static Rect Inflate(Rect rect, int x, int y)
+    {
+        Rect r = new(rect.Left, rect.Top, rect.Right, rect.Bottom);
+        r.Inflate(x, y);
+        return r;
+    }
+
+    public void Inflate(Size size) => Inflate(size.Width, size.Height);
+
+    public void Inflate(int x, int y)
+    {
+        Left -= x;
+        Top -= y;
+        Right += x;
+        Bottom += y;
+    }
+
+    public readonly bool Contains(int x, int y)
+    {
+        return (x >= Left) && (x < Right) && (y >= Top) && (y < Bottom);
+    }
+
+    public readonly bool Contains(Point pt) => Contains(pt.X, pt.Y);
+
+    public readonly bool Contains(Rect rect) =>
+        (Left <= rect.Left) && (Right >= rect.Right) &&
+        (Top <= rect.Top) && (Bottom >= rect.Bottom);
+
+    public readonly bool IntersectsWith(Rect rect)
+    {
+        return (Left < rect.Right) && (Right > rect.Left) && (Top < rect.Bottom) && (Bottom > rect.Top);
+    }
+
+    public readonly bool IntersectsWithInclusive(Rect rect)
+    {
+        return (Left <= rect.Right) && (Right >= rect.Left) && (Top <= rect.Bottom) && (Bottom >= rect.Top);
+    }
+
+    public static Rect Intersect(Rect left, Rect right)
+    {
+        if (!left.IntersectsWithInclusive(right))
+        {
+            return Empty;
+        }
+
+        return new Rect(
+            Math.Max(left.Left, right.Left),
+            Math.Max(left.Top, right.Top),
+            Math.Min(left.Right, right.Right),
+            Math.Min(left.Bottom, right.Bottom)
+            );
+    }
+
+    public void Intersect(Rect rect)
+    {
+        this = Intersect(this, rect);
+    }
+
+    public static Rect Union(Rect left, Rect right)
+    {
+        return new(
+            Math.Min(left.Left, right.Left),
+            Math.Min(left.Top, right.Top),
+            Math.Max(left.Right, right.Right),
+            Math.Max(left.Bottom, right.Bottom)
+            );
+    }
+
+    public void Union(Rect rect)
+    {
+        this = Union(this, rect);
+    }
+
+    /// <summary>
+    /// Determines whether the specified <see cref="Rect"/> is equal to this instance.
+    /// </summary>
+    /// <param name="other">The <see cref="Rect"/> to compare with this instance.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool Equals(Rect other)
+    {
+        return
+            Left == other.Left
+            && Top == other.Top
+            && Right == other.Right
+            && Bottom == other.Bottom;
+    }
+
+    /// <inheritdoc />
+    public override int GetHashCode() => HashCode.Combine(Left, Top, Right, Bottom);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{nameof(Left)}: {Left}, {nameof(Top)}: {Top}, {nameof(Right)}: {Right}, {nameof(Bottom)}: {Bottom}";
+    }
+
+    /// <summary>
+    /// Compares two <see cref="Rect"/> objects for equality.
+    /// </summary>
+    /// <param name="left">The <see cref="Rect"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="Rect"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator ==(Rect left, Rect right) => left.Equals(right);
+
+    /// <summary>
+    /// Compares two <see cref="Rect"/> objects for inequality.
+    /// </summary>
+    /// <param name="left">The <see cref="Rect"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="Rect"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator !=(Rect left, Rect right) => !left.Equals(right);
+
+    /// <summary>
+    /// Performs an implicit conversion from <see cref="Rect"/> to <see cref="Rectangle" />.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <returns>The result of the conversion.</returns>
+    public static implicit operator Rectangle(Rect value) => Rectangle.FromLTRB(value.Left, value.Top, value.Right, value.Bottom);
+
+    /// <summary>
+    /// Performs an implicit conversion from <see cre ="Rectangle"/> to <see cref="Rect" />.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <returns>The result of the conversion.</returns>
+    public static implicit operator Rect(Rectangle value) => new(value.Left, value.Top, value.Right, value.Bottom);
+}
diff --git a/src/Vortice.Win32/Numerics/RectF.cs b/src/Vortice.Win32/Numerics/RectF.cs
new file mode 100644
index 0000000..dd4338d
--- /dev/null
+++ b/src/Vortice.Win32/Numerics/RectF.cs
@@ -0,0 +1,224 @@
+// Copyright © Amer Koleci and Contributors.
+// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
+
+using System.Drawing;
+
+namespace Win32.Numerics;
+
+/// <summary>
+/// Defines a floating-point rectangle (Left, Top, Right, Bottom)
+/// </summary>
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+[DebuggerDisplay("Left: {Left}, Top: {Top}, Right: {Right}, Bottom: {Bottom}")]
+public struct RectF : IEquatable<RectF>
+{
+    public static RectF Empty => new ();
+
+    public RectF(float left, float top, float right, float bottom)
+    {
+        Left = left;
+        Top = top;
+        Right = right;
+        Bottom = bottom;
+    }
+
+    /// <summary>
+    /// The left position.
+    /// </summary>
+    public float Left;
+
+    /// <summary>
+    /// The top position.
+    /// </summary>
+    public float Top;
+
+    /// <summary>
+    /// The right position
+    /// </summary>
+    public float Right;
+
+    /// <summary>
+    /// The bottom position.
+    /// </summary>
+    public float Bottom;
+
+    public readonly float Width => Right - Left;
+
+    public readonly float Height => Bottom - Top;
+
+    public PointF Location
+    {
+        readonly get => new PointF(Left, Top);
+        set => this = RectF.Create(value, Size);
+    }
+
+    public SizeF Size
+    {
+        readonly get => new(Width, Height);
+        set
+        {
+            Right = Left + value.Width;
+            Bottom = Top + value.Height;
+        }
+    }
+
+    public readonly float CenterX => Left + (Width / 2f);
+
+    public readonly float CenterY => Top + (Height / 2f);
+
+    public void Offset(float x, float y)
+    {
+        Left += x;
+        Top += y;
+        Right += x;
+        Bottom += y;
+    }
+
+    public void Offset(PointF pos) => Offset(pos.X, pos.Y);
+
+    public static RectF Create(PointF location, SizeF size) => Create(location.X, location.Y, size.Width, size.Height);
+
+    public static RectF Create(SizeF size) => Create(PointF.Empty, size);
+
+    public static RectF Create(float width, float height) => new(0.0f, 0.0f, width, height);
+
+    public static RectF Create(float x, float y, float width, float height) => new(x, y, x + width, y + height);
+
+    public static RectF Inflate(RectF rect, float x, float y)
+    {
+        var r = new RectF(rect.Left, rect.Top, rect.Right, rect.Bottom);
+        r.Inflate(x, y);
+        return r;
+    }
+
+    public void Inflate(SizeF size) => Inflate(size.Width, size.Height);
+
+    public void Inflate(float x, float y)
+    {
+        Left -= x;
+        Top -= y;
+        Right += x;
+        Bottom += y;
+    }
+
+    public readonly bool Contains(float x, float y)
+    {
+        return (x >= Left) && (x < Right) && (y >= Top) && (y < Bottom);
+    }
+
+    public readonly bool Contains(Point pt) => Contains(pt.X, pt.Y);
+    public readonly bool Contains(PointF pt) => Contains(pt.X, pt.Y);
+
+    public readonly bool Contains(RectF rect) =>
+        (Left <= rect.Left) && (Right >= rect.Right) &&
+        (Top <= rect.Top) && (Bottom >= rect.Bottom);
+
+    public readonly bool IntersectsWith(RectF rect)
+    {
+        return (Left < rect.Right) && (Right > rect.Left) && (Top < rect.Bottom) && (Bottom > rect.Top);
+    }
+
+    public readonly bool IntersectsWithInclusive(RectF rect)
+    {
+        return (Left <= rect.Right) && (Right >= rect.Left) && (Top <= rect.Bottom) && (Bottom >= rect.Top);
+    }
+
+    public static RectF Intersect(RectF left, RectF right)
+    {
+        if (!left.IntersectsWithInclusive(right))
+        {
+            return Empty;
+        }
+
+        return new RectF(
+            Math.Max(left.Left, right.Left),
+            Math.Max(left.Top, right.Top),
+            Math.Min(left.Right, right.Right),
+            Math.Min(left.Bottom, right.Bottom)
+            );
+    }
+
+    public void Intersect(RectF rect)
+    {
+        this = Intersect(this, rect);
+    }
+
+    public static RectF Union(RectF left, RectF right)
+    {
+        return new(
+            Math.Min(left.Left, right.Left),
+            Math.Min(left.Top, right.Top),
+            Math.Max(left.Right, right.Right),
+            Math.Max(left.Bottom, right.Bottom)
+            );
+    }
+
+    public void Union(RectF rect)
+    {
+        this = Union(this, rect);
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => obj is RectF value && Equals(value);
+
+    /// <summary>
+    /// Determines whether the specified <see cref="RectF"/> is equal to this instance.
+    /// </summary>
+    /// <param name="other">The <see cref="RectF"/> to compare with this instance.</param>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public bool Equals(RectF other)
+    {
+        return
+            Left == other.Left
+            && Top == other.Top
+            && Right == other.Right
+            && Bottom == other.Bottom;
+    }
+
+    /// <inheritdoc />
+    public override int GetHashCode() => HashCode.Combine(Left, Top, Right, Bottom);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{nameof(Left)}: {Left}, {nameof(Top)}: {Top}, {nameof(Right)}: {Right}, {nameof(Bottom)}: {Bottom}";
+    }
+
+    /// <summary>
+    /// Compares two <see cref="RectF"/> objects for equality.
+    /// </summary>
+    /// <param name="left">The <see cref="RectF"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="RectF"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is equal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator ==(RectF left, RectF right) => left.Equals(right);
+
+    /// <summary>
+    /// Compares two <see cref="RectF"/> objects for inequality.
+    /// </summary>
+    /// <param name="left">The <see cref="RectF"/> on the left hand of the operand.</param>
+    /// <param name="right">The <see cref="RectF"/> on the right hand of the operand.</param>
+    /// <returns>
+    /// True if the current left is unequal to the <paramref name="right"/> parameter; otherwise, false.
+    /// </returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool operator !=(RectF left, RectF right) => !left.Equals(right);
+
+    /// <summary>
+    /// Performs an implicit conversion from <see cref="RectF"/> to <see cref="RectangleF" />.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <returns>The result of the conversion.</returns>
+    public static implicit operator RectangleF(RectF value) => RectangleF.FromLTRB(value.Left, value.Top, value.Right, value.Bottom);
+
+    /// <summary>
+    /// Performs an implicit conversion from <see cre ="RectangleF"/> to <see cref="RectF" />.
+    /// </summary>
+    /// <param name="value">The value to convert.</param>
+    /// <returns>The result of the conversion.</returns>
+    public static implicit operator RectF(RectangleF value) => new(value.Left, value.Top, value.Right, value.Bottom);
+
+    public static implicit operator RectF(Rect r) => new(r.Left, r.Top, r.Right, r.Bottom);
+}
diff --git a/src/Vortice.Win32/RawRect.cs b/src/Vortice.Win32/RawRect.cs
deleted file mode 100644
index 91636eb..0000000
--- a/src/Vortice.Win32/RawRect.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © Amer Koleci and Contributors.
-// Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.
-
-using System.Diagnostics;
-using System.Drawing;
-
-namespace Win32;
-
-/// <summary>
-/// Defines an integer rectangle (Left, Top, Right, Bottom)
-/// </summary>
-[StructLayout(LayoutKind.Sequential, Pack = 4)]
-[DebuggerDisplay("Left: {Left}, Top: {Top}, Right: {Right}, Bottom: {Bottom}")]
-public readonly struct RawRect
-{
-    public RawRect(int left, int top, int right, int bottom)
-    {
-        Left = left;
-        Top = top;
-        Right = right;
-        Bottom = bottom;
-    }
-
-    /// <summary>
-    /// The left position.
-    /// </summary>
-    public readonly int Left;
-
-    /// <summary>
-    /// The top position.
-    /// </summary>
-    public readonly int Top;
-
-    /// <summary>
-    /// The right position
-    /// </summary>
-    public readonly int Right;
-
-    /// <summary>
-    /// The bottom position.
-    /// </summary>
-    public readonly int Bottom;
-
-    /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{nameof(Left)}: {Left}, {nameof(Top)}: {Top}, {nameof(Right)}: {Right}, {nameof(Bottom)}: {Bottom}";
-    }
-
-    /// <summary>
-    /// Performs an implicit conversion from <see cre ="RawRect"/> to <see cref="Rectangle" />.
-    /// </summary>
-    /// <param name="value">The value to convert.</param>
-    /// <returns>The result of the conversion.</returns>
-    public static implicit operator Rectangle(RawRect value) => Rectangle.FromLTRB(value.Left, value.Top, value.Right, value.Bottom);
-
-    /// <summary>
-    /// Performs an implicit conversion from <see cre ="Rectangle"/> to <see cref="RawRect" />.
-    /// </summary>
-    /// <param name="value">The value to convert.</param>
-    /// <returns>The result of the conversion.</returns>
-    public static implicit operator RawRect(Rectangle value) => new(value.Left, value.Top, value.Right, value.Bottom);
-}