diff --git a/Package.resolved b/Package.resolved
index f29777f..a472bb0 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f0d699b19aeb7c44f255be03e6e8735cff0461777eca1452c2b88f5e63e95030",
+  "originHash" : "50661037ace32d27f5b63e569f8fa2ccff6d3226fa694da9fc389c49efd15ddd",
   "pins" : [
     {
       "identity" : "darwinprivateframeworks",
@@ -7,7 +7,7 @@
       "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git",
       "state" : {
         "branch" : "main",
-        "revision" : "ad2c9082d5c9085ab3bbd73fe491bb72e76a9b65"
+        "revision" : "10da520855bab3b61edc93a7ff172856ea6b8ff4"
       }
     },
     {
diff --git a/Sources/OpenGraph_SPI/Comparison/OGComparison.cpp b/Sources/OpenGraph_SPI/Comparison/OGComparison.cpp
index c19487e..fa497d5 100644
--- a/Sources/OpenGraph_SPI/Comparison/OGComparison.cpp
+++ b/Sources/OpenGraph_SPI/Comparison/OGComparison.cpp
@@ -6,19 +6,19 @@
 #include "OGComparisonPrivate.h"
 
 const void *OGComparisonStateGetDestination(OGComparisonState state) {
-    return state->destination;
+    return ((const OGComparisonStateStorage *)state)->destination;
 }
 
 const void *OGComparisonStateGetSource(OGComparisonState state) {
-    return state->source;
+    return ((const OGComparisonStateStorage *)state)->source;
 }
 
 OGFieldRange OGComparisonStateGetFieldRange(OGComparisonState state) {
-    return state->field_range;
+    return ((const OGComparisonStateStorage *)state)->field_range;
 }
 
 OGTypeID OGComparisonStateGetFieldType(OGComparisonState state) {
-    return state->field_type;
+    return ((const OGComparisonStateStorage *)state)->field_type;
 }
 
 bool OGCompareValues(const void *lhs, const void *rhs, OGTypeID type, OGComparisonOptions options) {
diff --git a/Sources/OpenGraph_SPI/include/OGComparison.h b/Sources/OpenGraph_SPI/include/OGComparison.h
index c0e717f..54acd6a 100644
--- a/Sources/OpenGraph_SPI/include/OGComparison.h
+++ b/Sources/OpenGraph_SPI/include/OGComparison.h
@@ -40,25 +40,25 @@ OG_EXTERN_C_BEGIN
 typedef struct OGFieldRange {
     size_t offset;
     size_t size;
-} OGFieldRange;
+} OGFieldRange OG_SWIFT_STRUCT OG_SWIFT_NAME(FieldRange);
 
-typedef struct OGComparisonStateStorage *OGComparisonState;
+typedef const void *OGComparisonState OG_SWIFT_STRUCT OG_SWIFT_NAME(ComparisonState);
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-const void *OGComparisonStateGetDestination(OGComparisonState state);
+const void *OGComparisonStateGetDestination(OGComparisonState state) OG_SWIFT_NAME(getter:OGComparisonState.destination(self:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-const void *OGComparisonStateGetSource(OGComparisonState state);
+const void *OGComparisonStateGetSource(OGComparisonState state) OG_SWIFT_NAME(getter:OGComparisonState.source(self:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-OGFieldRange OGComparisonStateGetFieldRange(OGComparisonState state);
+OGFieldRange OGComparisonStateGetFieldRange(OGComparisonState state) OG_SWIFT_NAME(getter:OGComparisonState.fieldRange(self:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-OGTypeID OGComparisonStateGetFieldType(OGComparisonState state);
+OGTypeID OGComparisonStateGetFieldType(OGComparisonState state) OG_SWIFT_NAME(getter:OGComparisonState.fieldType(self:));
 
 typedef OG_ENUM(uint8_t, OGComparisonMode) {
     OGComparisonModeBitwise = 0,