bump min development version to iOS 16 and macOS 13

Support typed errors. Misc formatting
Merge pull request #510 from DavidTiimo/develop
2026-03-02 11:20:08 +01:00 · 2024-10-31 14:05:02 +09:00 · 2024-09-10 11:14:39 +09:00 · 2024-09-10 11:11:32 +09:00 · 2024-09-04 12:55:24 +02:00 · 2024-09-04 12:35:08 +02:00
113 changed files with 5058 additions and 4379 deletions
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "9.2.0"
+    s.version = "9.3.0"
    s.swift_version = "5.9"
    s.license = "MIT"
    s.homepage = "https://github.com/JohnEstropia/CoreStore"
@@ -9,10 +9,10 @@ Pod::Spec.new do |s|
    s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
    s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }
-    s.ios.deployment_target = "13.0"
+    s.ios.deployment_target = "16.0"
-    s.osx.deployment_target = "10.15"
+    s.osx.deployment_target = "13.0"
-    s.tvos.deployment_target = "13.0"
+    s.tvos.deployment_target = "16.0"
-    s.watchos.deployment_target = "7.4"
+    s.watchos.deployment_target = "9.0"
    s.source_files = "Sources", "Sources/**/*.swift"
    s.public_header_files = "Sources/**/*.h"
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -1951,8 +1951,9 @@
 		2F03A52719C5C6DA005002A5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1600;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					2F03A52F19C5C6DA005002A5 = {
@@ -3015,8 +3016,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
@@ -3028,10 +3029,10 @@
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 16.6;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 9.6;
 			};
 			name = Debug;
 		};
@@ -3082,21 +3083,22 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 16.6;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 7.4;
+				WATCHOS_DEPLOYMENT_TARGET = 9.6;
 			};
 			name = Release;
 		};
@@ -3110,9 +3112,12 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+					"$(inherited)",
-				MARKETING_VERSION = 9.2.0;
+					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3134,9 +3139,12 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+					"$(inherited)",
-				MARKETING_VERSION = 9.2.0;
+					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3158,7 +3166,11 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = iphoneos;
@@ -3173,7 +3185,11 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = iphoneos;
@@ -3193,8 +3209,12 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MARKETING_VERSION = 9.2.0;
+					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3204,7 +3224,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Debug;
 		};
@@ -3220,8 +3239,12 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MARKETING_VERSION = 9.2.0;
+					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3231,7 +3254,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 13.0;
 			};
 			name = Release;
 		};
@@ -3242,7 +3264,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = appletvos;
@@ -3260,7 +3286,11 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = appletvos;
@@ -3276,7 +3306,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = watchos;
@@ -3285,7 +3319,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 7.4;
 			};
 			name = Debug;
 		};
@@ -3297,7 +3330,11 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = watchos;
@@ -3305,7 +3342,6 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 7.4;
 			};
 			name = Release;
 		};
@@ -3325,9 +3361,13 @@
 				FRAMEWORK_VERSION = A;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+					"$(inherited)",
-				MARKETING_VERSION = 9.2.0;
+					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3356,9 +3396,13 @@
 				FRAMEWORK_VERSION = A;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+					"$(inherited)",
-				MARKETING_VERSION = 9.2.0;
+					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.5;
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3381,7 +3425,11 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = macosx;
@@ -3402,7 +3450,11 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
 				SDKROOT = macosx;
@@ -3423,8 +3475,12 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MARKETING_VERSION = 9.2.0;
+					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3434,7 +3490,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 7.4;
 			};
 			name = Debug;
 		};
@@ -3452,8 +3507,12 @@
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
-				MARKETING_VERSION = 9.2.0;
+					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 9.3.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3463,7 +3522,6 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 7.4;
 			};
 			name = Release;
 		};
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/CoreStoreTests/Info.plist
+++ b/CoreStoreTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.0</string>
+	<string>9.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/Demo/Demo.xcodeproj/project.pbxproj
+++ b/Demo/Demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -622,8 +622,9 @@
 		B5A3910F24E5424E00E7E8BD /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1160;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					B5A3911824E5429200E7E8BD = {
 						CreatedOnToolsVersion = 11.6;
@@ -792,6 +793,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -799,7 +801,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
@@ -827,6 +829,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -834,7 +837,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 			};
 			name = Release;
 		};
@@ -894,7 +897,6 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -962,7 +964,6 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
+++ b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1600"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ItemView.swift
+++ b/Demo/Sources/Demos/Modern/ColorsDemo/Modern.ColorsDemo.SwiftUI.ItemView.swift
@@ -40,7 +40,7 @@ extension Modern.ColorsDemo.SwiftUI {
                        .padding(),
                    alignment: .leading
                )
-                .animation(.default)
+                .animation(.default, value: palette)
            }
        }
    }
--- a/Demo/Sources/Demos/Modern/PlacemarksDemo/Modern.PlacemarksDemo.MapView.swift
+++ b/Demo/Sources/Demos/Modern/PlacemarksDemo/Modern.PlacemarksDemo.MapView.swift
@@ -77,13 +77,12 @@ extension Modern.PlacemarksDemo {
            ) -> MKAnnotationView? {
                let identifier = "MKAnnotationView"
-                var annotationView: MKPinAnnotationView! = mapView.dequeueReusableAnnotationView(withIdentifier: identifier) as? MKPinAnnotationView
+                var annotationView: MKMarkerAnnotationView! = mapView.dequeueReusableAnnotationView(withIdentifier: identifier) as? MKMarkerAnnotationView
                if annotationView == nil {
-                    annotationView = MKPinAnnotationView(annotation: annotation, reuseIdentifier: identifier)
+                    annotationView = MKMarkerAnnotationView(annotation: annotation, reuseIdentifier: identifier)
                    annotationView.isEnabled = true
                    annotationView.canShowCallout = true
                    annotationView.animatesDrop = true
                }
                else {
--- a/Package.swift
+++ b/Package.swift
@@ -29,7 +29,7 @@ import PackageDescription
 let package = Package(
    name: "CoreStore",
    platforms: [
-        .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v7)
+        .macOS(.v13), .iOS(.v16), .tvOS(.v16), .watchOS(.v9)
    ],
    products: [
        .library(name: "CoreStore", targets: ["CoreStore"])
--- a/Playground_macOS.playground/Contents.swift
+++ b/Playground_macOS.playground/Contents.swift
@@ -17,6 +17,12 @@ class Animal: CoreStoreObject {
    var master: Person?
 }
 class Dog: Animal {
    @Field.Stored("name")
    var name: String = ""
 }
 class Person: CoreStoreObject {
    @Field.Stored("name")
@@ -33,16 +39,20 @@ let dataStack = DataStack(
        modelVersion: "V1",
        entities: [
            Entity<Animal>("Animal"),
-            Entity<Person>("Person")
+            Entity<Person>("Person"),
-        ],
+            Entity<Dog>("Dog")
        ]/*,
        versionLock: [
            "Animal": [0x4a201cc685d53c0a, 0x16e6c3b561577875, 0xb032e2da61c792a0, 0xa133b801051acee4],
            "Person": [0xca938eea1af4bd56, 0xbca30994506356ad, 0x7a7cc655898816ef, 0x1a4551ffedc9b214]
-        ]
+        ]*/
    )
 )
 dataStack.addStorage(
-    SQLiteStore(fileName: "data.sqlite"),
+    SQLiteStore(
        fileName: "data.sqlite",
        localStorageOptions: .recreateStoreOnModelMismatch
    ),
    completion: { result in
        switch result {
@@ -73,8 +83,8 @@ dataStack.addStorage(
                    case .success:
                        /// Accessing Objects =====
                        let bird = try! dataStack.fetchOne(
-                            From<Animal>()
+                            From<Dog>()
-                                .where(\.$species == "Sparrow")
+                                .where(\Dog.$species == "Sparrow")
                        )!
                        print(bird.species)
                        print(bird.color as Any)
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 <br />
 </p>
-* **Swift 5.9:** iOS 13+ / macOS 10.15+ / watchOS 7.4+ / tvOS 13.0+
+* **Swift 5.9:** iOS 16.0+ / macOS 13.0+ / watchOS 9.0+ / tvOS 16.0+
 * Previously supported Swift versions: [Swift 5.4](https://github.com/JohnEstropia/CoreStore/tree/8.0.1), [Swift 5.3](https://github.com/JohnEstropia/CoreStore/tree/7.3.1), [Swift 5.7](https://github.com/JohnEstropia/CoreStore/tree/9.1.0)
 Upgrading from previous CoreStore versions? Check out the [🆕 features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).
@@ -2460,7 +2460,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 ### Install with Carthage
 In your `Cartfile`, add
 ```
-github "JohnEstropia/CoreStore" >= 9.2.0
+github "JohnEstropia/CoreStore" >= 9.3.0
 ```
 and run 
 ```
@@ -2471,7 +2471,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 #### Install with Swift Package Manager:
 ```swift
 dependencies: [
-    .package(url: "https://github.com/JohnEstropia/CoreStore.git", from: "9.2.0"))
+    .package(url: "https://github.com/JohnEstropia/CoreStore.git", from: "9.3.0"))
 ]
 ```
 Declare `import CoreStore` in your swift file to use the library.
--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -41,7 +41,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     ```
     - Important: Never use `try?` or `try!` on a `cancel()` call. Always use `try`. Using `try?` will swallow the cancellation and the transaction will proceed to commit as normal. Using `try!` will crash the app as `cancel()` will *always* throw an error.
     */
-    public func cancel() throws -> Never {
+    public func cancel() throws(CoreStoreError) -> Never {
        throw CoreStoreError.userCancelled
    }
@@ -66,8 +66,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     - parameter into: the `Into` clause indicating the destination `NSManagedObject` or `CoreStoreObject` entity type and the destination configuration
     - returns: a new `NSManagedObject` or `CoreStoreObject` instance of the specified entity type.
     */
-    public override func create<O>(_ into: Into<O>) -> O {
+    public override func create<O>(
-        
+        _ into: Into<O>
    ) -> O {
        Internals.assert(
            !self.isCommitted,
            "Attempted to create an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
@@ -82,8 +84,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public override func edit<O: DynamicObject>(_ object: O?) -> O? {
+    public override func edit<O: DynamicObject>(
-        
+        _ object: O?
    ) -> O? {
        Internals.assert(
            !self.isCommitted,
            "Attempted to update an entity of type \(Internals.typeName(object)) from an already committed \(Internals.typeName(self))."
@@ -99,8 +103,11 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     - parameter objectID: the `NSManagedObjectID` for the object to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public override func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
+    public override func edit<O>(
-        
+        _ into: Into<O>,
        _ objectID: NSManagedObjectID
    ) -> O? {
        Internals.assert(
            !self.isCommitted,
            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
@@ -114,7 +121,9 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
     */
-    public override func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+    public override func delete<S: Sequence>(
        objectIDs: S
    ) where S.Iterator.Element: NSManagedObjectID {
        Internals.assert(
            !self.isCommitted,
@@ -130,7 +139,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
     - parameter object: the `ObjectRepresentation` representing an `NSManagedObject` or `CoreStoreObject` to be deleted
     - parameter objects: other `ObjectRepresentation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public override func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+    public override func delete<O: ObjectRepresentation>(
        _ object: O?,
        _ objects: O?...
    ) {
        Internals.assert(
            !self.isCommitted,
@@ -145,7 +157,9 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    - parameter objects: the `ObjectRepresenation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public override func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
+    public override func delete<S: Sequence>(
        _ objects: S
    ) where S.Iterator.Element: ObjectRepresentation {
        Internals.assert(
            !self.isCommitted,
@@ -173,8 +187,13 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
        )
    }
-    internal func autoCommit(_ completion: @escaping (_ hasChanges: Bool, _ error: CoreStoreError?) -> Void) {
+    internal func autoCommit(
-        
+        _ completion: @escaping (
            _ hasChanges: Bool,
            _ error: CoreStoreError?
        ) -> Void
    ) {
        self.isCommitted = true
        let group = DispatchGroup()
        group.enter()
--- a/Sources/BaseDataTransaction+Importing.swift
+++ b/Sources/BaseDataTransaction+Importing.swift
@@ -41,25 +41,26 @@ extension BaseDataTransaction {
     */
    public func importObject<O: ImportableObject>(
        _ into: Into<O>,
-        source: O.ImportSource) throws -> O? {
+        source: O.ImportSource
-            
+    ) throws(any Swift.Error) -> O? {
-            Internals.assert(
+
-                self.isRunningInAllowedQueue(),
+        Internals.assert(
-                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
+            self.isRunningInAllowedQueue(),
-            )
+            "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
-        
+        )
-            return try autoreleasepool {
+
-                
+        return try Internals.autoreleasepool {
-                let entityType = into.entityClass
+
-                guard entityType.shouldInsert(from: source, in: self) else {
+            let entityType = into.entityClass
-                    
+            guard entityType.shouldInsert(from: source, in: self) else {
-                    return nil
+
-                }
+                return nil
                let object = self.create(into)
                try object.didInsert(from: source, in: self)
                return object
            }
            let object = self.create(into)
            try object.didInsert(from: source, in: self)
            return object
        }
    }
    /**
@@ -71,22 +72,23 @@ extension BaseDataTransaction {
     */
    public func importObject<O: ImportableObject>(
        _ object: O,
-        source: O.ImportSource) throws {
+        source: O.ImportSource
-            
+    ) throws(any Swift.Error) {
-            Internals.assert(
+
-                self.isRunningInAllowedQueue(),
+        Internals.assert(
-                "Attempted to import an object of type \(Internals.typeName(object)) outside the transaction's designated queue."
+            self.isRunningInAllowedQueue(),
-            )
+            "Attempted to import an object of type \(Internals.typeName(object)) outside the transaction's designated queue."
-            
+        )
-            try autoreleasepool {
+
-              
+        try Internals.autoreleasepool {
-                let entityType = object.runtimeType()
+
-                guard entityType.shouldInsert(from: source, in: self) else {
+            let entityType = object.runtimeType()
-                    
+            guard entityType.shouldInsert(from: source, in: self) else {
-                    return
+
-                }
+                return
                try object.didInsert(from: source, in: self)
            }
            try object.didInsert(from: source, in: self)
        }
    }
    /**
@@ -99,30 +101,31 @@ extension BaseDataTransaction {
     */
    public func importObjects<O: ImportableObject, S: Sequence>(
        _ into: Into<O>,
-        sourceArray: S) throws -> [O] where S.Iterator.Element == O.ImportSource {
+        sourceArray: S
-            
+    ) throws(any Swift.Error) -> [O] where S.Iterator.Element == O.ImportSource {
-            Internals.assert(
+
-                self.isRunningInAllowedQueue(),
+        Internals.assert(
-                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
+            self.isRunningInAllowedQueue(),
-            )
+            "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
-            
+        )
-            return try autoreleasepool {
+
-                
+        return try Internals.autoreleasepool {
-                return try sourceArray.compactMap { (source) -> O? in
+
-                  
+            return try sourceArray.compactMap { (source) -> O? in
-                    let entityType = into.entityClass 
+
-                    guard entityType.shouldInsert(from: source, in: self) else {
+                let entityType = into.entityClass
-                        
+                guard entityType.shouldInsert(from: source, in: self) else {
-                        return nil
+
-                    }
+                    return nil
-                    return try autoreleasepool {
+                }
-                        
+                return try autoreleasepool {
-                        let object = self.create(into)
+
-                        try object.didInsert(from: source, in: self)
+                    let object = self.create(into)
-                        return object
+                    try object.didInsert(from: source, in: self)
-                    }
+                    return object
                }
            }
        }
    }
    /**
@@ -135,43 +138,44 @@ extension BaseDataTransaction {
     */
    public func importUniqueObject<O: ImportableUniqueObject>(
        _ into: Into<O>,
-        source: O.ImportSource) throws -> O? {
+        source: O.ImportSource
-            
+    ) throws(any Swift.Error) -> O? {
-            Internals.assert(
+
-                self.isRunningInAllowedQueue(),
+        Internals.assert(
-                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
+            self.isRunningInAllowedQueue(),
-            )
+            "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
-            
+        )
-            return try autoreleasepool {
+
-              
+        return try Internals.autoreleasepool {
-                let entityType = into.entityClass 
+
-                let uniqueIDKeyPath = entityType.uniqueIDKeyPath
+            let entityType = into.entityClass
-                guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
+            let uniqueIDKeyPath = entityType.uniqueIDKeyPath
-                    
+            guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
                return nil
            }
            if let object = try self.fetchOne(From(entityType), Where<O>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                guard entityType.shouldUpdate(from: source, in: self) else {
                    return nil
                }
-                
+                try object.update(from: source, in: self)
-                if let object = try self.fetchOne(From(entityType), Where<O>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
+                return object
                    guard entityType.shouldUpdate(from: source, in: self) else {
                        return nil
                    }
                    try object.update(from: source, in: self)
                    return object
                }
                else {
                    guard entityType.shouldInsert(from: source, in: self) else {
                        return nil
                    }
                    let object = self.create(into)
                    object.uniqueIDValue = uniqueIDValue
                    try object.didInsert(from: source, in: self)
                    return object
                }
            }
            else {
                guard entityType.shouldInsert(from: source, in: self) else {
                    return nil
                }
                let object = self.create(into)
                object.uniqueIDValue = uniqueIDValue
                try object.didInsert(from: source, in: self)
                return object
            }
        }
    }
    /**
@@ -188,71 +192,74 @@ extension BaseDataTransaction {
    public func importUniqueObjects<O: ImportableUniqueObject, S: Sequence>(
        _ into: Into<O>,
        sourceArray: S,
-        preProcess: @escaping (_ mapping: [O.UniqueIDType: O.ImportSource]) throws -> [O.UniqueIDType: O.ImportSource] = { $0 }) throws -> [O] where S.Iterator.Element == O.ImportSource {
+        preProcess: @escaping (
-            
+            _ mapping: [O.UniqueIDType: O.ImportSource]
-            Internals.assert(
+        ) throws(any Swift.Error) -> [O.UniqueIDType: O.ImportSource] = { $0 }
-                self.isRunningInAllowedQueue(),
+    ) throws(any Swift.Error) -> [O] where S.Iterator.Element == O.ImportSource {
                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
            )
            return try autoreleasepool {
                let entityType = into.entityClass 
                var importSourceByID = Dictionary<O.UniqueIDType, O.ImportSource>()
                let sortedIDs = try autoreleasepool {
                    return try sourceArray.compactMap { (source) -> O.UniqueIDType? in
                        guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
                            return nil
                        }
                        importSourceByID[uniqueIDValue] = source // effectively replaces duplicate with the latest
                        return uniqueIDValue
                    }
                }
                importSourceByID = try autoreleasepool { try preProcess(importSourceByID) }
-                var existingObjectsByID = Dictionary<O.UniqueIDType, O>()
+        Internals.assert(
-                try self
+            self.isRunningInAllowedQueue(),
-                    .fetchAll(From(entityType), Where<O>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
+            "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
-                    .forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
+        )
                var processedObjectIDs = Set<O.UniqueIDType>()
                var result = [O]()
                for objectID in sortedIDs where !processedObjectIDs.contains(objectID) {
                    guard let source = importSourceByID[objectID] else {
                        continue
                    }
                    try autoreleasepool {
-                        if let object = existingObjectsByID[objectID]
+        return try Internals.autoreleasepool {
-                            ?? self.context.insertedObjects
+
-                            .compactMap({ O.cs_matches(object: $0) ? O.cs_fromRaw(object: $0) : nil })
+            let entityType = into.entityClass
-                            .first(where: { $0.uniqueIDValue == objectID }) {
+            var importSourceByID = Dictionary<O.UniqueIDType, O.ImportSource>()
-                            
+            let sortedIDs = try Internals.autoreleasepool {
-                            guard entityType.shouldUpdate(from: source, in: self) else {
+
-                                
+                return try sourceArray.compactMap { (source) -> O.UniqueIDType? in
-                                return
+
-                            }
+                    guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
-                            try object.update(from: source, in: self)
+
-                            result.append(object)
+                        return nil
                        }
                        else if entityType.shouldInsert(from: source, in: self) {
                            let object = self.create(into)
                            object.uniqueIDValue = objectID
                            try object.didInsert(from: source, in: self)
                            result.append(object)
                        }
                        processedObjectIDs.insert(objectID)
                    }
                    importSourceByID[uniqueIDValue] = source // effectively replaces duplicate with the latest
                    return uniqueIDValue
                }
                return result
            }
            importSourceByID = try Internals.autoreleasepool { try preProcess(importSourceByID) }
            var existingObjectsByID = Dictionary<O.UniqueIDType, O>()
            try self
                .fetchAll(From(entityType), Where<O>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
                .forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
            var processedObjectIDs = Set<O.UniqueIDType>()
            var result = [O]()
            for objectID in sortedIDs where !processedObjectIDs.contains(objectID) {
                guard let source = importSourceByID[objectID] else {
                    continue
                }
                try Internals.autoreleasepool {
                    if let object = existingObjectsByID[objectID]
                        ?? self.context.insertedObjects
                        .compactMap({ O.cs_matches(object: $0) ? O.cs_fromRaw(object: $0) : nil })
                        .first(where: { $0.uniqueIDValue == objectID }) {
                        guard entityType.shouldUpdate(from: source, in: self) else {
                            return
                        }
                        try object.update(from: source, in: self)
                        result.append(object)
                    }
                    else if entityType.shouldInsert(from: source, in: self) {
                        let object = self.create(into)
                        object.uniqueIDValue = objectID
                        try object.didInsert(from: source, in: self)
                        result.append(object)
                    }
                    processedObjectIDs.insert(objectID)
                }
            }
            return result
        }
    }
 }
--- a/Sources/BaseDataTransaction+Querying.swift
+++ b/Sources/BaseDataTransaction+Querying.swift
@@ -39,8 +39,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<O>(_ from: From<O>, _ deleteClauses: DeleteClause...) throws -> Int {
+    public func deleteAll<O>(
-        
+        _ from: From<O>,
        _ deleteClauses: DeleteClause...
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
@@ -56,8 +59,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<O>(_ from: From<O>, _ deleteClauses: [DeleteClause]) throws -> Int {
+    public func deleteAll<O>(
-        
+        _ from: From<O>,
        _ deleteClauses: [DeleteClause]
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
@@ -74,14 +80,18 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
+    public func deleteAll<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
        )
-        
+        return try self.context.deleteAll(
-        return try self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
+            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
@@ -93,8 +103,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter object: a reference to the object created/fetched outside the transaction
     - returns: the `DynamicObject` instance if the object exists in the transaction, or `nil` if not found.
     */
-    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ object: O
    ) -> O? {
        return self.context.fetchExisting(object)
    }
@@ -104,8 +116,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter objectID: the `NSManagedObjectID` for the object
     - returns: the `DynamicObject` instance if the object exists in the transaction, or `nil` if not found.
     */
-    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ objectID: NSManagedObjectID
    ) -> O? {
        return self.context.fetchExisting(objectID)
    }
@@ -115,8 +129,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter objects: an array of `DynamicObject`s created/fetched outside the transaction
     - returns: the `DynamicObject` array for objects that exists in the transaction
     */
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objects: S
    ) -> [O] where S.Iterator.Element == O {
        return self.context.fetchExisting(objects)
    }
@@ -126,8 +142,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter objectIDs: the `NSManagedObjectID` array for the objects
     - returns: the `DynamicObject` array for objects that exists in the transaction
     */
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objectIDs: S) -> [O] where S.Iterator.Element == NSManagedObjectID {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objectIDs: S
    ) -> [O] where S.Iterator.Element == NSManagedObjectID {
        return self.context.fetchExisting(objectIDs)
    }
@@ -139,8 +157,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> O? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -156,8 +177,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> O? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -178,8 +202,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
+    public func fetchOne<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ObjectType? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -195,8 +221,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [O] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -212,8 +241,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [O] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -234,8 +266,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
+    public func fetchAll<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [B.ObjectType] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -251,8 +285,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -268,8 +305,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -290,8 +330,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
+    public func fetchCount<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -307,8 +349,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -324,8 +369,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -346,8 +394,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
+    public func fetchObjectID<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -363,8 +413,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -380,8 +433,11 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -402,8 +458,10 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
@@ -425,8 +483,12 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> U? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
@@ -445,8 +507,12 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> U? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
@@ -469,13 +535,19 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
+    public func queryValue<B: QueryChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ResultType? where B.ResultType: QueryableAttributeType {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
-        return try self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryValue(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
    /**
@@ -489,8 +561,12 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> [[String: Any]] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
@@ -509,8 +585,12 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> [[String: Any]] {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
@@ -542,13 +622,19 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
+    public func queryAttributes<B: QueryChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [[String: Any]] where B.ResultType == NSDictionary {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
-        return try self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryAttributes(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -121,8 +121,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter object: the `NSManagedObject` or `CoreStoreObject` type to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public func edit<O: DynamicObject>(_ object: O?) -> O? {
+    public func edit<O: DynamicObject>(
-        
+        _ object: O?
    ) -> O? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to update an entity of type \(Internals.typeName(object)) outside its designated queue."
@@ -141,8 +143,11 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter objectID: the `NSManagedObjectID` for the object to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
+    public func edit<O>(
-        
+        _ into: Into<O>,
        _ objectID: NSManagedObjectID
    ) -> O? {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) outside its designated queue."
@@ -160,7 +165,9 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
     */
-    public func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+    public func delete<S: Sequence>(
        objectIDs: S
    ) where S.Iterator.Element: NSManagedObjectID {
        Internals.assert(
            self.isRunningInAllowedQueue(),
@@ -179,8 +186,11 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter object: the `ObjectRepresentation` representing an `NSManagedObject` or `CoreStoreObject` to be deleted
     - parameter objects: other `ObjectRepresentation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+    public func delete<O: ObjectRepresentation>(
-        
+        _ object: O?,
        _ objects: O?...
    ) {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete an entity outside its designated queue."
@@ -193,8 +203,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter objects: the `ObjectRepresenation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
+    public func delete<S: Sequence>(
-        
+        _ objects: S
    ) where S.Iterator.Element: ObjectRepresentation {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete entities outside their designated queue."
@@ -227,7 +239,9 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter object: the `DynamicObject` instance
     - returns: `true` if the object has any property values changed.
     */
-    public func objectHasPersistentChangedValues<O: DynamicObject>(_ object: O) -> Bool {
+    public func objectHasPersistentChangedValues<O: DynamicObject>(
        _ object: O
    ) -> Bool {
        Internals.assert(
            self.isRunningInAllowedQueue(),
@@ -246,8 +260,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `DynamicObject`s of the specified type that were inserted to the transaction.
     */
-    public func insertedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
+    public func insertedObjects<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<O> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access inserted objects from a \(Internals.typeName(self)) outside its designated queue."
@@ -283,8 +299,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were inserted to the transaction.
     */
-    public func insertedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
+    public func insertedObjectIDs<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<NSManagedObjectID> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access inserted object IDs from a \(Internals.typeName(self)) outside its designated queue."
@@ -302,8 +320,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `DynamicObject`s of the specified type that were updated in the transaction.
     */
-    public func updatedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
+    public func updatedObjects<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<O> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access updated objects from a \(Internals.typeName(self)) outside its designated queue."
@@ -339,8 +359,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were updated in the transaction.
     */
-    public func updatedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
+    public func updatedObjectIDs<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<NSManagedObjectID> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access updated object IDs from a \(Internals.typeName(self)) outside its designated queue."
@@ -358,8 +380,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `DynamicObject`s of the specified type that were deleted from the transaction.
     */
-    public func deletedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
+    public func deletedObjects<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<O> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access deleted objects from a \(Internals.typeName(self)) outside its designated queue."
@@ -396,8 +420,10 @@ public /*abstract*/ class BaseDataTransaction {
     - parameter entity: the `DynamicObject` subclass to filter
     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were deleted from the transaction.
     */
-    public func deletedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
+    public func deletedObjectIDs<O: DynamicObject>(
-        
+        _ entity: O.Type
    ) -> Set<NSManagedObjectID> {
        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to access deleted object IDs from a \(Internals.typeName(self)) outside its designated queue."
--- a/Sources/CoreStore+CustomDebugStringConvertible.swift
+++ b/Sources/CoreStore+CustomDebugStringConvertible.swift
@@ -1073,13 +1073,21 @@ private func formattedDebugDescription(_ any: Any) -> String {
    return string
 }
-private func createFormattedString(_ firstLine: String, _ lastLine: String, _ info: (key: String, value: Any)...) -> String {
+private func createFormattedString(
-    
+    _ firstLine: String,
    _ lastLine: String,
    _ info: (key: String, value: Any)...
 ) -> String {
    return createFormattedString(firstLine, lastLine, info)
 }
-private func createFormattedString(_ firstLine: String, _ lastLine: String, _ info: [(key: String, value: Any)]) -> String {
+private func createFormattedString(
-    
+    _ firstLine: String,
    _ lastLine: String,
    _ info: [(key: String, value: Any)]
 ) -> String {
    var string = firstLine
    for (key, value) in info {
@@ -1102,8 +1110,11 @@ extension String {
        self = self.replacingOccurrences(of: "\n", with: "\n\(String.indention(level))")
    }
-    fileprivate mutating func appendDumpInfo(_ key: String, _ value: Any) {
+    fileprivate mutating func appendDumpInfo(
-        
+        _ key: String,
        _ value: Any
    ) {
        self.append("\n.\(key) = \(formattedValue(value));")
    }
 }
@@ -1189,8 +1200,9 @@ extension NSAttributeDescription: CoreStoreDebugStringConvertible {
    }
 }
 extension NSAttributeType: @retroactive CustomDebugStringConvertible {}
 extension NSAttributeType: CoreStoreDebugStringConvertible {
-    
+
    public var debugDescription: String {
        return formattedDebugDescription(self)
@@ -1235,6 +1247,7 @@ extension Bundle: CoreStoreDebugStringConvertible {
    }
 }
 extension NSDeleteRule: @retroactive CustomDebugStringConvertible {}
 extension NSDeleteRule: CoreStoreDebugStringConvertible {
    public var debugDescription: String {
@@ -1399,6 +1412,7 @@ extension Optional: CoreStoreDebugStringConvertible {
    }
 }
 extension Result: @retroactive CustomDebugStringConvertible {}
 extension Result: CoreStoreDebugStringConvertible {
    public var debugDescription: String {
@@ -1425,6 +1439,7 @@ extension Result: CoreStoreDebugStringConvertible {
    }
 }
 extension Selector: @retroactive CustomDebugStringConvertible {}
 extension Selector: CoreStoreDebugStringConvertible {
    public var debugDescription: String {
--- a/Sources/CoreStore+Logging.swift
+++ b/Sources/CoreStore+Logging.swift
@@ -33,7 +33,13 @@ extension Internals {
    // MARK: Internal
    @inline(__always)
-    internal static func log(_ level: LogLevel, message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
+    internal static func log(
        _ level: LogLevel,
        message: String,
        fileName: StaticString = #file,
        lineNumber: Int = #line,
        functionName: StaticString = #function
    ) {
        CoreStoreDefaults.logger.log(
            level: level,
@@ -45,7 +51,13 @@ extension Internals {
    }
    @inline(__always)
-    internal static func log(_ error: CoreStoreError, _ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
+    internal static func log(
        _ error: CoreStoreError,
        _ message: String,
        fileName: StaticString = #file,
        lineNumber: Int = #line,
        functionName: StaticString = #function
    ) {
        CoreStoreDefaults.logger.log(
            error: error,
@@ -57,7 +69,13 @@ extension Internals {
    }
    @inline(__always)
-    internal static func assert( _ condition: @autoclosure () -> Bool, _ message: @autoclosure () -> String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
+    internal static func assert(
        _ condition: @autoclosure () -> Bool,
        _ message: @autoclosure () -> String,
        fileName: StaticString = #file,
        lineNumber: Int = #line,
        functionName: StaticString = #function
    ) {
        CoreStoreDefaults.logger.assert(
            condition(),
@@ -69,7 +87,12 @@ extension Internals {
    }
    @inline(__always)
-    internal static func abort(_ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) -> Never  {
+    internal static func abort(
        _ message: String,
        fileName: StaticString = #file,
        lineNumber: Int = #line,
        functionName: StaticString = #function
    ) -> Never  {
        CoreStoreDefaults.logger.abort(
            message,
--- a/Sources/CoreStoreLogger.swift
+++ b/Sources/CoreStoreLogger.swift
@@ -56,8 +56,14 @@ public protocol CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    func log(level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func log(
-    
+        level: LogLevel,
        message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    )
    /**
     Handles errors sent by the `CoreStore` framework.
@@ -67,8 +73,14 @@ public protocol CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    func log(error: CoreStoreError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func log(
-    
+        error: CoreStoreError,
        message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    )
    /**
     Handles assertions made throughout the `CoreStore` framework.
@@ -78,8 +90,14 @@ public protocol CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    func assert(_ condition: @autoclosure () -> Bool, message: @autoclosure () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func assert(
-    
+        _ condition: @autoclosure () -> Bool,
        message: @autoclosure () -> String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    )
    /**
     Handles fatal errors made throughout the `CoreStore` framework. The app wil terminate after this method is called.
     - Important: Implementers may guarantee that the function doesn't return, either by calling another `Never` function such as `fatalError()` or `abort()`, or by raising an exception. If the implementation does not terminate the app, CoreStore will call an internal `fatalError()` to do so.
@@ -89,13 +107,23 @@ public protocol CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    func abort(_ message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func abort(
        _ message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    )
 }
 extension CoreStoreLogger {
-    public func abort(_ message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func abort(
-        
+        _ message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    ) {
        Swift.fatalError(message, file: fileName, line: UInt(lineNumber))
    }
 }
--- a/Sources/CoreStoreObject+Observing.swift
+++ b/Sources/CoreStoreObject+Observing.swift
@@ -27,9 +27,17 @@ import Foundation
 import CoreData
 // MARK: - DynamicObject where Self: CoreStoreObject
 extension DynamicObject where Self: CoreStoreObject {
-    public func observe<O, V>(_ keyPath: KeyPath<Self, FieldContainer<O>.Stored<V>>, options: NSKeyValueObservingOptions = [], changeHandler: @escaping (Self, CoreStoreObjectValueDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
+    // MARK: Public
    public func observe<O, V>(
        _ keyPath: KeyPath<Self, FieldContainer<O>.Stored<V>>,
        options: NSKeyValueObservingOptions = [],
        changeHandler: @escaping (Self, CoreStoreObjectValueDiff<V>) -> Void
    ) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
@@ -70,180 +78,6 @@ public protocol CoreStoreObjectKeyValueObservation: AnyObject {
 }
 // MARK: - ValueContainer.Required
 extension ValueContainer.Required {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectValueDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
 // MARK: - ValueContainer.Optional
 extension ValueContainer.Optional {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectValueDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
 // MARK: - TransformableContainer.Required
 extension TransformableContainer.Required {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectTransformableDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
 // MARK: - TransformableContainer.Optional
 extension TransformableContainer.Optional {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectTransformableDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
 // MARK: - RelationshipContainer.ToOne
 extension RelationshipContainer.ToOne {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectObjectDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, _, isPrior) in
                let notification = CoreStoreObjectObjectDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! CoreStoreManagedObject?,
                    oldNativeValue: oldValue as! CoreStoreManagedObject?,
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
 // MARK: - RelationshipContainer.ToManyUnordered
 extension RelationshipContainer.ToManyUnordered {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectUnorderedDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, _, isPrior) in
                let notification = CoreStoreObjectUnorderedDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! NSOrderedSet?,
                    oldNativeValue: oldValue as! NSOrderedSet?,
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
 // MARK: - RelationshipContainer.ToManyOrdered
 extension RelationshipContainer.ToManyOrdered {
    /**
     Observes changes in the receiver value. When the returned `CoreStoreObjectKeyValueObservation` is deinited or invalidated, it will stop observing.
     - parameter options: The flags indicating which values to include in the change dictionary.
     - parameter: changeHandler: The closure called when the value is updated.
     */
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectOrderedDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, indexes, isPrior) in
                let notification = CoreStoreObjectOrderedDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! NSArray?,
                    oldNativeValue: oldValue as! NSArray?,
                    indexes: indexes ?? IndexSet(),
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
 // MARK: - CoreStoreObjectValueDiff
 /**
@@ -360,7 +194,12 @@ public final class CoreStoreObjectObjectDiff<D: CoreStoreObject> {
    // MARK: FilePrivate
-    fileprivate init(kind: NSKeyValueChange, newNativeValue: CoreStoreManagedObject?, oldNativeValue: CoreStoreManagedObject?, isPrior: Bool) {
+    fileprivate init(
        kind: NSKeyValueChange,
        newNativeValue: CoreStoreManagedObject?,
        oldNativeValue: CoreStoreManagedObject?,
        isPrior: Bool
    ) {
        self.kind = kind
        self.newNativeValue = newNativeValue
@@ -406,7 +245,12 @@ public final class CoreStoreObjectUnorderedDiff<D: CoreStoreObject> {
    // MARK: FilePrivate
-    fileprivate init(kind: NSKeyValueChange, newNativeValue: NSOrderedSet?, oldNativeValue: NSOrderedSet?, isPrior: Bool) {
+    fileprivate init(
        kind: NSKeyValueChange,
        newNativeValue: NSOrderedSet?,
        oldNativeValue: NSOrderedSet?,
        isPrior: Bool
    ) {
        self.kind = kind
        self.newNativeValue = newNativeValue ?? []
@@ -457,7 +301,13 @@ public final class CoreStoreObjectOrderedDiff<D: CoreStoreObject> {
    // MARK: FilePrivate
-    fileprivate init(kind: NSKeyValueChange, newNativeValue: NSArray?, oldNativeValue: NSArray?, indexes: IndexSet, isPrior: Bool) {
+    fileprivate init(
        kind: NSKeyValueChange,
        newNativeValue: NSArray?,
        oldNativeValue: NSArray?,
        indexes: IndexSet,
        isPrior: Bool
    ) {
        self.kind = kind
        self.newNativeValue = newNativeValue ?? []
@@ -536,7 +386,18 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
    // MARK: FilePrivate
    @nonobjc
-    fileprivate init(object: CoreStoreManagedObject, keyPath: KeyPathString, callback: @escaping (_ object: CoreStoreManagedObject, _ kind: NSKeyValueChange, _ newValue: Any?, _ oldValue: Any?, _ indexes: IndexSet?, _ isPrior: Bool) -> Void) {
+    fileprivate init(
        object: CoreStoreManagedObject,
        keyPath: KeyPathString,
        callback: @escaping (
            _ object: CoreStoreManagedObject,
            _ kind: NSKeyValueChange,
            _ newValue: Any?,
            _ oldValue: Any?,
            _ indexes: IndexSet?,
            _ isPrior: Bool
        ) -> Void
    ) {
        let _ = _CoreStoreObjectKeyValueObservation.swizzler
        self.keyPath = keyPath
@@ -547,12 +408,19 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
    @nonobjc
    fileprivate func start(_ options: NSKeyValueObservingOptions) {
-        self.object?.addObserver(self, forKeyPath: self.keyPath, options: options, context: nil)
+        self.object?
            .addObserver(
                self,
                forKeyPath: self.keyPath,
                options: options,
                context: nil
            )
    }
    deinit {
-        self.object?.removeObserver(self, forKeyPath: self.keyPath, context: nil)
+        self.object?
            .removeObserver(self, forKeyPath: self.keyPath, context: nil)
    }
@@ -561,7 +429,8 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
    @nonobjc
    public func invalidate() {
-        self.object?.removeObserver(self, forKeyPath: self.keyPath, context: nil)
+        self.object?
            .removeObserver(self, forKeyPath: self.keyPath, context: nil)
        self.object = nil
    }
@@ -575,11 +444,17 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
        let bridgeClass: AnyClass = _CoreStoreObjectKeyValueObservation.self
        let rootObserveImpl = class_getInstanceMethod(
            bridgeClass,
-            #selector(_CoreStoreObjectKeyValueObservation.observeValue(forKeyPath:of:change:context:))
+            #selector(
                _CoreStoreObjectKeyValueObservation
                    .observeValue(forKeyPath:of:change:context:)
            )
        )!
        let swapObserveImpl = class_getInstanceMethod(
            bridgeClass,
-            #selector(_CoreStoreObjectKeyValueObservation._cs_swizzle_me_observeValue(forKeyPath:of:change:context:))
+            #selector(
                _CoreStoreObjectKeyValueObservation
                    ._cs_swizzle_me_observeValue(forKeyPath:of:change:context:)
            )
        )!
        method_exchangeImplementations(rootObserveImpl, swapObserveImpl)
        return nil
@@ -589,21 +464,33 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
    private weak var object: CoreStoreManagedObject?
    @nonobjc
-    private let callback: (_ object: CoreStoreManagedObject, _ kind: NSKeyValueChange, _ newValue: Any?, _ oldValue: Any?, _ indexes: IndexSet?, _ isPrior: Bool) -> Void
+    private let callback: (
        _ object: CoreStoreManagedObject,
        _ kind: NSKeyValueChange,
        _ newValue: Any?,
        _ oldValue: Any?,
        _ indexes: IndexSet?,
        _ isPrior: Bool
    ) -> Void
    @nonobjc
    private let keyPath: KeyPathString
    @objc
-    private dynamic func _cs_swizzle_me_observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSString: Any]?, context: UnsafeMutableRawPointer?) {
+    private dynamic func _cs_swizzle_me_observeValue(
        forKeyPath keyPath: String?,
        of object: Any?,
        change: [NSString: Any]?,
        context: UnsafeMutableRawPointer?
    ) {
        guard
            let object = object as? CoreStoreManagedObject,
            object == self.object,
            let change = change
-            else {
+        else {
-                return
+            return
        }
        let rawKind: UInt = change[NSKeyValueChangeKey.kindKey.rawValue as NSString] as! UInt
        self.callback(
@@ -616,3 +503,138 @@ fileprivate final class _CoreStoreObjectKeyValueObservation: NSObject, CoreStore
        )
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension ValueContainer.Required {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectValueDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension ValueContainer.Optional {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectValueDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension TransformableContainer.Required {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectTransformableDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension TransformableContainer.Optional {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectTransformableDiff<V>) -> Void) -> CoreStoreObjectKeyValueObservation {
        return self.observe(with: options, changeHandler: changeHandler)
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer.ToOne {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectObjectDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, _, isPrior) in
                let notification = CoreStoreObjectObjectDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! CoreStoreManagedObject?,
                    oldNativeValue: oldValue as! CoreStoreManagedObject?,
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer.ToManyUnordered {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectUnorderedDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, _, isPrior) in
                let notification = CoreStoreObjectUnorderedDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! NSOrderedSet?,
                    oldNativeValue: oldValue as! NSOrderedSet?,
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer.ToManyOrdered {
    public func observe(options: NSKeyValueObservingOptions = [], changeHandler: @escaping (O, CoreStoreObjectOrderedDiff<D>) -> Void) -> CoreStoreObjectKeyValueObservation {
        let result = _CoreStoreObjectKeyValueObservation(
            object: self.rawObject!,
            keyPath: self.keyPath,
            callback: { (object, kind, newValue, oldValue, indexes, isPrior) in
                let notification = CoreStoreObjectOrderedDiff<D>(
                    kind: kind,
                    newNativeValue: newValue as! NSArray?,
                    oldNativeValue: oldValue as! NSArray?,
                    indexes: indexes ?? IndexSet(),
                    isPrior: isPrior
                )
                changeHandler(
                    O.cs_fromRaw(object: object),
                    notification
                )
            }
        )
        result.start(options)
        return result
    }
 }
--- a/Sources/CoreStoreObject+Querying.swift
+++ b/Sources/CoreStoreObject+Querying.swift
@@ -36,9 +36,15 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname == "John" }))
     ```
     */
-    public static func == (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func == (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return Where(attribute.keyPath, isEqualTo: value)
+        return Where(
            attribute.keyPath,
            isEqualTo: value
        )
    }
    /**
@@ -47,9 +53,15 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname != "John" }))
     ```
     */
-    public static func != (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func != (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return !Where(attribute.keyPath, isEqualTo: value)
+        return !Where(
            attribute.keyPath,
            isEqualTo: value
        )
    }
    /**
@@ -58,9 +70,16 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.age < 20 }))
     ```
     */
-    public static func < (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func < (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return Where("%K < %@", attribute.keyPath, value.cs_toFieldStoredNativeType() as Any)
+        return Where(
            "%K < %@",
            attribute.keyPath,
            value.cs_toFieldStoredNativeType() as Any
        )
    }
    /**
@@ -69,9 +88,16 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.age > 20 }))
     ```
     */
-    public static func > (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func > (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return Where("%K > %@", attribute.keyPath, value.cs_toFieldStoredNativeType() as Any)
+        return Where(
            "%K > %@",
            attribute.keyPath,
            value.cs_toFieldStoredNativeType() as Any
        )
    }
    /**
@@ -80,9 +106,16 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.age <= 20 }))
     ```
     */
-    public static func <= (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func <= (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return Where("%K <= %@", attribute.keyPath, value.cs_toFieldStoredNativeType() as Any)
+        return Where(
            "%K <= %@",
            attribute.keyPath,
            value.cs_toFieldStoredNativeType() as Any
        )
    }
    /**
@@ -91,9 +124,16 @@ extension FieldContainer.Stored {
     let person = dataStack.fetchOne(From<Person>().where({ $0.age >= 20 }))
     ```
     */
-    public static func >= (_ attribute: Self, _ value: V) -> Where<O> {
+    public static func >= (
        _ attribute: Self,
        _ value: V
    ) -> Where<O> {
-        return Where("%K >= %@", attribute.keyPath, value.cs_toFieldStoredNativeType() as Any)
+        return Where(
            "%K >= %@",
            attribute.keyPath,
            value.cs_toFieldStoredNativeType() as Any
        )
    }
    /**
@@ -102,127 +142,76 @@ extension FieldContainer.Stored {
     let dog = dataStack.fetchOne(From<Dog>().where({ ["Pluto", "Snoopy", "Scooby"] ~= $0.nickname }))
     ```
     */
-    public static func ~= <S: Sequence>(_ sequence: S, _ attribute: Self) -> Where<O> where S.Iterator.Element == V {
+    public static func ~= <S: Sequence>(
        _ sequence: S,
        _ attribute: Self
    ) -> Where<O> where S.Iterator.Element == V {
-        return Where(attribute.keyPath, isMemberOf: sequence)
+        return Where(
            attribute.keyPath,
            isMemberOf: sequence
        )
    }
 }
-// MARK: - ValueContainer.Required
+// MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension ValueContainer.Required {
    /**
     Creates a `Where` clause by comparing if a property is equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname == "John" }))
     ```
     */
    public static func == (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return Where(attribute.keyPath, isEqualTo: value)
    }
    /**
     Creates a `Where` clause by comparing if a property is not equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname != "John" }))
     ```
     */
    public static func != (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return !Where(attribute.keyPath, isEqualTo: value)
    }
    /**
     Creates a `Where` clause by comparing if a property is less than a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age < 20 }))
     ```
     */
    public static func < (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return Where("%K < %@", attribute.keyPath, value.cs_toQueryableNativeType())
    }
    /**
     Creates a `Where` clause by comparing if a property is greater than a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age > 20 }))
     ```
     */
    public static func > (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return Where("%K > %@", attribute.keyPath, value.cs_toQueryableNativeType())
    }
    /**
     Creates a `Where` clause by comparing if a property is less than or equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age <= 20 }))
     ```
     */
    public static func <= (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return Where("%K <= %@", attribute.keyPath, value.cs_toQueryableNativeType())
    }
    /**
     Creates a `Where` clause by comparing if a property is greater than or equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age >= 20 }))
     ```
     */
    public static func >= (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
        return Where("%K >= %@", attribute.keyPath, value.cs_toQueryableNativeType())
    }
    /**
     Creates a `Where` clause by checking if a sequence contains the value of a property
     ```
     let dog = dataStack.fetchOne(From<Dog>().where({ ["Pluto", "Snoopy", "Scooby"] ~= $0.nickname }))
     ```
     */
    public static func ~= <S: Sequence>(_ sequence: S, _ attribute: ValueContainer<O>.Required<V>) -> Where<O> where S.Iterator.Element == V {
        return Where(attribute.keyPath, isMemberOf: sequence)
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - ValueContainer.Optional
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension ValueContainer.Optional {
    /**
     Creates a `Where` clause by comparing if a property is equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname == "John" }))
     ```
     */
    public static func == (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        return Where(attribute.keyPath, isEqualTo: value)
    }
    /**
     Creates a `Where` clause by comparing if a property is not equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname != "John" }))
     ```
     */
    public static func != (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        return !Where(attribute.keyPath, isEqualTo: value)
    }
    /**
     Creates a `Where` clause by comparing if a property is less than a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age < 20 }))
     ```
     */
    public static func < (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        if let value = value {
@@ -235,12 +224,6 @@ extension ValueContainer.Optional {
        }
    }
    /**
     Creates a `Where` clause by comparing if a property is greater than a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age > 20 }))
     ```
     */
    public static func > (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        if let value = value {
@@ -253,12 +236,6 @@ extension ValueContainer.Optional {
        }
    }
    /**
     Creates a `Where` clause by comparing if a property is less than or equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age <= 20 }))
     ```
     */
    public static func <= (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        if let value = value {
@@ -271,12 +248,6 @@ extension ValueContainer.Optional {
        }
    }
    /**
     Creates a `Where` clause by comparing if a property is greater than or equal to a value
     ```
     let person = dataStack.fetchOne(From<Person>().where({ $0.age >= 20 }))
     ```
     */
    public static func >= (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
        if let value = value {
@@ -289,51 +260,27 @@ extension ValueContainer.Optional {
        }
    }
    /**
     Creates a `Where` clause by checking if a sequence contains the value of a property
     ```
     let dog = dataStack.fetchOne(From<Dog>().where({ ["Pluto", "Snoopy", "Scooby"] ~= $0.nickname }))
     ```
     */
    public static func ~= <S: Sequence>(_ sequence: S, _ attribute: ValueContainer<O>.Optional<V>) -> Where<O> where S.Iterator.Element == V {
        return Where(attribute.keyPath, isMemberOf: sequence)
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - RelationshipContainer.ToOne
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension RelationshipContainer.ToOne {
    /**
     Creates a `Where` clause by comparing if a property is equal to a value
     ```
     let dog = dataStack.fetchOne(From<Dog>().where({ $0.master == me }))
     ```
     */
    public static func == (_ relationship: RelationshipContainer<O>.ToOne<D>, _ object: D?) -> Where<O> {
        return Where(relationship.keyPath, isEqualTo: object)
    }
    /**
     Creates a `Where` clause by comparing if a property is not equal to a value
     ```
     let dog = dataStack.fetchOne(From<Dog>().where({ $0.master != me }))
     ```
     */
    public static func != (_ relationship: RelationshipContainer<O>.ToOne<D>, _ object: D?) -> Where<O> {
        return !Where(relationship.keyPath, isEqualTo: object)
    }
    /**
     Creates a `Where` clause by checking if a sequence contains the value of a property
     ```
     let dog = dataStack.fetchOne(From<Dog>().where({ [john, joe, bob] ~= $0.master }))
     ```
     */
    public static func ~= <S: Sequence>(_ sequence: S, _ relationship: RelationshipContainer<O>.ToOne<D>) -> Where<O> where S.Iterator.Element == D {
        return Where(relationship.keyPath, isMemberOf: sequence)
--- a/Sources/CoreStoreObject.swift
+++ b/Sources/CoreStoreObject.swift
@@ -129,7 +129,10 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
    internal class func metaProperties(includeSuperclasses: Bool) -> [PropertyProtocol] {
-        func keyPaths(_ allKeyPaths: inout [PropertyProtocol], for dynamicType: CoreStoreObject.Type) {
+        func keyPaths(
            _ allKeyPaths: inout [PropertyProtocol],
            for dynamicType: CoreStoreObject.Type
        ) {
            allKeyPaths.append(contentsOf: dynamicType.meta.propertyProtocolsByName())
            guard
@@ -151,7 +154,10 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
    // MARK: Private
-    private func containsLegacyAttributes(mirror: Mirror, object: CoreStoreObject) -> Bool {
+    private func containsLegacyAttributes(
        mirror: Mirror,
        object: CoreStoreObject
    ) -> Bool {
        if let superclassMirror = mirror.superclassMirror,
            self.containsLegacyAttributes(mirror: superclassMirror, object: object) {
@@ -175,8 +181,11 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
        return false
    }
-    private func registerReceiver(mirror: Mirror, object: CoreStoreObject) {
+    private func registerReceiver(
-        
+        mirror: Mirror,
        object: CoreStoreObject
    ) {
        if let superclassMirror = mirror.superclassMirror {
            self.registerReceiver(
--- a/Sources/CoreStoreSchema.swift
+++ b/Sources/CoreStoreSchema.swift
@@ -94,8 +94,12 @@ public final class CoreStoreSchema: DynamicSchema {
     - parameter entities: an array of `Entity<T>` pertaining to all `CoreStoreObject` subclasses to be added to the schema version.
     - parameter versionLock: an optional list of `VersionLock` hashes for each entity name in the `entities` array. If any `DynamicEntity` doesn't match its version lock hash, an assertion will be raised.
     */
-    public convenience init(modelVersion: ModelVersion, entities: [DynamicEntity], versionLock: VersionLock? = nil) {
+    public convenience init(
-        
+        modelVersion: ModelVersion,
        entities: [DynamicEntity],
        versionLock: VersionLock? = nil
    ) {
        var entityConfigurations: [DynamicEntity: Set<String>] = [:]
        for entity in entities {
@@ -138,8 +142,12 @@ public final class CoreStoreSchema: DynamicSchema {
     - parameter entityConfigurations: a dictionary with `Entity<T>` pertaining to all `CoreStoreObject` subclasses  and the corresponding list of "Configurations" they should be added to. To add an entity only to the default configuration, assign an empty set to its configurations list. Note that regardless of the set configurations, all entities will be added to the default configuration.
     - parameter versionLock: an optional list of `VersionLock` hashes for each entity name in the `entities` array. If any `DynamicEntity` doesn't match its version lock hash, an assertion will be raised.
     */
-    public required init(modelVersion: ModelVersion, entityConfigurations: [DynamicEntity: Set<String>], versionLock: VersionLock? = nil) {
+    public required init(
-        
+        modelVersion: ModelVersion,
        entityConfigurations: [DynamicEntity: Set<String>],
        versionLock: VersionLock? = nil
    ) {
        var actualEntitiesByConfiguration: [String: Set<DynamicEntity>] = [:]
        for (entity, configurations) in entityConfigurations {
@@ -305,7 +313,10 @@ public final class CoreStoreSchema: DynamicSchema {
        )
    }
-    private static func firstPassCreateEntityDescription(from entity: DynamicEntity, in modelVersion: ModelVersion) -> (
+    private static func firstPassCreateEntityDescription(
        from entity: DynamicEntity,
        in modelVersion: ModelVersion
    ) -> (
        entity: NSEntityDescription,
        customGetterSetterByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomGetterSetter],
        customInitializerByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomInitializer],
@@ -323,8 +334,11 @@ public final class CoreStoreSchema: DynamicSchema {
        var customInitialValuesByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomInitializer] = [:]
        var customGetterSetterByKeyPaths: [KeyPathString: CoreStoreManagedObject.CustomGetterSetter] = [:]
        var fieldCoders: [KeyPathString: Internals.AnyFieldCoder] = [:]
-        func createProperties(for type: CoreStoreObject.Type) -> [NSPropertyDescription] {
+
-            
+        func createProperties(
            for type: CoreStoreObject.Type
        ) -> [NSPropertyDescription] {
            var propertyDescriptions: [NSPropertyDescription] = []
            for property in type.metaProperties(includeSuperclasses: false) {
@@ -425,15 +439,20 @@ public final class CoreStoreSchema: DynamicSchema {
        )
    }
-    private static func secondPassConnectRelationshipAttributes(for entityDescriptionsByEntity: [DynamicEntity: NSEntityDescription]) {
+    private static func secondPassConnectRelationshipAttributes(
-        
+        for entityDescriptionsByEntity: [DynamicEntity: NSEntityDescription]
    ) {
        var relationshipsByNameByEntity: [DynamicEntity: [String: NSRelationshipDescription]] = [:]
        for (entity, entityDescription) in entityDescriptionsByEntity {
            relationshipsByNameByEntity[entity] = entityDescription.relationshipsByName
        }
-        func findEntity(for type: CoreStoreObject.Type) -> DynamicEntity {
+
-            
+        func findEntity(
            for type: CoreStoreObject.Type
        ) -> DynamicEntity {
            var matchedEntities: Set<DynamicEntity> = []
            for (entity, _) in entityDescriptionsByEntity where entity.type == type {
@@ -457,8 +476,11 @@ public final class CoreStoreSchema: DynamicSchema {
            }
        }
-        func findInverseRelationshipMatching(destinationEntity: DynamicEntity, destinationKeyPath: String) -> NSRelationshipDescription {
+        func findInverseRelationshipMatching(
-            
+            destinationEntity: DynamicEntity,
            destinationKeyPath: String
        ) -> NSRelationshipDescription {
            for case (destinationKeyPath, let relationshipDescription) in relationshipsByNameByEntity[destinationEntity]! {
                return relationshipDescription
@@ -537,10 +559,15 @@ public final class CoreStoreSchema: DynamicSchema {
        }
    }
-    private static func thirdPassConnectInheritanceTreeAndIndexes(for entityDescriptionsByEntity: [DynamicEntity: NSEntityDescription]) {
+    private static func thirdPassConnectInheritanceTreeAndIndexes(
-        
+        for entityDescriptionsByEntity: [DynamicEntity: NSEntityDescription]
-        func connectBaseEntity(mirror: Mirror, entityDescription: NSEntityDescription) {
+    ) {
-            
+
        func connectBaseEntity(
            mirror: Mirror,
            entityDescription: NSEntityDescription
        ) {
            guard let superclassMirror = mirror.superclassMirror,
                let superType = superclassMirror.subjectType as? CoreStoreObject.Type,
                superType != CoreStoreObject.self else {
@@ -636,13 +663,6 @@ public final class CoreStoreSchema: DynamicSchema {
            }
            let managedObjectClass: AnyClass = className.withCString {
                // Xcode 10.1+ users: You may find this comment due to a crash while debugging on an iPhone XR device (or any A12 device).
                // This is a known issue that should not occur in archived builds, as the AppStore strips away arm64e build architectures from the binary. So while it crashes on DEBUG, it shouldn't be an issue for live users.
                // In the meantime, please submit a bug report to Apple and refer to similar discussions here:
                // - https://github.com/realm/realm-cocoa/issues/6013
                // - https://github.com/wordpress-mobile/WordPress-iOS/pull/10400
                // - https://github.com/JohnEstropia/CoreStore/issues/291
                // If you wish to debug with A12 devices, please use Xcode 10.0 for now.
                return objc_allocateClassPair(superClass, $0, 0)!
            }
            defer {
--- a/Sources/CustomSchemaMappingProvider.swift
+++ b/Sources/CustomSchemaMappingProvider.swift
@@ -51,8 +51,12 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
     - parameter destinationVersion: the destination model version for the mapping
     - parameter entityMappings: a list of `CustomMapping`s. Mappings of entities with no `CustomMapping` provided will be automatically calculated if possible. Any conflicts or ambiguity will raise an assertion.
     */
-    public required init(from sourceVersion: ModelVersion, to destinationVersion: ModelVersion, entityMappings: Set<CustomMapping> = []) {
+    public required init(
-        
+        from sourceVersion: ModelVersion,
        to destinationVersion: ModelVersion,
        entityMappings: Set<CustomMapping> = []
    ) {
        Internals.assert(
            Internals.with {
@@ -101,13 +105,19 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
         - parameter sourceObject: a proxy object representing the source entity. The properties can be accessed via keyPath.
         - parameter createDestinationObject: the closure to create the object for the destination entity. The `CustomMapping.inferredTransformation` method can be used directly as the `transformer` if the changes can be inferred (i.e. lightweight). The object is created lazily and executing the closure multiple times will return the same instance. The destination object's properties can be accessed and updated via keyPath.
         */
-        public typealias Transformer = (_ sourceObject: UnsafeSourceObject, _ createDestinationObject: () -> UnsafeDestinationObject) throws -> Void
+        public typealias Transformer = (
-        
+            _ sourceObject: UnsafeSourceObject,
            _ createDestinationObject: () -> UnsafeDestinationObject
        ) throws(any Swift.Error) -> Void
        /**
         The `CustomMapping.inferredTransformation` method can be used directly as the `transformer` if the changes can be inferred (i.e. lightweight).
         */
-        public static func inferredTransformation(_ sourceObject: UnsafeSourceObject, _ createDestinationObject: () -> UnsafeDestinationObject) throws -> Void {
+        public static func inferredTransformation(
-            
+            _ sourceObject: UnsafeSourceObject,
            _ createDestinationObject: () -> UnsafeDestinationObject
        ) throws(any Swift.Error) {
            let destinationObject = createDestinationObject()
            destinationObject.enumerateAttributes { (attribute, sourceAttribute) in
@@ -343,8 +353,15 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
    // MARK: SchemaMappingProvider
-    public func cs_createMappingModel(from sourceSchema: DynamicSchema, to destinationSchema: DynamicSchema, storage: LocalStorage) throws -> (mappingModel: NSMappingModel, migrationType: MigrationType) {
+    public func cs_createMappingModel(
-        
+        from sourceSchema: DynamicSchema,
        to destinationSchema: DynamicSchema,
        storage: LocalStorage
    ) throws(CoreStoreError) -> (
        mappingModel: NSMappingModel,
        migrationType: MigrationType
    ) {
        let sourceModel = sourceSchema.rawModel()
        let destinationModel = destinationSchema.rawModel()
@@ -535,8 +552,12 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
        // MARK: NSEntityMigrationPolicy
-        override func createDestinationInstances(forSource sInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        override func createDestinationInstances(
-            
+            forSource sInstance: NSManagedObject,
            in mapping: NSEntityMapping,
            manager: NSMigrationManager
        ) throws(any Swift.Error) {
            let userInfo = mapping.userInfo!
            let transformer = userInfo[CustomEntityMigrationPolicy.UserInfoKey.transformer]! as! CustomMapping.Transformer
            let sourceAttributesByDestinationKey = userInfo[CustomEntityMigrationPolicy.UserInfoKey.sourceAttributesByDestinationKey] as! [KeyPathString: NSAttributeDescription]
@@ -563,8 +584,12 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
            }
        }
-        override func createRelationships(forDestination dInstance: NSManagedObject, in mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        override func createRelationships(
-            
+            forDestination dInstance: NSManagedObject,
            in mapping: NSEntityMapping,
            manager: NSMigrationManager
        ) throws(any Swift.Error) {
            try super.createRelationships(forDestination: dInstance, in: mapping, manager: manager)
        }
@@ -583,8 +608,16 @@ public class CustomSchemaMappingProvider: Hashable, SchemaMappingProvider {
    private let entityMappings: Set<CustomMapping>
-    private func resolveEntityMappings(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel) -> (delete: Set<CustomMapping>, insert: Set<CustomMapping>, copy: Set<CustomMapping>, transform: Set<CustomMapping>) {
+    private func resolveEntityMappings(
-        
+        sourceModel: NSManagedObjectModel,
        destinationModel: NSManagedObjectModel
    ) -> (
        delete: Set<CustomMapping>,
        insert: Set<CustomMapping>,
        copy: Set<CustomMapping>,
        transform: Set<CustomMapping>
    ) {
        var deleteMappings: Set<CustomMapping> = []
        var insertMappings: Set<CustomMapping> = []
        var copyMappings: Set<CustomMapping> = []
--- a/Sources/DataStack+Concurrency.swift
+++ b/Sources/DataStack+Concurrency.swift
@@ -85,13 +85,16 @@ extension DataStack.AsyncNamespace {
     */
    public func addStorage<T: StorageInterface>(
        _ storage: T
-    ) async throws -> T {
+    ) async throws(any Swift.Error) -> T {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.addStorage(
                storage,
-                completion: continuation.resume(with:)
+                completion: {
                    continuation.resume(with: $0)
                }
            )
        }
    }
@@ -115,7 +118,7 @@ extension DataStack.AsyncNamespace {
     */
    public func addStorage<T>(
        _ storage: T
-    ) -> AsyncThrowingStream<MigrationProgress<T>, Swift.Error> {
+    ) -> AsyncThrowingStream<MigrationProgress<T>, any Swift.Error> {
        return .init(
            bufferingPolicy: .unbounded,
@@ -178,9 +181,9 @@ extension DataStack.AsyncNamespace {
    public func importObject<O: DynamicObject & ImportableObject>(
        _ into: Into<O>,
        source: O.ImportSource
-    ) async throws -> O? {
+    ) async throws(any Swift.Error) -> O? {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.perform(
                asynchronous: { (transaction) -> O? in
@@ -217,9 +220,9 @@ extension DataStack.AsyncNamespace {
    public func importObject<O: DynamicObject & ImportableObject>(
        _ object: O,
        source: O.ImportSource
-    ) async throws -> O? {
+    ) async throws(any Swift.Error) -> O? {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.perform(
                asynchronous: { (transaction) -> O? in
@@ -261,9 +264,9 @@ extension DataStack.AsyncNamespace {
    public func importUniqueObject<O: DynamicObject & ImportableUniqueObject>(
        _ into: Into<O>,
        source: O.ImportSource
-    ) async throws -> O? {
+    ) async throws(any Swift.Error) -> O? {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.perform(
                asynchronous: { (transaction) -> O? in
@@ -306,11 +309,13 @@ extension DataStack.AsyncNamespace {
    public func importUniqueObjects<O: DynamicObject & ImportableUniqueObject, S: Sequence>(
        _ into: Into<O>,
        sourceArray: S,
-        preProcess: @escaping @Sendable (_ mapping: [O.UniqueIDType: O.ImportSource]) throws -> [O.UniqueIDType: O.ImportSource] = { $0 }
+        preProcess: @escaping @Sendable (
-    ) async throws -> [O]
+            _ mapping: [O.UniqueIDType: O.ImportSource]
        ) throws(any Swift.Error) -> [O.UniqueIDType: O.ImportSource] = { $0 }
    ) async throws(any Swift.Error) -> [O]
    where S.Iterator.Element == O.ImportSource {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.perform(
                asynchronous: { (transaction) -> [O] in
@@ -353,14 +358,17 @@ extension DataStack.AsyncNamespace {
     - throws: A `CoreStoreError` value indicating the failure reason
     */
    public func perform<Output>(
-        _ asynchronous: @escaping @Sendable (AsynchronousDataTransaction) throws -> Output
+        _ asynchronous: @escaping @Sendable (AsynchronousDataTransaction) throws(any Swift.Error) -> Output
-    ) async throws -> Output {
+    ) async throws(any Swift.Error) -> Output {
-        return try await withCheckedThrowingContinuation { continuation in
+        return try await Internals.withCheckedThrowingContinuation { continuation in
            self.base.perform(
                asynchronous: asynchronous,
-                completion: continuation.resume(with:)
+                completion: {
                    continuation.resume(with: $0)
                }
            )
        }
    }
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -39,7 +39,9 @@ extension DataStack {
     - parameter object: the `DynamicObject` to observe changes from
     - returns: an `ObjectPublisher` that broadcasts changes to `object`
     */
-    public func publishObject<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
+    public func publishObject<O: DynamicObject>(
        _ object: O
    ) -> ObjectPublisher<O> {
        return self.publishObject(object.cs_id())
    }
@@ -50,7 +52,9 @@ extension DataStack {
     - parameter objectID: the `ObjectID` of the object to observe changes from
     - returns: an `ObjectPublisher` that broadcasts changes to `object`
     */
-    public func publishObject<O: DynamicObject>(_ objectID: O.ObjectID) -> ObjectPublisher<O> {
+    public func publishObject<O: DynamicObject>(
        _ objectID: O.ObjectID
    ) -> ObjectPublisher<O> {
        let context = self.unsafeContext()
        return context.objectPublisher(objectID: objectID)
@@ -74,7 +78,9 @@ extension DataStack {
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
+    public func publishList<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) -> ListPublisher<B.ObjectType> {
        return self.publishList(
            clauseChain.from,
@@ -101,7 +107,9 @@ extension DataStack {
     - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
+    public func publishList<B: SectionMonitorBuilderType>(
        _ clauseChain: B
    ) -> ListPublisher<B.ObjectType> {
        return self.publishList(
            clauseChain.from,
@@ -117,7 +125,10 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
+    public func publishList<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) -> ListPublisher<O> {
        return self.publishList(from, fetchClauses)
    }
@@ -129,7 +140,10 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
+    public func publishList<O>(
        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) -> ListPublisher<O> {
        return ListPublisher(
            dataStack: self,
@@ -155,7 +169,11 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
+    public func publishList<O>(
        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: FetchClause...
    ) -> ListPublisher<O> {
        return self.publishList(
            from,
@@ -172,7 +190,11 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListPublisher` that broadcasts changes to the fetched results
     */
-    public func publishList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
+    public func publishList<O>(
        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: [FetchClause]
    ) -> ListPublisher<O> {
        return ListPublisher(
            dataStack: self,
@@ -189,51 +211,6 @@ extension DataStack {
            }
        )
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "publishObject(_:)")
    public func objectPublisher<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
        return self.publishObject(object)
    }
    @available(*, deprecated, renamed: "publishList(_:_:)")
    public func listPublisher<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
        return self.publishList(from, fetchClauses)
    }
    @available(*, deprecated, renamed: "publishList(_:_:)")
    public func listPublisher<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
        return self.publishList(from, fetchClauses)
    }
    @available(*, deprecated, renamed: "publishList(_:)")
    public func listPublisher<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
        return self.publishList(clauseChain)
    }
    @available(*, deprecated, renamed: "publishList(_:_:_:)")
    public func listPublisher<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
        return self.publishList(from, sectionBy, fetchClauses)
    }
    @available(*, deprecated, renamed: "publishList(_:_:_:)")
    public func listPublisher<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
        return self.publishList(from, sectionBy, fetchClauses)
    }
    @available(*, deprecated, renamed: "publishList(_:)")
    public func listPublisher<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
        return self.publishList(clauseChain)
    }
 }
 #endif
--- a/Sources/DataStack+Migration.swift
+++ b/Sources/DataStack+Migration.swift
@@ -47,8 +47,11 @@ extension DataStack {
     - parameter storage: the storage
     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `SetupResult` argument indicates the result. Note that the `StorageInterface` associated to the `SetupResult.success` may not always be the same instance as the parameter argument if a previous `StorageInterface` was already added at the same URL and with the same configuration.
     */
-    public func addStorage<T>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) {
+    public func addStorage<T>(
-        
+        _ storage: T,
        completion: @escaping (SetupResult<T>) -> Void
    ) {
        self.coordinator.performAsynchronously {
            if let _ = self.persistentStoreForStorage(storage) {
@@ -105,8 +108,11 @@ extension DataStack {
     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `SetupResult` argument indicates the result. Note that the `LocalStorage` associated to the `SetupResult.success` may not always be the same instance as the parameter argument if a previous `LocalStorage` was already added at the same URL and with the same configuration.
     - returns: a `Progress` instance if a migration has started, or `nil` if either no migrations are required or if a failure occured.
     */
-    public func addStorage<T: LocalStorage>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) -> Progress? {
+    public func addStorage<T: LocalStorage>(
-        
+        _ storage: T,
        completion: @escaping (SetupResult<T>) -> Void
    ) -> Progress? {
        let fileURL = storage.fileURL
        Internals.assert(
            fileURL.isFileURL,
@@ -256,8 +262,11 @@ extension DataStack {
     - throws: a `CoreStoreError` value indicating the failure
     - returns: a `Progress` instance if a migration has started, or `nil` is no migrations are required
     */
-    public func upgradeStorageIfNeeded<T: LocalStorage>(_ storage: T, completion: @escaping (MigrationResult) -> Void) throws -> Progress? {
+    public func upgradeStorageIfNeeded<T: LocalStorage>(
-        
+        _ storage: T,
        completion: @escaping (MigrationResult) -> Void
    ) throws(CoreStoreError) -> Progress? {
        return try self.coordinator.performSynchronously {
            let fileURL = storage.fileURL
@@ -298,8 +307,10 @@ extension DataStack {
     - throws: a `CoreStoreError` value indicating the failure
     - returns: a `MigrationType` array indicating the migration steps required for the store, or an empty array if the file does not exist yet. Otherwise, an error is thrown if either inspection of the store failed, or if no mapping model was found/inferred.
     */
-    public func requiredMigrationsForStorage<T: LocalStorage>(_ storage: T) throws -> [MigrationType] {
+    public func requiredMigrationsForStorage<T: LocalStorage>(
-        
+        _ storage: T
    ) throws(CoreStoreError) -> [MigrationType] {
        return try self.coordinator.performSynchronously {
            let fileURL = storage.fileURL
@@ -362,8 +373,12 @@ extension DataStack {
    // MARK: Private
-    private func upgradeStorageIfNeeded<T: LocalStorage>(_ storage: T, metadata: [String: Any], completion: @escaping (MigrationResult) -> Void) -> Progress? {
+    private func upgradeStorageIfNeeded<T: LocalStorage>(
-        
+        _ storage: T,
        metadata: [String: Any],
        completion: @escaping (MigrationResult) -> Void
    ) -> Progress? {
        guard let migrationSteps = self.computeMigrationFromStorage(storage, metadata: metadata) else {
            let error = CoreStoreError.mappingModelNotFound(
@@ -485,35 +500,38 @@ extension DataStack {
        return progress
    }
-    private func computeMigrationFromStorage<T: LocalStorage>(_ storage: T, metadata: [String: Any]) -> [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]? {
+    private func computeMigrationFromStorage<T: LocalStorage>(
-        
+        _ storage: T,
        metadata: [String: Any]
    ) -> [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]? {
        let schemaHistory = self.schemaHistory
        if schemaHistory.rawModel.isConfiguration(withName: storage.configuration, compatibleWithStoreMetadata: metadata) {
-            
+
            return []
        }
-        
+
        guard let initialSchema = schemaHistory.schema(for: metadata) else {
-            
+
            return nil
        }
        var currentVersion = initialSchema.modelVersion
        let migrationChain: MigrationChain = schemaHistory.migrationChain.isEmpty
            ? [currentVersion: schemaHistory.currentModelVersion]
            : schemaHistory.migrationChain
-        
+
        var migrationSteps = [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]()
-        
+
        while let nextVersion = migrationChain.nextVersionFrom(currentVersion),
            let sourceSchema = schemaHistory.schema(for: currentVersion),
            sourceSchema.modelVersion != schemaHistory.currentModelVersion,
            let destinationSchema = schemaHistory.schema(for: nextVersion) {
-                
+
                let mappingProviders = storage.migrationMappingProviders
                do {
-                    
+
                    try withExtendedLifetime((sourceSchema.rawModel(), destinationSchema.rawModel())) {
-                        
+
                        let (sourceModel, destinationModel) = $0
                        let mapping = try mappingProviders.findMapping(
                            sourceSchema: sourceSchema,
@@ -531,22 +549,29 @@ extension DataStack {
                    }
                }
                catch {
-                    
+
                    return nil
                }
                currentVersion = nextVersion
        }
-        
+
        if migrationSteps.last?.destinationModel == schemaHistory.rawModel {
-            
+
            return migrationSteps
        }
-        
+
        return nil
    }
-    private func startMigrationForStorage<T: LocalStorage>(_ storage: T, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType, progress: Progress) throws {
+    private func startMigrationForStorage<T: LocalStorage>(
-        
+        _ storage: T,
        sourceModel: NSManagedObjectModel,
        destinationModel: NSManagedObjectModel,
        mappingModel: NSMappingModel,
        migrationType: MigrationType,
        progress: Progress
    ) throws(CoreStoreError) {
        do {
            try storage.cs_finalizeStorageAndWait(soureModelHint: sourceModel)
@@ -703,8 +728,12 @@ extension DataStack {
 extension Array where Element == SchemaMappingProvider {
-    func findMapping(sourceSchema: DynamicSchema, destinationSchema: DynamicSchema, storage: LocalStorage) throws -> (mappingModel: NSMappingModel, migrationType: MigrationType) {
+    func findMapping(
-        
+        sourceSchema: DynamicSchema,
        destinationSchema: DynamicSchema,
        storage: LocalStorage
    ) throws(CoreStoreError) -> (mappingModel: NSMappingModel, migrationType: MigrationType) {
        for element in self {
            switch element {
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -37,8 +37,10 @@ extension DataStack {
     - parameter object: the `DynamicObject` to observe changes from
     - returns: an `ObjectMonitor` that monitors changes to `object`
     */
-    public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
+    public func monitorObject<O: DynamicObject>(
-        
+        _ object: O
    ) -> ObjectMonitor<O> {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
@@ -53,8 +55,11 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
     */
-    public func monitorList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
+    public func monitorList<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) -> ListMonitor<O> {
        return self.monitorList(from, fetchClauses)
    }
@@ -65,8 +70,11 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
     */
-    public func monitorList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
+    public func monitorList<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) -> ListMonitor<O> {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
@@ -99,8 +107,10 @@ extension DataStack {
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
     */
-    public func monitorList<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListMonitor<B.ObjectType> {
+    public func monitorList<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) -> ListMonitor<B.ObjectType> {
        return self.monitorList(
            clauseChain.from,
            clauseChain.fetchClauses
@@ -114,8 +124,12 @@ extension DataStack {
     - parameter from: a `From` clause indicating the entity type
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     */
-    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: FetchClause...) {
+    public func monitorList<O>(
-        
+        createAsynchronously: @escaping (ListMonitor<O>) -> Void,
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) {
        self.monitorList(
            createAsynchronously: createAsynchronously,
            from,
@@ -130,8 +144,12 @@ extension DataStack {
     - parameter from: a `From` clause indicating the entity type
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     */
-    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: [FetchClause])  {
+    public func monitorList<O>(
-        
+        createAsynchronously: @escaping (ListMonitor<O>) -> Void,
        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    )  {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
@@ -169,8 +187,11 @@ extension DataStack {
     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     */
-    public func monitorList<B: FetchChainableBuilderType>(createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void, _ clauseChain: B) {
+    public func monitorList<B: FetchChainableBuilderType>(
-        
+        createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void,
        _ clauseChain: B
    ) {
        self.monitorList(
            createAsynchronously: createAsynchronously,
            clauseChain.from,
@@ -186,8 +207,12 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
     */
-    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
+    public func monitorSectionedList<O>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: FetchClause...
    ) -> ListMonitor<O> {
        return self.monitorSectionedList(
            from,
            sectionBy,
@@ -203,8 +228,12 @@ extension DataStack {
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     - returns: a `ListMonitor` instance that monitors changes to the list
     */
-    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
+    public func monitorSectionedList<O>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: [FetchClause]
    ) -> ListMonitor<O> {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
@@ -239,8 +268,10 @@ extension DataStack {
     - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
     - returns: a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified `SectionMonitorBuilderType`
     */
-    public func monitorSectionedList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListMonitor<B.ObjectType> {
+    public func monitorSectionedList<B: SectionMonitorBuilderType>(
-        
+        _ clauseChain: B
    ) -> ListMonitor<B.ObjectType> {
        return self.monitorSectionedList(
            clauseChain.from,
            clauseChain.sectionBy,
@@ -256,8 +287,13 @@ extension DataStack {
     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     */
-    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) {
+    public func monitorSectionedList<O>(
-        
+        createAsynchronously: @escaping (ListMonitor<O>) -> Void,
        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: FetchClause...
    ) {
        self.monitorSectionedList(
            createAsynchronously: createAsynchronously,
            from,
@@ -274,8 +310,13 @@ extension DataStack {
     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
     */
-    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) {
+    public func monitorSectionedList<O>(
-        
+        createAsynchronously: @escaping (ListMonitor<O>) -> Void,
        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: [FetchClause]
    ) {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
@@ -314,8 +355,11 @@ extension DataStack {
     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
     - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
     */
-    public func monitorSectionedList<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void, _ clauseChain: B) {
+    public func monitorSectionedList<B: SectionMonitorBuilderType>(
-        
+        createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void,
        _ clauseChain: B
    ) {
        self.monitorSectionedList(
            createAsynchronously: createAsynchronously,
            clauseChain.from,
--- a/Sources/DataStack+Querying.swift
+++ b/Sources/DataStack+Querying.swift
@@ -39,8 +39,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - parameter object: a reference to the object created/fetched outside the `DataStack`
     - returns: the `DynamicObject` instance if the object exists in the `DataStack`, or `nil` if not found.
     */
-    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ object: O
    ) -> O? {
        return self.mainContext.fetchExisting(object)
    }
@@ -50,8 +52,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - parameter objectID: the `NSManagedObjectID` for the object
     - returns: the `DynamicObject` instance if the object exists in the `DataStack`, or `nil` if not found.
     */
-    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ objectID: NSManagedObjectID
    ) -> O? {
        return self.mainContext.fetchExisting(objectID)
    }
@@ -61,8 +65,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - parameter objects: an array of `DynamicObject`s created/fetched outside the `DataStack`
     - returns: the `DynamicObject` array for objects that exists in the `DataStack`
     */
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objects: S
    ) -> [O] where S.Iterator.Element == O {
        return self.mainContext.fetchExisting(objects)
    }
@@ -72,8 +78,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - parameter objectIDs: the `NSManagedObjectID` array for the objects
     - returns: the `DynamicObject` array for objects that exists in the `DataStack`
     */
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objectIDs: S) -> [O] where S.Iterator.Element == NSManagedObjectID {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objectIDs: S
    ) -> [O] where S.Iterator.Element == NSManagedObjectID {
        return self.mainContext.fetchExisting(objectIDs)
    }
@@ -85,8 +93,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> O? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -102,8 +113,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> O? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -124,8 +138,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
+    public func fetchOne<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ObjectType? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -141,8 +157,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [O] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -158,8 +177,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [O] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -180,7 +202,9 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
+    public func fetchAll<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> [B.ObjectType] {
        Internals.assert(
            Thread.isMainThread,
@@ -197,8 +221,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -214,8 +241,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -236,8 +266,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
+    public func fetchCount<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> Int {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -253,8 +285,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -270,8 +305,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -292,8 +330,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
+    public func fetchObjectID<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -309,8 +349,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -326,8 +369,11 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -348,8 +394,10 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
@@ -371,8 +419,12 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> U? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
@@ -391,8 +443,12 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> U? {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
@@ -415,13 +471,19 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
+    public func queryValue<B: QueryChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ResultType? where B.ResultType: QueryableAttributeType {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
        )
-        return try self.mainContext.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.mainContext.queryValue(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
    /**
@@ -435,8 +497,12 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> [[String: Any]] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
@@ -455,8 +521,12 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> [[String: Any]] {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
@@ -488,13 +558,19 @@ extension DataStack: FetchableSource, QueryableSource {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
+    public func queryAttributes<B: QueryChainableBuilderType>(
-        
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [[String: Any]] where B.ResultType == NSDictionary {
        Internals.assert(
            Thread.isMainThread,
            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
        )
-        return try self.mainContext.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.mainContext.queryAttributes(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
--- a/Sources/DataStack+Reactive.swift
+++ b/Sources/DataStack+Reactive.swift
@@ -139,8 +139,10 @@ extension DataStack.ReactiveNamespace {
     - parameter storage: the local storage
     - returns: A `DataStack.AddStoragePublisher` that emits a `MigrationProgress` value with metadata for migration progress. Note that the `LocalStorage` event value may not always be the same instance as the parameter argument if a previous `LocalStorage` was already added at the same URL and with the same configuration.
     */
-    public func addStorage<T: LocalStorage>(_ storage: T) -> DataStack.AddStoragePublisher<T> {
+    public func addStorage<T: LocalStorage>(
-        
+        _ storage: T
    ) -> DataStack.AddStoragePublisher<T> {
        return .init(
            dataStack: self.base,
            storage: storage
@@ -317,7 +319,9 @@ extension DataStack.ReactiveNamespace {
    public func importUniqueObjects<O: DynamicObject & ImportableUniqueObject, S: Sequence>(
        _ into: Into<O>,
        sourceArray: S,
-        preProcess: @escaping (_ mapping: [O.UniqueIDType: O.ImportSource]) throws -> [O.UniqueIDType: O.ImportSource] = { $0 }
+        preProcess: @escaping (
            _ mapping: [O.UniqueIDType: O.ImportSource]
        ) throws(any Swift.Error) -> [O.UniqueIDType: O.ImportSource] = { $0 }
    ) -> Future<[O], CoreStoreError> where S.Iterator.Element == O.ImportSource {
        return .init { (promise) in
@@ -367,7 +371,9 @@ extension DataStack.ReactiveNamespace {
     - returns: A `Future` whose event value be the value returned from the `task` closure.
     */
    public func perform<Output>(
-        _ asynchronous: @escaping (AsynchronousDataTransaction) throws -> Output
+        _ asynchronous: @escaping (
            _ transaction: AsynchronousDataTransaction
        ) throws(any Swift.Error) -> Output
    ) -> Future<Output, CoreStoreError> {
        return .init { (promise) in
--- a/Sources/DataStack+Transaction.swift
+++ b/Sources/DataStack+Transaction.swift
@@ -39,7 +39,9 @@ extension DataStack {
     - parameter completion: the closure executed after the save completes. The `Result` argument of the closure will either wrap the return value of `task`, or any uncaught errors thrown from within `task`. Cancelled `task`s will be indicated by `.failure(error: CoreStoreError.userCancelled)`. Custom errors thrown by the user will be wrapped in `CoreStoreError.userError(error: Error)`.
     */
    public func perform<T>(
-        asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T,
+        asynchronous task: @escaping (
            _ transaction: AsynchronousDataTransaction
        ) throws(any Swift.Error) -> T,
        sourceIdentifier: Any? = nil,
        completion: @escaping (AsynchronousDataTransaction.Result<T>) -> Void
    ) {
@@ -61,7 +63,9 @@ extension DataStack {
     - parameter failure: the closure executed if the save fails or if any errors are thrown within `task`. Cancelled `task`s will be indicated by `CoreStoreError.userCancelled`. Custom errors thrown by the user will be wrapped in `CoreStoreError.userError(error: Error)`.
     */
    public func perform<T>(
-        asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T,
+        asynchronous task: @escaping (
            _ transaction: AsynchronousDataTransaction
        ) throws(any Swift.Error) -> T,
        sourceIdentifier: Any? = nil,
        success: @escaping (T) -> Void,
        failure: @escaping (CoreStoreError) -> Void
@@ -117,41 +121,43 @@ extension DataStack {
     - returns: the value returned from `task`
     */
    public func perform<T>(
-        synchronous task: ((_ transaction: SynchronousDataTransaction) throws -> T),
+        synchronous task: (
            _ transaction: SynchronousDataTransaction
        ) throws(any Swift.Error) -> T,
        waitForAllObservers: Bool = true,
        sourceIdentifier: Any? = nil
-    ) throws -> T {
+    ) throws(CoreStoreError) -> T {
-        
+
        let transaction = SynchronousDataTransaction(
            mainContext: self.rootSavingContext,
            queue: self.childTransactionQueue,
            sourceIdentifier: sourceIdentifier
        )
-        return try transaction.transactionQueue.cs_sync {
+        return try transaction.transactionQueue.cs_sync { () throws(CoreStoreError) -> T in
-            
+
            defer {
-                
+
                withExtendedLifetime((self, transaction), {})
            }
            let userInfo: T
            do {
-                
+
                userInfo = try withoutActuallyEscaping(task, do: { try $0(transaction) })
            }
            catch let error as CoreStoreError {
-                
+
-                throw error
+                throw error as CoreStoreError
            }
            catch let error {
-                
+
                throw CoreStoreError.userError(error: error)
            }
            if case (_, let error?) = transaction.autoCommit(waitForMerge: waitForAllObservers) {
-                
+
                throw error
            }
            else {
-                
+
                return userInfo
            }
        }
--- a/Sources/DataStack.AddStoragePublisher.swift
+++ b/Sources/DataStack.AddStoragePublisher.swift
@@ -52,8 +52,10 @@ extension DataStack {
        public typealias Output = CoreStore.MigrationProgress<Storage>
        public typealias Failure = CoreStoreError
-        public func receive<S: Subscriber>(subscriber: S) where S.Input == Output, S.Failure == Failure {
+        public func receive<S: Subscriber>(
-            
+            subscriber: S
        ) where S.Input == Output, S.Failure == Failure {
            subscriber.receive(
                subscription: AddStorageSubscription(
                    dataStack: self.dataStack,
@@ -182,12 +184,6 @@ extension DataStack {
            private let storage: Storage
            private var subscriber: S?
        }
        // MARK: Deprecated
        @available(*, deprecated, renamed: "MigrationProgress")
        public typealias MigrationProgress = CoreStore.MigrationProgress<Storage>
    }
 }
--- a/Sources/DataStack.swift
+++ b/Sources/DataStack.swift
@@ -241,8 +241,8 @@ public final class DataStack: Equatable {
     - returns: the local SQLite storage added to the stack
     */
    @discardableResult
-    public func addStorageAndWait() throws -> SQLiteStore {
+    public func addStorageAndWait() throws(CoreStoreError) -> SQLiteStore {
-        
+
        return try self.addStorageAndWait(SQLiteStore())
    }
@@ -258,8 +258,8 @@ public final class DataStack: Equatable {
    @discardableResult
    public func addStorageAndWait<T: StorageInterface>(
        _ storage: T
-    ) throws -> T {
+    ) throws(CoreStoreError) -> T {
-        
+
        do {
            return try self.coordinator.performSynchronously {
@@ -278,12 +278,11 @@ public final class DataStack: Equatable {
        }
        catch {
            let storeError = CoreStoreError(error)
            Internals.log(
-                storeError,
+                error,
                "Failed to add \(Internals.typeName(storage)) to the stack."
            )
-            throw storeError
+            throw error
        }
    }
@@ -299,8 +298,8 @@ public final class DataStack: Equatable {
    @discardableResult
    public func addStorageAndWait<T: LocalStorage>(
        _ storage: T
-    ) throws -> T {
+    ) throws(CoreStoreError) -> T {
-        
+
        return try self.coordinator.performSynchronously {
            let fileURL = storage.fileURL
@@ -539,8 +538,8 @@ public final class DataStack: Equatable {
        _ storage: StorageInterface,
        finalURL: URL?,
        finalStoreOptions: [AnyHashable: Any]?
-    ) throws -> NSPersistentStore {
+    ) throws(any Swift.Error) -> NSPersistentStore {
-        
+
        let persistentStore = try self.coordinator.addPersistentStore(
            ofType: type(of: storage).storeType,
            configurationName: storage.configuration,
--- a/Sources/DefaultLogger.swift
+++ b/Sources/DefaultLogger.swift
@@ -47,8 +47,14 @@ public final class DefaultLogger: CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    public func log(level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func log(
-        
+        level: LogLevel,
        message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    ) {
        #if DEBUG
            let icon: String
            let levelString: String
@@ -83,8 +89,14 @@ public final class DefaultLogger: CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    public func log(error: CoreStoreError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func log(
-        
+        error: CoreStoreError,
        message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    ) {
        #if DEBUG
            Swift.print("⚠️ [CoreStore: Error] \((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n    \(error)\n")
        #endif
@@ -99,8 +111,14 @@ public final class DefaultLogger: CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    public func assert(_ condition: @autoclosure () -> Bool, message: @autoclosure () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func assert(
-        
+        _ condition: @autoclosure () -> Bool,
        message: @autoclosure () -> String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    ) {
        #if DEBUG
            if condition() {
@@ -120,8 +138,13 @@ public final class DefaultLogger: CoreStoreLogger {
     - parameter lineNumber: the source line number
     - parameter functionName: the source function name
     */
-    public func abort(_ message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func abort(
-        
+        _ message: String,
        fileName: StaticString,
        lineNumber: Int,
        functionName: StaticString
    ) {
        Swift.print("❗ [CoreStore: Fatal Error] \((String(describing: fileName) as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
        Swift.fatalError(file: fileName, line: UInt(lineNumber))
    }
--- a/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift
+++ b/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift
@@ -237,13 +237,4 @@ extension DiffableDataSource {
 }
 // MARK: Deprecated
 extension DiffableDataSource {
    @available(*, deprecated, renamed: "CollectionViewAdapter")
    public typealias CollectionView = CollectionViewAdapter
 }
 #endif
--- a/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift
@@ -240,13 +240,4 @@ extension DiffableDataSource {
    }
 }
 // MARK: Deprecated
 extension DiffableDataSource {
    @available(*, deprecated, renamed: "CollectionViewAdapter")
    public typealias CollectionView = CollectionViewAdapter
 }
 #endif
--- a/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift
+++ b/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift
@@ -299,13 +299,4 @@ extension DiffableDataSource {
    }
 }
 // MARK: Deprecated
 extension DiffableDataSource {
    @available(*, deprecated, renamed: "TableViewAdapter")
    public typealias TableView = TableViewAdapter
 }
 #endif
--- a/Sources/DispatchQueue+CoreStore.swift
+++ b/Sources/DispatchQueue+CoreStore.swift
@@ -31,8 +31,11 @@ import Foundation
 extension DispatchQueue {
    @nonobjc @inline(__always)
-    internal static func serial(_ label: String, qos: DispatchQoS) -> DispatchQueue {
+    internal static func serial(
-        
+        _ label: String,
        qos: DispatchQoS
    ) -> DispatchQueue {
        return DispatchQueue(
            label: label,
            qos: qos,
@@ -43,8 +46,11 @@ extension DispatchQueue {
    }
    @nonobjc @inline(__always)
-    internal static func concurrent(_ label: String, qos: DispatchQoS) -> DispatchQueue {
+    internal static func concurrent(
-        
+        _ label: String,
        qos: DispatchQoS
    ) -> DispatchQueue {
        return DispatchQueue(
            label: label,
            qos: qos,
@@ -69,26 +75,57 @@ extension DispatchQueue {
    }
    @nonobjc @inline(__always)
-    internal func cs_sync<T>(_ closure: () throws -> T) rethrows -> T {
+    internal func cs_sync<T>(
-        
+        _ closure: () -> T
    ) -> T {
        return self.sync { autoreleasepool(invoking: closure) }
    }
    @nonobjc @inline(__always)
    internal func cs_sync<T>(
        _ closure: () throws(any Swift.Error) -> T
    ) throws(any Swift.Error) -> T {
        return try self.sync { try autoreleasepool(invoking: closure) }
    }
-    
+
    @nonobjc @inline(__always)
-    internal func cs_async(_ closure: @escaping () -> Void) {
+    internal func cs_sync<T>(
-        
+        _ closure: () throws(CoreStoreError) -> T
    ) throws(CoreStoreError) -> T {
        do {
            return try self.sync { try autoreleasepool(invoking: closure) }
        }
        catch {
            throw CoreStoreError(error)
        }
    }
    @nonobjc @inline(__always)
    internal func cs_async(
        _ closure: @escaping () -> Void
    ) {
        self.async { autoreleasepool(invoking: closure) }
    }
    @nonobjc @inline(__always)
-    internal func cs_barrierSync<T>(_ closure: () throws -> T) rethrows -> T {
+    internal func cs_barrierSync<T>(
-        
+        _ closure: () throws(any Swift.Error) -> T
    ) rethrows -> T {
        return try self.sync(flags: .barrier) { try autoreleasepool(invoking: closure) }
    }
    @nonobjc @inline(__always)
-    internal func cs_barrierAsync(_ closure: @escaping () -> Void) {
+    internal func cs_barrierAsync(
-        
+        _ closure: @escaping () -> Void
    ) {
        self.async(flags: .barrier) { autoreleasepool(invoking: closure) }
    }
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -42,23 +42,34 @@ public protocol DynamicObject: AnyObject {
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_forceCreate(entityDescription: NSEntityDescription, into context: NSManagedObjectContext, assignTo store: NSPersistentStore) -> Self
+    static func cs_forceCreate(
-    
+        entityDescription: NSEntityDescription,
        into context: NSManagedObjectContext,
        assignTo store: NSPersistentStore
    ) -> Self
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any]?
+    static func cs_snapshotDictionary(
-    
+        id: ObjectID,
        context: NSManagedObjectContext
    ) -> [String: Any]?
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_fromRaw(object: NSManagedObject) -> Self
+    static func cs_fromRaw(
-    
+        object: NSManagedObject
    ) -> Self
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_matches(object: NSManagedObject) -> Bool
+    static func cs_matches(
-    
+        object: NSManagedObject
    ) -> Bool
    /**
     Used internally by CoreStore. Do not call directly.
     */
@@ -88,8 +99,12 @@ extension NSManagedObject: DynamicObject {
    // MARK: DynamicObject
-    public class func cs_forceCreate(entityDescription: NSEntityDescription, into context: NSManagedObjectContext, assignTo store: NSPersistentStore) -> Self {
+    public class func cs_forceCreate(
-        
+        entityDescription: NSEntityDescription,
        into context: NSManagedObjectContext,
        assignTo store: NSPersistentStore
    ) -> Self {
        let object = self.init(entity: entityDescription, insertInto: context)
        defer {
@@ -98,7 +113,10 @@ extension NSManagedObject: DynamicObject {
        return object
    }
-    public class func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any]? {
+    public class func cs_snapshotDictionary(
        id: ObjectID,
        context: NSManagedObjectContext
    ) -> [String: Any]? {
        guard let object = context.fetchExisting(id) as NSManagedObject? else {
@@ -125,8 +143,10 @@ extension NSManagedObject: DynamicObject {
 #endif
    }
-    public static func cs_matches(object: NSManagedObject) -> Bool {
+    public static func cs_matches(
-        
+        object: NSManagedObject
    ) -> Bool {
        return object.isKind(of: self)
    }
@@ -148,8 +168,12 @@ extension CoreStoreObject {
    // MARK: DynamicObject
-    public class func cs_forceCreate(entityDescription: NSEntityDescription, into context: NSManagedObjectContext, assignTo store: NSPersistentStore) -> Self {
+    public class func cs_forceCreate(
-        
+        entityDescription: NSEntityDescription,
        into context: NSManagedObjectContext,
        assignTo store: NSPersistentStore
    ) -> Self {
        let type = NSClassFromString(entityDescription.managedObjectClassName!)! as! NSManagedObject.Type
        let object = type.init(entity: entityDescription, insertInto: context)
        defer {
@@ -159,12 +183,19 @@ extension CoreStoreObject {
        return self.cs_fromRaw(object: object)
    }
-    public class func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any]? {
+    public class func cs_snapshotDictionary(
        id: ObjectID,
        context: NSManagedObjectContext
    ) -> [String: Any]? {
        var values: [KeyPathString: Any] = [:]
        if self.meta.needsReflection {
-            func initializeAttributes(mirror: Mirror, object: Self, into attributes: inout [KeyPathString: Any]) {
+            func initializeAttributes(
                mirror: Mirror,
                object: Self,
                into attributes: inout [KeyPathString: Any]
            ) {
                if let superClassMirror = mirror.superclassMirror {
@@ -225,9 +256,9 @@ extension CoreStoreObject {
                let object = context.fetchExisting(id) as CoreStoreObject?,
                let rawObject = object.rawObject,
                !rawObject.isDeleted
-                else {
+            else {
-                    return nil
+                return nil
            }
            for property in self.metaProperties(includeSuperclasses: true) {
@@ -267,8 +298,11 @@ extension CoreStoreObject {
            return unsafeDowncast(coreStoreObject, to: self)
        }
-        func forceTypeCast<T: CoreStoreObject>(_ type: AnyClass, to: T.Type) -> T.Type {
+        func forceTypeCast<T: CoreStoreObject>(
-            
+            _ type: AnyClass,
            to: T.Type
        ) -> T.Type {
            return type as! T.Type
        }
        let coreStoreObject = forceTypeCast(object.entity.dynamicObjectType!, to: self).init(rawObject: object)
@@ -276,8 +310,10 @@ extension CoreStoreObject {
        return coreStoreObject
    }
-    public static func cs_matches(object: NSManagedObject) -> Bool {
+    public static func cs_matches(
-        
+        object: NSManagedObject
    ) -> Bool {
        guard let type = object.entity.coreStoreEntity?.type else {
            return false
--- a/Sources/Entity.swift
+++ b/Sources/Entity.swift
@@ -70,8 +70,14 @@ public final class Entity<O: CoreStoreObject>: DynamicEntity {
     - parameter indexes: the compound indexes for the entity as an array of arrays. The arrays contained in the returned array contain `KeyPath`s to properties of the entity.
     - parameter uniqueConstraints: sets uniqueness constraints for the entity. A uniqueness constraint is a set of one or more `KeyPath`s whose value must be unique over the set of instances of that entity. This value forms part of the entity's version hash. Uniqueness constraint violations can be computationally expensive to handle. It is highly suggested that there be only one uniqueness constraint per entity hierarchy. Uniqueness constraints must be defined at the highest level possible, and CoreStore will raise an assertion failure if unique constraints are added to a sub entity.
     */
-    public convenience init(_ entityName: String, isAbstract: Bool = false, versionHashModifier: String? = nil, indexes: [[PartialKeyPath<O>]] = [], uniqueConstraints: [[PartialKeyPath<O>]]) {
+    public convenience init(
-        
+        _ entityName: String,
        isAbstract: Bool = false,
        versionHashModifier: String? = nil,
        indexes: [[PartialKeyPath<O>]] = [],
        uniqueConstraints: [[PartialKeyPath<O>]]
    ) {
        self.init(
            O.self,
            entityName,
@@ -92,7 +98,12 @@ public final class Entity<O: CoreStoreObject>: DynamicEntity {
     - parameter versionHashModifier: the version hash modifier for the entity. Used to mark or denote an entity as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where, for example, the structure of an entity is unchanged but the format or content of data has changed.)
     - parameter indexes: the compound indexes for the entity as an array of arrays. The arrays contained in the returned array contain `KeyPath`s to properties of the entity.
     */
-    public convenience init(_ entityName: String, isAbstract: Bool = false, versionHashModifier: String? = nil, indexes: [[PartialKeyPath<O>]] = []) {
+    public convenience init(
        _ entityName: String,
        isAbstract: Bool = false,
        versionHashModifier: String? = nil,
        indexes: [[PartialKeyPath<O>]] = []
    ) {
        self.init(
            O.self,
@@ -115,8 +126,15 @@ public final class Entity<O: CoreStoreObject>: DynamicEntity {
     - parameter indexes: the compound indexes for the entity as an array of arrays. The arrays contained in the returned array contain KeyPath's to properties of the entity.
     - parameter uniqueConstraints: sets uniqueness constraints for the entity. A uniqueness constraint is a set of one or more `KeyPath`s whose value must be unique over the set of instances of that entity. This value forms part of the entity's version hash. Uniqueness constraint violations can be computationally expensive to handle. It is highly suggested that there be only one uniqueness constraint per entity hierarchy. Uniqueness constraints must be defined at the highest level possible, and CoreStore will raise an assertion failure if unique constraints are added to a sub entity.
     */
-    public init(_ type: O.Type, _ entityName: String, isAbstract: Bool = false, versionHashModifier: String? = nil, indexes: [[PartialKeyPath<O>]] = [], uniqueConstraints: [[PartialKeyPath<O>]]) {
+    public init(
-        
+        _ type: O.Type,
        _ entityName: String,
        isAbstract: Bool = false,
        versionHashModifier: String? = nil,
        indexes: [[PartialKeyPath<O>]] = [],
        uniqueConstraints: [[PartialKeyPath<O>]]
    ) {
        let meta = O.meta
        let toStringArray: ([PartialKeyPath<O>]) -> [KeyPathString] = {
@@ -147,7 +165,13 @@ public final class Entity<O: CoreStoreObject>: DynamicEntity {
     - parameter indexes: the compound indexes for the entity as an array of arrays. The arrays contained in the returned array contain KeyPath's to properties of the entity.
     - parameter uniqueConstraints: sets uniqueness constraints for the entity. A uniqueness constraint is a set of one or more `KeyPath`s whose value must be unique over the set of instances of that entity. This value forms part of the entity's version hash. Uniqueness constraint violations can be computationally expensive to handle. It is highly suggested that there be only one uniqueness constraint per entity hierarchy. Uniqueness constraints must be defined at the highest level possible, and CoreStore will raise an assertion failure if unique constraints are added to a sub entity.
     */
-    public init(_ type: O.Type, _ entityName: String, isAbstract: Bool = false, versionHashModifier: String? = nil, indexes: [[PartialKeyPath<O>]] = []) {
+    public init(
        _ type: O.Type,
        _ entityName: String,
        isAbstract: Bool = false,
        versionHashModifier: String? = nil,
        indexes: [[PartialKeyPath<O>]] = []
    ) {
        let meta = O.meta
        let toStringArray: ([PartialKeyPath<O>]) -> [KeyPathString] = {
@@ -232,8 +256,15 @@ public /*abstract*/ class DynamicEntity: Hashable {
    // MARK: Internal
-    internal init(type: DynamicObject.Type, entityName: String, isAbstract: Bool, versionHashModifier: String?, indexes: [[KeyPathString]], uniqueConstraints: [[KeyPathString]]) {
+    internal init(
-        
+        type: DynamicObject.Type,
        entityName: String,
        isAbstract: Bool,
        versionHashModifier: String?,
        indexes: [[KeyPathString]],
        uniqueConstraints: [[KeyPathString]]
    ) {
        self.type = type
        self.entityName = entityName
        self.isAbstract = isAbstract
--- a/Sources/FIeldRelationshipType.swift
+++ b/Sources/FIeldRelationshipType.swift
@@ -57,27 +57,38 @@ public protocol FieldRelationshipType {
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_toReturnType(from value: NativeValueType?) -> Self
+    static func cs_toReturnType(
        from value: NativeValueType?
    ) -> Self
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_toPublishedType(from value: SnapshotValueType, in context: NSManagedObjectContext) -> PublishedType
+    static func cs_toPublishedType(
        from value: SnapshotValueType,
        in context: NSManagedObjectContext
    ) -> PublishedType
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_toNativeType(from value: Self) -> NativeValueType?
+    static func cs_toNativeType(
        from value: Self
    ) -> NativeValueType?
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_toSnapshotType(from value: PublishedType) -> SnapshotValueType
+    static func cs_toSnapshotType(
        from value: PublishedType
    ) -> SnapshotValueType
    /**
     Used internally by CoreStore. Do not call directly.
     */
-    static func cs_valueForSnapshot(from objectIDs: [DestinationObjectType.ObjectID]) -> SnapshotValueType
+    static func cs_valueForSnapshot(
        from objectIDs: [DestinationObjectType.ObjectID]
    ) -> SnapshotValueType
 }
@@ -115,27 +126,38 @@ extension Optional: FieldRelationshipType, FieldRelationshipToOneType where Wrap
    public typealias PublishedType = ObjectPublisher<DestinationObjectType>?
-    public static func cs_toReturnType(from value: NativeValueType?) -> Self {
+    public static func cs_toReturnType(
        from value: NativeValueType?
    ) -> Self {
        return value.map(Wrapped.cs_fromRaw(object:))
    }
-    public static func cs_toPublishedType(from value: SnapshotValueType, in context: NSManagedObjectContext) -> PublishedType {
+    public static func cs_toPublishedType(
        from value: SnapshotValueType,
        in context: NSManagedObjectContext
    ) -> PublishedType {
        return value.map(context.objectPublisher(objectID:))
    }
-    public static func cs_toNativeType(from value: Self) -> NativeValueType? {
+    public static func cs_toNativeType(
        from value: Self
    ) -> NativeValueType? {
        return value?.cs_toRaw()
    }
-    public static func cs_toSnapshotType(from value: PublishedType) -> SnapshotValueType {
+    public static func cs_toSnapshotType(
        from value: PublishedType
    ) -> SnapshotValueType {
        return value?.objectID()
    }
-    public static func cs_valueForSnapshot(from objectIDs: [DestinationObjectType.ObjectID]) -> SnapshotValueType {
+    public static func cs_valueForSnapshot(
        from objectIDs: [DestinationObjectType.ObjectID]
    ) -> SnapshotValueType {
        return objectIDs.first
    }
@@ -156,7 +178,9 @@ extension Array: FieldRelationshipType, FieldRelationshipToManyType, FieldRelati
    public typealias PublishedType = [ObjectPublisher<DestinationObjectType>]
-    public static func cs_toReturnType(from value: NativeValueType?) -> Self {
+    public static func cs_toReturnType(
        from value: NativeValueType?
    ) -> Self {
        guard let value = value else {
@@ -165,22 +189,31 @@ extension Array: FieldRelationshipType, FieldRelationshipToManyType, FieldRelati
        return value.map({ Element.cs_fromRaw(object: $0 as! NSManagedObject) })
    }
-    public static func cs_toPublishedType(from value: SnapshotValueType, in context: NSManagedObjectContext) -> PublishedType {
+    public static func cs_toPublishedType(
        from value: SnapshotValueType,
        in context: NSManagedObjectContext
    ) -> PublishedType {
        return value.map(context.objectPublisher(objectID:))
    }
-    public static func cs_toNativeType(from value: Self) -> NativeValueType? {
+    public static func cs_toNativeType(
        from value: Self
    ) -> NativeValueType? {
        return NSOrderedSet(array: value.map({ $0.rawObject! }))
    }
-    public static func cs_toSnapshotType(from value: PublishedType) -> SnapshotValueType {
+    public static func cs_toSnapshotType(
        from value: PublishedType
    ) -> SnapshotValueType {
        return value.map({ $0.objectID() })
    }
-    public static func cs_valueForSnapshot(from objectIDs: [DestinationObjectType.ObjectID]) -> SnapshotValueType {
+    public static func cs_valueForSnapshot(
        from objectIDs: [DestinationObjectType.ObjectID]
    ) -> SnapshotValueType {
        return objectIDs
    }
@@ -201,7 +234,9 @@ extension Set: FieldRelationshipType, FieldRelationshipToManyType, FieldRelation
    public typealias PublishedType = Set<ObjectPublisher<DestinationObjectType>>
-    public static func cs_toReturnType(from value: NativeValueType?) -> Self {
+    public static func cs_toReturnType(
        from value: NativeValueType?
    ) -> Self {
        guard let value = value else {
@@ -210,22 +245,31 @@ extension Set: FieldRelationshipType, FieldRelationshipToManyType, FieldRelation
        return Set(value.map({ Element.cs_fromRaw(object: $0 as! NSManagedObject) }))
    }
-    public static func cs_toPublishedType(from value: SnapshotValueType, in context: NSManagedObjectContext) -> PublishedType {
+    public static func cs_toPublishedType(
        from value: SnapshotValueType,
        in context: NSManagedObjectContext
    ) -> PublishedType {
        return PublishedType(value.map(context.objectPublisher(objectID:)))
    }
-    public static func cs_toNativeType(from value: Self) -> NativeValueType? {
+    public static func cs_toNativeType(
        from value: Self
    ) -> NativeValueType? {
        return NSSet(array: value.map({ $0.rawObject! }))
    }
-    public static func cs_toSnapshotType(from value: PublishedType) -> SnapshotValueType {
+    public static func cs_toSnapshotType(
        from value: PublishedType
    ) -> SnapshotValueType {
        return SnapshotValueType(value.map({ $0.objectID() }))
    }
-    public static func cs_valueForSnapshot(from objectIDs: [DestinationObjectType.ObjectID]) -> SnapshotValueType {
+    public static func cs_valueForSnapshot(
        from objectIDs: [DestinationObjectType.ObjectID]
    ) -> SnapshotValueType {
        return .init(objectIDs)
    }
--- a/Sources/FetchChainBuilder.swift
+++ b/Sources/FetchChainBuilder.swift
@@ -47,12 +47,6 @@ public struct FetchChainBuilder<O: DynamicObject>: FetchChainableBuilderType {
    public var from: From<O>
    public var fetchClauses: [FetchClause] = []
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/FetchableSource.swift
+++ b/Sources/FetchableSource.swift
@@ -40,23 +40,29 @@ public protocol FetchableSource: AnyObject {
     - parameter object: a reference to the object created/fetched outside the `FetchableSource`'s context
     - returns: the `DynamicObject` instance if the object exists in the `FetchableSource`'s context, or `nil` if not found.
     */
-    func fetchExisting<O: DynamicObject>(_ object: O) -> O?
+    func fetchExisting<O: DynamicObject>(
-    
+        _ object: O
    ) -> O?
    /**
     Fetches the `DynamicObject` instance in the `FetchableSource`'s context from an `NSManagedObjectID`.
     - parameter objectID: the `NSManagedObjectID` for the object
     - returns: the `DynamicObject` instance if the object exists in the `FetchableSource`, or `nil` if not found.
     */
-    func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O?
+    func fetchExisting<O: DynamicObject>(
-    
+        _ objectID: NSManagedObjectID
    ) -> O?
    /**
     Fetches the `DynamicObject` instances in the `FetchableSource`'s context from references created from another managed object context.
     - parameter objects: an array of `DynamicObject`s created/fetched outside the `FetchableSource`'s context
     - returns: the `DynamicObject` array for objects that exists in the `FetchableSource`
     */
-    func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O
+    func fetchExisting<O: DynamicObject, S: Sequence>(
        _ objects: S
    ) -> [O] where S.Iterator.Element == O
    /**
     Fetches the `DynamicObject` instances in the `FetchableSource`'s context from a list of `NSManagedObjectID`.
@@ -64,7 +70,9 @@ public protocol FetchableSource: AnyObject {
     - parameter objectIDs: the `NSManagedObjectID` array for the objects
     - returns: the `DynamicObject` array for objects that exists in the `FetchableSource`'s context
     */
-    func fetchExisting<O: DynamicObject, S: Sequence>(_ objectIDs: S) -> [O] where S.Iterator.Element == NSManagedObjectID
+    func fetchExisting<O: DynamicObject, S: Sequence>(
        _ objectIDs: S
    ) -> [O] where S.Iterator.Element == NSManagedObjectID
    /**
     Fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -74,7 +82,10 @@ public protocol FetchableSource: AnyObject {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O?
+    func fetchOne<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> O?
    /**
     Fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -84,8 +95,11 @@ public protocol FetchableSource: AnyObject {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O?
+    func fetchOne<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> O?
    /**
     Fetches the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
     ```
@@ -99,7 +113,9 @@ public protocol FetchableSource: AnyObject {
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType?
+    func fetchOne<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ObjectType?
    /**
     Fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -109,7 +125,10 @@ public protocol FetchableSource: AnyObject {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O]
+    func fetchAll<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [O]
    /**
     Fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -119,8 +138,11 @@ public protocol FetchableSource: AnyObject {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O]
+    func fetchAll<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [O]
    /**
     Fetches all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
     ```
@@ -134,7 +156,9 @@ public protocol FetchableSource: AnyObject {
     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType]
+    func fetchAll<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> [B.ObjectType]
    /**
     Fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -144,7 +168,10 @@ public protocol FetchableSource: AnyObject {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int
+    func fetchCount<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> Int
    /**
     Fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -154,8 +181,11 @@ public protocol FetchableSource: AnyObject {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int
+    func fetchCount<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> Int
    /**
     Fetches the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
     ```
@@ -169,7 +199,9 @@ public protocol FetchableSource: AnyObject {
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int
+    func fetchCount<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> Int
    /**
     Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -179,7 +211,10 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID?
+    func fetchObjectID<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> NSManagedObjectID?
    /**
     Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -189,8 +224,11 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID?
+    func fetchObjectID<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> NSManagedObjectID?
    /**
     Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
     ```
@@ -204,7 +242,9 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID?
+    func fetchObjectID<B: FetchChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> NSManagedObjectID?
    /**
     Fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -214,7 +254,10 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID]
+    func fetchObjectIDs<O>(
        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [NSManagedObjectID]
    /**
     Fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -224,8 +267,11 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID]
+    func fetchObjectIDs<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [NSManagedObjectID]
    /**
     Fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
     ```
@@ -239,8 +285,10 @@ public protocol FetchableSource: AnyObject {
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID]
+    func fetchObjectIDs<B: FetchChainableBuilderType>(
-    
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [NSManagedObjectID]
    /**
     The internal `NSManagedObjectContext` managed by this `FetchableSource`. Using this context directly should typically be avoided, and is provided by CoreStore only for extremely specialized cases.
     */
--- a/Sources/Field.Coded.swift
+++ b/Sources/Field.Coded.swift
@@ -127,8 +127,19 @@ extension FieldContainer {
            versionHashModifier: @autoclosure @escaping () -> String? = nil,
            previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
            coder fieldCoderType: Coder.Type,
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            customGetter: (
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )? = nil,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
        ) where Coder.FieldStoredValue == V {
@@ -172,8 +183,19 @@ extension FieldContainer {
            versionHashModifier: @autoclosure @escaping () -> String? = nil,
            previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
            coder fieldCoderType: Coder.Type,
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            customGetter: (
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )? = nil,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
            dynamicInitialValue: @escaping () -> V
        ) where Coder.FieldStoredValue == V {
@@ -276,9 +298,23 @@ extension FieldContainer {
          _ keyPath: KeyPathString,
          versionHashModifier: @autoclosure @escaping () -> String? = nil,
          previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-          coder: (encode: (V) -> Data?, decode: (Data?) -> V),
+          coder: (
-          customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            encode: (V) -> Data?,
-          customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            decode: (Data?) -> V
          ),
          customGetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
          )? = nil,
          customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
          )? = nil,
          affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
      ) {
@@ -328,9 +364,23 @@ extension FieldContainer {
            _ keyPath: KeyPathString,
            versionHashModifier: @autoclosure @escaping () -> String? = nil,
            previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-            coder: (encode: (V) -> Data?, decode: (Data?) -> V),
+            coder: (
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+                encode: (V) -> Data?,
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+                decode: (Data?) -> V
            ),
            customGetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )? = nil,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
            dynamicInitialValue: @escaping () -> V
        ) {
@@ -428,7 +478,10 @@ extension FieldContainer {
            return ObjectType.self
        }
-        internal static func read(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any? {
+        internal static func read(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject
        ) -> Any? {
            let field = field as! Self
            if let customGetter = field.customGetter {
@@ -449,7 +502,11 @@ extension FieldContainer {
            }
        }
-        internal static func modify(field: FieldProtocol, for rawObject: CoreStoreManagedObject, newValue: Any?) {
+        internal static func modify(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject,
            newValue: Any?
        ) {
            Internals.assert(
                rawObject.isEditableInContext() == true,
@@ -564,10 +621,22 @@ extension FieldContainer {
            versionHashModifier: @escaping () -> String?,
            renamingIdentifier: @escaping () -> String?,
            valueTransformer: @escaping () -> Internals.AnyFieldCoder?,
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)?,
+            customGetter: (
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? ,
+                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )?,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? ,
            dynamicInitialValue: (() -> V)?,
-            affectedByKeyPaths: @escaping () -> Set<KeyPathString>) {
+            affectedByKeyPaths: @escaping () -> Set<KeyPathString>
        ) {
            self.keyPath = keyPath
            self.entityDescriptionValues = {
@@ -682,8 +751,19 @@ extension FieldContainer.Coded where V: FieldOptionalType {
      versionHashModifier: @autoclosure @escaping () -> String? = nil,
      previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
      coder: Coder.Type,
-      customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+      customGetter: (
-      customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>
        ) -> V
      )? = nil,
      customSetter: (
        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>,
            _ newValue: V
        ) -> Void
      )? = nil,
      affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
  ) where Coder.FieldStoredValue == V.Wrapped {
@@ -727,8 +807,19 @@ extension FieldContainer.Coded where V: FieldOptionalType {
        versionHashModifier: @autoclosure @escaping () -> String? = nil,
        previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
        coder: Coder.Type,
-        customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+        customGetter: (
-        customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )? = nil,
        customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )? = nil,
        affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
        dynamicInitialValue: @escaping () -> V
    ) where Coder.FieldStoredValue == V.Wrapped {
@@ -832,9 +923,23 @@ extension FieldContainer.Coded where V: FieldOptionalType {
      _ keyPath: KeyPathString,
      versionHashModifier: @autoclosure @escaping () -> String? = nil,
      previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-      coder: (encode: (V) -> Data?, decode: (Data?) -> V),
+      coder: (
-      customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+        encode: (V) -> Data?,
-      customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+        decode: (Data?) -> V
      ),
      customGetter: (
        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>
        ) -> V
      )? = nil,
      customSetter: (
        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>,
            _ newValue: V
        ) -> Void
      )? = nil,
      affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
  ) {
@@ -884,9 +989,23 @@ extension FieldContainer.Coded where V: FieldOptionalType {
        _ keyPath: KeyPathString,
        versionHashModifier: @autoclosure @escaping () -> String? = nil,
        previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-        coder: (encode: (V) -> Data?, decode: (Data?) -> V),
+        coder: (
-        customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            encode: (V) -> Data?,
-        customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            decode: (Data?) -> V
        ),
        customGetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )? = nil,
        customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )? = nil,
        affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
        dynamicInitialValue: @escaping () -> V
    ) {
@@ -978,8 +1097,19 @@ extension FieldContainer.Coded where V: DefaultNSSecureCodable {
      _ keyPath: KeyPathString,
      versionHashModifier: @autoclosure @escaping () -> String? = nil,
      previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-      customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+      customGetter: (
-      customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>
        ) -> V
      )? = nil,
      customSetter: (
        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>,
            _ newValue: V
        ) -> Void
      )? = nil,
      affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
  ) {
@@ -1020,8 +1150,19 @@ extension FieldContainer.Coded where V: DefaultNSSecureCodable {
        _ keyPath: KeyPathString,
        versionHashModifier: @autoclosure @escaping () -> String? = nil,
        previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-        customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+        customGetter: (
-        customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )? = nil,
        customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )? = nil,
        affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
        dynamicInitialValue: @escaping () -> V
    ) {
@@ -1113,8 +1254,19 @@ extension FieldContainer.Coded where V: FieldOptionalType, V.Wrapped: DefaultNSS
      _ keyPath: KeyPathString,
      versionHashModifier: @autoclosure @escaping () -> String? = nil,
      previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-      customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+      customGetter: (
-      customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>
        ) -> V
      )? = nil,
      customSetter: (
        (
            _ object: ObjectProxy<O>,
            _ field: ObjectProxy<O>.FieldProxy<V>,
            _ newValue: V
        ) -> Void
      )? = nil,
      affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
  ) {
@@ -1155,8 +1307,19 @@ extension FieldContainer.Coded where V: FieldOptionalType, V.Wrapped: DefaultNSS
        _ keyPath: KeyPathString,
        versionHashModifier: @autoclosure @escaping () -> String? = nil,
        previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-        customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+        customGetter: (
-        customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )? = nil,
        customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )? = nil,
        affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
        dynamicInitialValue: @escaping () -> V
    ) {
--- a/Sources/Field.Relationship.swift
+++ b/Sources/Field.Relationship.swift
@@ -167,7 +167,10 @@ extension FieldContainer {
            return ObjectType.self
        }
-        internal static func read(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any? {
+        internal static func read(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject
        ) -> Any? {
            let field = field as! Self
            let keyPath = field.keyPath
@@ -176,8 +179,12 @@ extension FieldContainer {
            )
        }
-        internal static func modify(field: FieldProtocol, for rawObject: CoreStoreManagedObject, newValue: Any?) {
+        internal static func modify(
-            
+            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject,
            newValue: Any?
        ) {
            Internals.assert(
                rawObject.isEditableInContext() == true,
                "Attempted to update a \(Internals.typeName(O.self))'s value from outside a transaction."
@@ -196,7 +203,10 @@ extension FieldContainer {
        internal let entityDescriptionValues: () -> FieldRelationshipProtocol.EntityDescriptionValues
-        internal static func valueForSnapshot(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any? {
+        internal static func valueForSnapshot(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject
        ) -> Any? {
            Internals.assert(
                rawObject.isRunningInAllowedQueue() == true,
--- a/Sources/Field.Stored.swift
+++ b/Sources/Field.Stored.swift
@@ -116,8 +116,19 @@ extension FieldContainer {
          _ keyPath: KeyPathString,
          versionHashModifier: @autoclosure @escaping () -> String? = nil,
          previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-          customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+          customGetter: (
-          customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
          )? = nil,
          customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
          )? = nil,
          affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []
      ) {
@@ -157,8 +168,19 @@ extension FieldContainer {
            _ keyPath: KeyPathString,
            versionHashModifier: @autoclosure @escaping () -> String? = nil,
            previousVersionKeyPath: @autoclosure @escaping () -> String? = nil,
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            customGetter: (
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )? = nil,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = [],
            dynamicInitialValue: @escaping () -> V
        ) {
@@ -255,7 +277,10 @@ extension FieldContainer {
            return ObjectType.self
        }
-        internal static func read(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any? {
+        internal static func read(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject
        ) -> Any? {
            let field = field as! Self
            if let customGetter = field.customGetter {
@@ -276,7 +301,10 @@ extension FieldContainer {
            }
        }
-        internal static func modify(field: FieldProtocol, for rawObject: CoreStoreManagedObject, newValue: Any?) {
+        internal static func modify(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject, newValue: Any?
        ) {
            Internals.assert(
                rawObject.isEditableInContext() == true,
@@ -379,7 +407,8 @@ extension FieldContainer {
            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)?,
            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)?,
            dynamicInitialValue: (() -> V)?,
-            affectedByKeyPaths: @escaping () -> Set<KeyPathString>) {
+            affectedByKeyPaths: @escaping () -> Set<KeyPathString>
        ) {
            self.keyPath = keyPath
            self.entityDescriptionValues = {
@@ -403,8 +432,19 @@ extension FieldContainer {
        // MARK: Private
-        private let customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)?
+        private let customGetter: (
-        private let customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)?
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )?
        private let customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )?
        private let dynamicInitialValue: (() -> V)?
    }
 }
--- a/Sources/Field.Virtual.swift
+++ b/Sources/Field.Virtual.swift
@@ -80,7 +80,13 @@ extension FieldContainer {
        public init(
            _ keyPath: KeyPathString,
            customGetter: @escaping (_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V,
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []) {
            self.init(
@@ -99,8 +105,19 @@ extension FieldContainer {
            wrappedValue initial: @autoclosure @escaping () -> V,
            _ keyPath: KeyPathString,
            versionHashModifier: @autoclosure @escaping () -> String? = nil,
-            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+            customGetter: (
-            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>
                ) -> V
            )? = nil,
            customSetter: (
                (
                    _ object: ObjectProxy<O>,
                    _ field: ObjectProxy<O>.FieldProxy<V>,
                    _ newValue: V
                ) -> Void
            )? = nil,
            affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []) {
            fatalError()
@@ -185,7 +202,10 @@ extension FieldContainer {
            return ObjectType.self
        }
-        internal static func read(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any? {
+        internal static func read(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject
        ) -> Any? {
            let field = field as! Self
            if let customGetter = field.customGetter {
@@ -206,7 +226,11 @@ extension FieldContainer {
            }
        }
-        internal static func modify(field: FieldProtocol, for rawObject: CoreStoreManagedObject, newValue: Any?) {
+        internal static func modify(
            field: FieldProtocol,
            for rawObject: CoreStoreManagedObject,
            newValue: Any?
        ) {
            Internals.assert(
                rawObject.isEditableInContext() == true,
@@ -285,7 +309,8 @@ extension FieldContainer {
            keyPath: KeyPathString,
            customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)?,
            customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? ,
-            affectedByKeyPaths: @escaping () -> Set<KeyPathString>) {
+            affectedByKeyPaths: @escaping () -> Set<KeyPathString>
        ) {
            self.keyPath = keyPath
            self.entityDescriptionValues = {
@@ -308,8 +333,19 @@ extension FieldContainer {
        // MARK: Private
-        private let customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)?
+        private let customGetter: (
-        private let customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)?
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )?
        private let customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )?
    }
 }
@@ -342,8 +378,19 @@ extension FieldContainer.Virtual where V: FieldOptionalType {
     */
    public init(
        _ keyPath: KeyPathString,
-        customGetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>) -> V)? = nil,
+        customGetter: (
-        customSetter: ((_ object: ObjectProxy<O>, _ field: ObjectProxy<O>.FieldProxy<V>, _ newValue: V) -> Void)? = nil,
+            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>
            ) -> V
        )? = nil,
        customSetter: (
            (
                _ object: ObjectProxy<O>,
                _ field: ObjectProxy<O>.FieldProxy<V>,
                _ newValue: V
            ) -> Void
        )? = nil,
        affectedByKeyPaths: @autoclosure @escaping () -> Set<KeyPathString> = []) {
        self.init(
--- a/Sources/FieldProtocol.swift
+++ b/Sources/FieldProtocol.swift
@@ -33,6 +33,14 @@ internal protocol FieldProtocol: PropertyProtocol {
    static var dynamicObjectType: CoreStoreObject.Type { get }
-    static func read(field: FieldProtocol, for rawObject: CoreStoreManagedObject) -> Any?
+    static func read(
-    static func modify(field: FieldProtocol, for rawObject: CoreStoreManagedObject, newValue: Any?)
+        field: FieldProtocol,
        for rawObject: CoreStoreManagedObject
    ) -> Any?
    static func modify(
        field: FieldProtocol,
        for rawObject: CoreStoreManagedObject,
        newValue: Any?
    )
 }
--- a/Sources/From+Querying.swift
+++ b/Sources/From+Querying.swift
--- a/Sources/From.swift
+++ b/Sources/From.swift
@@ -60,7 +60,10 @@ public struct From<O: DynamicObject> {
     */
    public init() {
-        self.init(entityClass: O.self, configurations: nil)
+        self.init(
            entityClass: O.self,
            configurations: nil
        )
    }
    /**
@@ -70,9 +73,14 @@ public struct From<O: DynamicObject> {
     ```
     - parameter entity: the associated `NSManagedObject` or `CoreStoreObject` type
     */
-    public init(_ entity: O.Type) {
+    public init(
-        
+        _ entity: O.Type
-        self.init(entityClass: entity, configurations: nil)
+    ) {
        self.init(
            entityClass: entity,
            configurations: nil
        )
    }
    /**
@@ -83,9 +91,15 @@ public struct From<O: DynamicObject> {
     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject` or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
     */
-    public init(_ configuration: ModelConfiguration, _ otherConfigurations: ModelConfiguration...) {
+    public init(
-        
+        _ configuration: ModelConfiguration,
-        self.init(entityClass: O.self, configurations: [configuration] + otherConfigurations)
+        _ otherConfigurations: ModelConfiguration...
    ) {
        self.init(
            entityClass: O.self,
            configurations: [configuration] + otherConfigurations
        )
    }
    /**
@@ -95,9 +109,14 @@ public struct From<O: DynamicObject> {
     ```
     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject` or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     */
-    public init(_ configurations: [ModelConfiguration]) {
+    public init(
-        
+        _ configurations: [ModelConfiguration]
-        self.init(entityClass: O.self, configurations: configurations)
+    ) {
        self.init(
            entityClass: O.self,
            configurations: configurations
        )
    }
    /**
@@ -109,9 +128,16 @@ public struct From<O: DynamicObject> {
     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject` or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
     */
-    public init(_ entity: O.Type, _ configuration: ModelConfiguration, _ otherConfigurations: ModelConfiguration...) {
+    public init(
-        
+        _ entity: O.Type,
-        self.init(entityClass: entity, configurations: [configuration] + otherConfigurations)
+        _ configuration: ModelConfiguration,
        _ otherConfigurations: ModelConfiguration...
    ) {
        self.init(
            entityClass: entity,
            configurations: [configuration] + otherConfigurations
        )
    }
    /**
@@ -122,9 +148,15 @@ public struct From<O: DynamicObject> {
     - parameter entity: the associated `NSManagedObject` or `CoreStoreObject` type
     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject` or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     */
-    public init(_ entity: O.Type, _ configurations: [ModelConfiguration]) {
+    public init(
-        
+        _ entity: O.Type,
-        self.init(entityClass: entity, configurations: configurations)
+        _ configurations: [ModelConfiguration]
    ) {
        self.init(
            entityClass: entity,
            configurations: configurations
        )
    }
@@ -132,14 +164,24 @@ public struct From<O: DynamicObject> {
    internal let findPersistentStores: (_ context: NSManagedObjectContext) -> [NSPersistentStore]?
-    internal init(entityClass: O.Type, configurations: [ModelConfiguration]?, findPersistentStores: @escaping (_ context: NSManagedObjectContext) -> [NSPersistentStore]?) {
+    internal init(
-        
+        entityClass: O.Type,
        configurations: [ModelConfiguration]?,
        findPersistentStores: @escaping (
            _ context: NSManagedObjectContext
        ) -> [NSPersistentStore]?
    ) {
        self.entityClass = entityClass
        self.configurations = configurations
        self.findPersistentStores = findPersistentStores
    }
-    internal func applyToFetchRequest<U>(_ fetchRequest: Internals.CoreStoreFetchRequest<U>, context: NSManagedObjectContext, applyAffectedStores: Bool = true) throws {
+    internal func applyToFetchRequest<U>(
        _ fetchRequest: Internals.CoreStoreFetchRequest<U>,
        context: NSManagedObjectContext,
        applyAffectedStores: Bool = true
    ) throws(CoreStoreError) {
        guard let parentStack = context.parentStack else {
@@ -158,7 +200,7 @@ public struct From<O: DynamicObject> {
            try self.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
        }
-        catch let error as CoreStoreError {
+        catch {
            Internals.log(
                error,
@@ -166,14 +208,13 @@ public struct From<O: DynamicObject> {
            )
            throw error
        }
        catch {
            throw error
        }
    }
-    internal func applyAffectedStoresForFetchedRequest<U>(_ fetchRequest: Internals.CoreStoreFetchRequest<U>, context: NSManagedObjectContext) throws {
+    internal func applyAffectedStoresForFetchedRequest<U>(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<U>,
        context: NSManagedObjectContext
    ) throws(CoreStoreError) {
        let stores = self.findPersistentStores(context)
        fetchRequest.affectedStores = stores
        if stores?.isEmpty == false {
@@ -186,8 +227,11 @@ public struct From<O: DynamicObject> {
    // MARK: Private
-    private init(entityClass: O.Type, configurations: [ModelConfiguration]?) {
+    private init(
-        
+        entityClass: O.Type,
        configurations: [ModelConfiguration]?
    ) {
        self.entityClass = entityClass
        self.configurations = configurations
@@ -211,10 +255,4 @@ public struct From<O: DynamicObject> {
            }
        }
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/GroupBy.swift
+++ b/Sources/GroupBy.swift
@@ -101,12 +101,6 @@ public struct GroupBy<O: DynamicObject>: GroupByClause, QueryClause, Hashable {
        hasher.combine(self.keyPaths)
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
 extension GroupBy where O: NSManagedObject {
@@ -153,46 +147,6 @@ extension GroupBy where O: CoreStoreObject {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    /**
     Initializes a `GroupBy` clause with a key path
     - parameter keyPath: a key path to group results with
     */
    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    /**
     Initializes a `GroupBy` clause with a key path
     - parameter keyPath: a key path to group results with
     */
    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    /**
     Initializes a `GroupBy` clause with a key path
     - parameter keyPath: a key path to group results with
     */
    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    /**
     Initializes a `GroupBy` clause with a key path
     - parameter keyPath: a key path to group results with
     */
    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
 }
@@ -213,3 +167,32 @@ public protocol GroupByClause {
     */
    var keyPaths: [KeyPathString] { get }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension GroupBy where O: CoreStoreObject {
    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
        self.init([O.meta[keyPath: keyPath].keyPath])
    }
 }
--- a/Sources/ImportableObject.swift
+++ b/Sources/ImportableObject.swift
@@ -66,15 +66,21 @@ public protocol ImportableObject: DynamicObject {
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     - returns: `true` if an object should be created from `source`. Return `false` to ignore.
     */
-    static func shouldInsert(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool
+    static func shouldInsert(
-    
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool
    /**
     Implements the actual importing of data from `source`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importObjects(:sourceArray:)` call to be cancelled.
     - parameter source: the object to import from
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     */
-    func didInsert(from source: ImportSource, in transaction: BaseDataTransaction) throws
+    func didInsert(
        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) throws(any Swift.Error)
 }
@@ -82,8 +88,11 @@ public protocol ImportableObject: DynamicObject {
 extension ImportableObject {
-    public static func shouldInsert(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool {
+    public static func shouldInsert(
-        
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool {
        return true
    }
 }
--- a/Sources/ImportableUniqueObject.swift
+++ b/Sources/ImportableUniqueObject.swift
@@ -78,8 +78,11 @@ public protocol ImportableUniqueObject: ImportableObject, Hashable {
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     - returns: `true` if an object should be created from `source`. Return `false` to ignore.
     */
-    static func shouldInsert(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool
+    static func shouldInsert(
-    
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool
    /**
     Return `true` if an object should be updated from `source`. Return `false` to ignore and skip `source`. The default implementation returns `true`.
@@ -87,8 +90,11 @@ public protocol ImportableUniqueObject: ImportableObject, Hashable {
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     - returns: `true` if an object should be updated from `source`. Return `false` to ignore.
     */
-    static func shouldUpdate(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool
+    static func shouldUpdate(
-    
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool
    /**
     Return the unique ID as extracted from `source`. This method is called before `shouldInsert(from:in:)` or `shouldUpdate(from:in:)`. Return `nil` to skip importing from `source`. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
@@ -96,23 +102,32 @@ public protocol ImportableUniqueObject: ImportableObject, Hashable {
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     - returns: the unique ID as extracted from `source`, or `nil` to skip importing from `source`.
     */
-    static func uniqueID(from source: ImportSource, in transaction: BaseDataTransaction) throws -> UniqueIDType?
+    static func uniqueID(
-    
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) throws(any Swift.Error) -> UniqueIDType?
    /**
     Implements the actual importing of data from `source`. This method is called just after the object is created and assigned its unique ID as returned from `uniqueID(from:in:)`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled. The default implementation simply calls `update(from:in:)`.
     - parameter source: the object to import from
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     */
-    func didInsert(from source: ImportSource, in transaction: BaseDataTransaction) throws
+    func didInsert(
-    
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) throws(any Swift.Error)
    /**
     Implements the actual importing of data from `source`. This method is called just after the existing object is fetched using its unique ID. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
     - parameter source: the object to import from
     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
     */
-    func update(from source: ImportSource, in transaction: BaseDataTransaction) throws
+    func update(
        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) throws(any Swift.Error)
 }
@@ -146,18 +161,27 @@ extension ImportableUniqueObject where UniqueIDType.QueryableNativeType: CoreDat
 extension ImportableUniqueObject {
-    public static func shouldInsert(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool {
+    public static func shouldInsert(
-        
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool {
        return Self.shouldUpdate(from: source, in: transaction)
    }
-    public static func shouldUpdate(from source: ImportSource, in transaction: BaseDataTransaction) -> Bool{
+    public static func shouldUpdate(
-        
+        from source: ImportSource,
        in transaction: BaseDataTransaction
    ) -> Bool {
        return true
    }
-    public func didInsert(from source: Self.ImportSource, in transaction: BaseDataTransaction) throws {
+    public func didInsert(
-        
+        from source: Self.ImportSource,
        in transaction: BaseDataTransaction
    ) throws(any Swift.Error) {
        try self.update(from: source, in: transaction)
    }
 }
--- a/Sources/InferredSchemaMappingProvider.swift
+++ b/Sources/InferredSchemaMappingProvider.swift
@@ -53,7 +53,14 @@ public final class InferredSchemaMappingProvider: Hashable, SchemaMappingProvide
    // MARK: SchemaMappingProvider
-    public func cs_createMappingModel(from sourceSchema: DynamicSchema, to destinationSchema: DynamicSchema, storage: LocalStorage) throws -> (mappingModel: NSMappingModel, migrationType: MigrationType) {
+    public func cs_createMappingModel(
        from sourceSchema: DynamicSchema,
        to destinationSchema: DynamicSchema,
        storage: LocalStorage
    ) throws(CoreStoreError) -> (
        mappingModel: NSMappingModel,
        migrationType: MigrationType
    ) {
        let sourceModel = sourceSchema.rawModel()
        let destinationModel = destinationSchema.rawModel()
--- a/Sources/Internals.CoreStoreFetchedResultsController.swift
+++ b/Sources/Internals.CoreStoreFetchedResultsController.swift
@@ -77,8 +77,8 @@ extension Internals {
        }
        @nonobjc
-        internal func performFetchFromSpecifiedStores() throws {
+        internal func performFetchFromSpecifiedStores() throws(any Swift.Error) {
-            
+
            try self.reapplyAffectedStores(self.typedFetchRequest, self.managedObjectContext)
            try self.performFetch()
@@ -103,6 +103,9 @@ extension Internals {
        // MARK: Private
        @nonobjc
-        private let reapplyAffectedStores: (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>, _ context: NSManagedObjectContext) throws -> Void
+        private let reapplyAffectedStores: (
            _ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>,
            _ context: NSManagedObjectContext
        ) throws(any Swift.Error) -> Void
    }
 }
--- a/Sources/Internals.DiffableDataUIDispatcher.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.swift
@@ -106,24 +106,23 @@ extension Internals {
                    }
                }
-                #if canImport(QuartzCore)
+#if os(watchOS) || !canImport(QuartzCore)
                performDiffingUpdates()
 #else
                CATransaction.begin()
-
+                
                if !animatingDifferences {
-
+                    
                    CATransaction.setDisableActions(true)
                }
                performDiffingUpdates()
-
+                
                CATransaction.commit()
-                #else
+#endif
                performDiffingUpdates()
                #endif
            }
        }
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -91,11 +91,14 @@ extension Internals {
        // MARK: NSFetchedResultsControllerDelegate
        @objc
-        dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+        dynamic func controllerDidChangeContent(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>
        ) {
            var snapshot = Internals.DiffableDataSourceSnapshot(
                sections: controller.sections ?? [],
-                sectionIndexTransformer: self.handler.map({ $0.sectionIndexTransformer }) ?? { _ in nil },
+                sectionIndexTransformer: self.handler
                    .map({ $0.sectionIndexTransformer }) ?? { _ in nil },
                fetchOffset: controller.fetchRequest.fetchOffset,
                fetchLimit: controller.fetchRequest.fetchLimit
            )
@@ -117,13 +120,24 @@ extension Internals {
        }
        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+        dynamic func controller(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>,
            didChange anObject: Any,
            at indexPath: IndexPath?,
            for type: NSFetchedResultsChangeType,
            newIndexPath: IndexPath?
        ) {
            let object = anObject as! NSManagedObject
            self.reloadedItemIDs.append(object.objectID)
        }
-        func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
+        func controller(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>,
            didChange sectionInfo: NSFetchedResultsSectionInfo,
            atSectionIndex sectionIndex: Int,
            for type: NSFetchedResultsChangeType
        ) {
            self.reloadedSectionIDs.append(sectionInfo.name)
        }
--- a/Sources/Internals.FetchedResultsControllerDelegate.swift
+++ b/Sources/Internals.FetchedResultsControllerDelegate.swift
@@ -96,7 +96,9 @@ extension Internals {
        // MARK: NSFetchedResultsControllerDelegate
        @objc
-        dynamic func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+        dynamic func controllerWillChangeContent(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>
        ) {
            self.taskGroup.enter()
            guard self.enabled else {
@@ -107,7 +109,9 @@ extension Internals {
        }
        @objc
-        dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+        dynamic func controllerDidChangeContent(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>
        ) {
            defer {
@@ -121,7 +125,13 @@ extension Internals {
        }
        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+        dynamic func controller(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>,
            didChange anObject: Any,
            at indexPath: IndexPath?,
            for type: NSFetchedResultsChangeType,
            newIndexPath: IndexPath?
        ) {
            guard self.enabled else {
@@ -137,7 +147,12 @@ extension Internals {
        }
        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
+        dynamic func controller(
            _ controller: NSFetchedResultsController<NSFetchRequestResult>,
            didChange sectionInfo: NSFetchedResultsSectionInfo,
            atSectionIndex sectionIndex: Int,
            for type: NSFetchedResultsChangeType
        ) {
            guard self.enabled else {
--- a/Sources/Internals.MigrationManager.swift
+++ b/Sources/Internals.MigrationManager.swift
@@ -55,11 +55,18 @@ extension Internals {
        // MARK: NSMigrationManager
-        init(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, progress: Progress) {
+        init(
            sourceModel: NSManagedObjectModel,
            destinationModel: NSManagedObjectModel,
            progress: Progress
        ) {
            self.progress = progress
-            super.init(sourceModel: sourceModel, destinationModel: destinationModel)
+            super.init(
                sourceModel: sourceModel,
                destinationModel: destinationModel
            )
        }
--- a/Sources/Internals.NotificationObserver.swift
+++ b/Sources/Internals.NotificationObserver.swift
@@ -38,7 +38,12 @@ extension Internals {
        let observer: NSObjectProtocol
-        init(notificationName: Notification.Name, object: Any?, queue: OperationQueue? = nil, closure: @escaping (_ note: Notification) -> Void) {
+        init(
            notificationName: Notification.Name,
            object: Any?,
            queue: OperationQueue? = nil,
            closure: @escaping (_ note: Notification) -> Void
        ) {
            self.observer = NotificationCenter.default.addObserver(
                forName: notificationName,
--- a/Sources/Internals.SharedNotificationObserver.swift
+++ b/Sources/Internals.SharedNotificationObserver.swift
@@ -35,7 +35,12 @@ extension Internals {
        // MARK: Internal
-        internal init(notificationName: Notification.Name, object: Any?, queue: OperationQueue? = nil, sharedValue: @escaping (_ note: Notification) -> T) {
+        internal init(
            notificationName: Notification.Name,
            object: Any?,
            queue: OperationQueue? = nil,
            sharedValue: @escaping (_ note: Notification) -> T
        ) {
            self.observer = NotificationCenter.default.addObserver(
                forName: notificationName,
@@ -59,9 +64,15 @@ extension Internals {
            self.observers.removeAllObjects()
        }
-        internal func addObserver<U: AnyObject>(_ observer: U, closure: @escaping (T) -> Void) {
+        internal func addObserver<U: AnyObject>(
            _ observer: U,
            closure: @escaping (T) -> Void
        ) {
-            self.observers.setObject(Closure<T, Void>(closure), forKey: observer)
+            self.observers.setObject(
                Closure<T, Void>(closure),
                forKey: observer
            )
        }
        internal func removeObserver<U: AnyObject>(_ observer: U) {
--- a/Sources/Internals.swift
+++ b/Sources/Internals.swift
@@ -39,8 +39,6 @@ internal enum Internals {
        return object_getClass(instance) as! T.Type
    }
    // MARK: Associated Objects
    @inline(__always)
    internal static func getAssociatedObjectForKey<T: AnyObject>(_ key: UnsafeRawPointer, inObject object: Any) -> T? {
@@ -123,4 +121,47 @@ internal enum Internals {
        return closure()
    }
    @inline(__always)
    internal static func autoreleasepool<T>(
        _ closure: () -> T
    ) -> T {
        return ObjectiveC.autoreleasepool(invoking: closure)
    }
    @inline(__always)
    internal static func autoreleasepool<T>(
        _ closure: () throws(any Swift.Error) -> T
    ) throws(any Swift.Error) -> T {
        return try ObjectiveC.autoreleasepool(invoking: closure)
    }
    @inline(__always)
    internal static func autoreleasepool<T>(
        _ closure: () throws(CoreStoreError) -> T
    ) throws(CoreStoreError) -> T {
        do {
            return try ObjectiveC.autoreleasepool(invoking: closure)
        }
        catch {
            throw CoreStoreError(error)
        }
    }
    @inline(__always)
    internal static func withCheckedThrowingContinuation<T>(
        function: String = #function,
        _ body: (CheckedContinuation<T, any Swift.Error>) -> Void
    ) async throws(any Swift.Error) -> T {
        return try await _Concurrency.withCheckedThrowingContinuation(
            function: function,
            body
        )
    }
 }
--- a/Sources/Into.swift
+++ b/Sources/Into.swift
@@ -60,7 +60,11 @@ public struct Into<O: DynamicObject>: Hashable {
     */
    public init() {
-        self.init(entityClass: O.self, configuration: nil, inferStoreIfPossible: true)
+        self.init(
            entityClass: O.self,
            configuration: nil,
            inferStoreIfPossible: true
        )
    }
    /**
@@ -70,9 +74,15 @@ public struct Into<O: DynamicObject>: Hashable {
     ```
     - parameter entity: the `NSManagedObject` or `CoreStoreObject` type to be created
     */
-    public init(_ entity: O.Type) {
+    public init(
-        
+        _ entity: O.Type
-        self.init(entityClass: entity, configuration: nil, inferStoreIfPossible: true)
+    ) {
        self.init(
            entityClass: entity,
            configuration: nil,
            inferStoreIfPossible: true
        )
    }
    /**
@@ -82,9 +92,15 @@ public struct Into<O: DynamicObject>: Hashable {
     ```
     - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     */
-    public init(_ configuration: ModelConfiguration) {
+    public init(
-        
+        _ configuration: ModelConfiguration
-        self.init(entityClass: O.self, configuration: configuration, inferStoreIfPossible: false)
+    ) {
        self.init(
            entityClass: O.self,
            configuration: configuration,
            inferStoreIfPossible: false
        )
    }
    /**
@@ -95,9 +111,16 @@ public struct Into<O: DynamicObject>: Hashable {
     - parameter entity: the `NSManagedObject` or `CoreStoreObject` type to be created
     - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s or `CoreStoreObject`'s entity type. Set to `nil` to use the default configuration.
     */
-    public init(_ entity: O.Type, _ configuration: ModelConfiguration) {
+    public init(
-        
+        _ entity: O.Type,
-        self.init(entityClass: entity, configuration: configuration, inferStoreIfPossible: false)
+        _ configuration: ModelConfiguration
    ) {
        self.init(
            entityClass: entity,
            configuration: configuration,
            inferStoreIfPossible: false
        )
    }
@@ -125,16 +148,14 @@ public struct Into<O: DynamicObject>: Hashable {
    internal let inferStoreIfPossible: Bool
-    internal init(entityClass: O.Type, configuration: ModelConfiguration, inferStoreIfPossible: Bool) {
+    internal init(
-        
+        entityClass: O.Type,
        configuration: ModelConfiguration,
        inferStoreIfPossible: Bool
    ) {
        self.entityClass = entityClass
        self.configuration = configuration
        self.inferStoreIfPossible = inferStoreIfPossible
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/KeyPath+Querying.swift
+++ b/Sources/KeyPath+Querying.swift
--- a/Sources/KeyPathGenericBindings.swift
+++ b/Sources/KeyPathGenericBindings.swift
@@ -317,9 +317,3 @@ extension NSSet: AllowedObjectiveCToManyRelationshipKeyPathValue {}
 extension NSOrderedSet: AllowedObjectiveCToManyRelationshipKeyPathValue {}
 extension Optional: AllowedObjectiveCToManyRelationshipKeyPathValue where Wrapped: AllowedObjectiveCToManyRelationshipKeyPathValue, Wrapped: AllowedObjectiveCRelationshipKeyPathValue {}
 // MARK: - Deprecated
@available(*, deprecated, renamed: "AllowedObjectiveCToManyRelationshipKeyPathValue")
 public typealias AllowedCoreStoreObjectCollectionKeyPathValue = AllowedObjectiveCToManyRelationshipKeyPathValue
--- a/Sources/KeyPathStringConvertible.swift
+++ b/Sources/KeyPathStringConvertible.swift
@@ -92,12 +92,3 @@ public protocol RelationshipKeyPathStringConvertible: KeyPathStringConvertible {
 */
 public protocol ToManyRelationshipKeyPathStringConvertible: RelationshipKeyPathStringConvertible where ReturnValueType: Sequence {}
 // MARK: - Deprecated
@available(*, deprecated, renamed: "AnyKeyPathStringConvertible")
 public typealias AnyDynamicKeyPath = AnyKeyPathStringConvertible
@available(*, deprecated, renamed: "KeyPathStringConvertible")
 public typealias DynamicKeyPath = KeyPathStringConvertible
--- a/Sources/ListMonitor.swift
+++ b/Sources/ListMonitor.swift
@@ -1440,21 +1440,6 @@ extension ListMonitor where O: NSManagedObject {
        return self.sectionInfo(safelyAt: section)?.objects as! [O]?
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "objects(in:)")
    public func objectsInSection(_ section: Int) -> [O] {
        return self.objects(in: section)
    }
    @available(*, deprecated, renamed: "objects(safelyIn:)")
    public func objectsInSection(safeSectionIndex section: Int) -> [O]? {
        return self.objects(safelyIn: section)
    }
 }
@@ -1500,12 +1485,6 @@ extension ListMonitor where O: CoreStoreObject {
        return (self.sectionInfo(safelyAt: section)?.objects)?
            .map({ O.cs_fromRaw(object: $0 as! NSManagedObject) })
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/ListPublisher+Reactive.swift
+++ b/Sources/ListPublisher+Reactive.swift
@@ -95,8 +95,10 @@ extension ListPublisher.ReactiveNamespace {
     - parameter emitInitialValue: If `true`, the current value is immediately emitted to the first subscriber. If `false`, the event fires only starting the next `ListSnapshot` update.
     - returns: A `Publisher` that emits a `ListSnapshot` whenever changes occur in the `ListPublisher`.
     */
-    public func snapshot(emitInitialValue: Bool = true) -> ListPublisher.SnapshotPublisher {
+    public func snapshot(
-        
+        emitInitialValue: Bool = true
    ) -> ListPublisher.SnapshotPublisher {
        return .init(
            listPublisher: self.base,
            emitInitialValue: emitInitialValue
--- a/Sources/ListPublisher.SnapshotPublisher.swift
+++ b/Sources/ListPublisher.SnapshotPublisher.swift
@@ -52,8 +52,10 @@ extension ListPublisher {
        public typealias Output = ListSnapshot<O>
        public typealias Failure = Never
-        public func receive<S: Subscriber>(subscriber: S) where S.Input == Output, S.Failure == Failure {
+        public func receive<S: Subscriber>(
-            
+            subscriber: S
        ) where S.Input == Output, S.Failure == Failure {
            subscriber.receive(
                subscription: ListSnapshotSubscription(
                    publisher: self.listPublisher,
--- a/Sources/ListPublisher.swift
+++ b/Sources/ListPublisher.swift
@@ -186,7 +186,7 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
    public func refetch<B: FetchChainableBuilderType>(
        _ clauseChain: B,
        sourceIdentifier: Any? = nil
-    ) throws where B.ObjectType == O {
+    ) throws(any Swift.Error) where B.ObjectType == O {
        try self.refetch(
            from: clauseChain.from,
@@ -215,7 +215,7 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
    public func refetch<B: SectionMonitorBuilderType>(
        _ clauseChain: B,
        sourceIdentifier: Any? = nil
-    ) throws where B.ObjectType == O {
+    ) throws(any Swift.Error) where B.ObjectType == O {
        try self.refetch(
            from: clauseChain.from,
@@ -343,7 +343,7 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
        sectionBy: SectionBy<O>?,
        applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void,
        sourceIdentifier: Any?
-    ) throws {
+    ) throws(any Swift.Error) {
        let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
            context: self.fetchedResultsController.managedObjectContext,
--- a/Sources/NSEntityDescription+Migration.swift
+++ b/Sources/NSEntityDescription+Migration.swift
@@ -32,7 +32,12 @@ import Foundation
 extension NSEntityDescription {
    @nonobjc
-    internal func cs_resolveAttributeNames() -> [String: (attribute: NSAttributeDescription, versionHash: Data)] {
+    internal func cs_resolveAttributeNames() -> [
        String: (
            attribute: NSAttributeDescription,
            versionHash: Data
        )
    ] {
        return self.attributesByName.reduce(
            into: [:],
@@ -44,7 +49,12 @@ extension NSEntityDescription {
    }
    @nonobjc
-    internal func cs_resolveAttributeRenamingIdentities() -> [String: (attribute: NSAttributeDescription, versionHash: Data)] {
+    internal func cs_resolveAttributeRenamingIdentities() -> [
        String: (
            attribute: NSAttributeDescription,
            versionHash: Data
        )
    ] {
        return self.attributesByName.reduce(
            into: [:],
@@ -56,7 +66,12 @@ extension NSEntityDescription {
    }
    @nonobjc
-    internal func cs_resolveRelationshipNames() -> [String: (relationship: NSRelationshipDescription, versionHash: Data)] {
+    internal func cs_resolveRelationshipNames() -> [
        String: (
            relationship: NSRelationshipDescription,
            versionHash: Data
        )
    ] {
        return self.relationshipsByName.reduce(
            into: [:],
@@ -68,7 +83,12 @@ extension NSEntityDescription {
    }
    @nonobjc
-    internal func cs_resolveRelationshipRenamingIdentities() -> [String: (relationship: NSRelationshipDescription, versionHash: Data)] {
+    internal func cs_resolveRelationshipRenamingIdentities() -> [
        String: (
            relationship: NSRelationshipDescription,
            versionHash: Data
        )
    ] {
        return self.relationshipsByName.reduce(
            into: [:],
--- a/Sources/NSFetchedResultsController+Convenience.swift
+++ b/Sources/NSFetchedResultsController+Convenience.swift
@@ -41,8 +41,12 @@ extension DataStack {
     - returns: an `NSFetchedResultsController` that observes the `DataStack`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: FetchClause...
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.mainContext,
            from: from,
@@ -61,8 +65,12 @@ extension DataStack {
     - returns: an `NSFetchedResultsController` that observes the `DataStack`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: [FetchClause]
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.mainContext,
            from: from,
@@ -80,8 +88,11 @@ extension DataStack {
     - returns: an `NSFetchedResultsController` that observes the `DataStack`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.mainContext,
            from: from,
@@ -99,8 +110,12 @@ extension DataStack {
     - returns: an `NSFetchedResultsController` that observes the `DataStack`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(forDataStack dataStack: DataStack, _ from: From<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        forDataStack dataStack: DataStack,
        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.mainContext,
            from: from,
@@ -125,8 +140,12 @@ extension UnsafeDataTransaction {
     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: FetchClause...
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.context,
            from: from,
@@ -145,8 +164,12 @@ extension UnsafeDataTransaction {
     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ sectionBy: SectionBy<O>,
        _ fetchClauses: [FetchClause]
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.context,
            from: from,
@@ -164,8 +187,11 @@ extension UnsafeDataTransaction {
     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.context,
            from: from,
@@ -183,8 +209,11 @@ extension UnsafeDataTransaction {
     - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
     */
    @nonobjc
-    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
+    public func createFetchedResultsController<O: NSManagedObject>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) -> NSFetchedResultsController<O> {
        return Internals.createFRC(
            fromContext: self.context,
            from: from,
@@ -202,7 +231,12 @@ extension Internals {
    // MARK: FilePrivate
-    fileprivate static func createFRC<O: NSManagedObject>(fromContext context: NSManagedObjectContext, from: From<O>, sectionBy: SectionBy<O>? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
+    fileprivate static func createFRC<O: NSManagedObject>(
        fromContext context: NSManagedObjectContext,
        from: From<O>,
        sectionBy: SectionBy<O>? = nil,
        fetchClauses: [FetchClause]
    ) -> NSFetchedResultsController<O> {
        let controller = Internals.CoreStoreFetchedResultsController(
            context: context,
--- a/Sources/NSManagedObject+Convenience.swift
+++ b/Sources/NSManagedObject+Convenience.swift
@@ -84,8 +84,10 @@ extension NSManagedObject {
     - returns: the primitive value for the KVC key
     */
    @nonobjc @inline(__always)
-    public func getValue(forKvcKey kvcKey: KeyPathString) -> Any? {
+    public func getValue(
-        
+        forKvcKey kvcKey: KeyPathString
    ) -> Any? {
        self.willAccessValue(forKey: kvcKey)
        defer {
@@ -102,8 +104,11 @@ extension NSManagedObject {
     - returns: the primitive value transformed by the `didGetValue` closure
     */
    @nonobjc @inline(__always)
-    public func getValue<T>(forKvcKey kvcKey: KeyPathString, didGetValue: (Any?) throws -> T) rethrows -> T {
+    public func getValue<T>(
-        
+        forKvcKey kvcKey: KeyPathString,
        didGetValue: (Any?) throws(any Swift.Error) -> T
    ) rethrows -> T {
        self.willAccessValue(forKey: kvcKey)
        defer {
@@ -121,8 +126,12 @@ extension NSManagedObject {
     - returns: the primitive value transformed by the `didGetValue` closure
     */
    @nonobjc @inline(__always)
-    public func getValue<T>(forKvcKey kvcKey: KeyPathString, willGetValue: () throws -> Void, didGetValue: (Any?) throws -> T) rethrows -> T {
+    public func getValue<T>(
-        
+        forKvcKey kvcKey: KeyPathString,
        willGetValue: () throws(any Swift.Error) -> Void,
        didGetValue: (Any?) throws(any Swift.Error) -> T
    ) rethrows -> T {
        self.willAccessValue(forKey: kvcKey)
        defer {
@@ -139,8 +148,11 @@ extension NSManagedObject {
     - parameter KVCKey: the KVC key
     */
    @nonobjc @inline(__always)
-    public func setValue(_ value: Any?, forKvcKey KVCKey: KeyPathString) {
+    public func setValue(
-        
+        _ value: Any?,
        forKvcKey KVCKey: KeyPathString
    ) {
        self.willChangeValue(forKey: KVCKey)
        defer {
@@ -157,8 +169,12 @@ extension NSManagedObject {
     - parameter didSetValue: called after executing `setPrimitiveValue(forKey:)`.
     */
    @nonobjc @inline(__always)
-    public func setValue(_ value: Any?, forKvcKey KVCKey: KeyPathString, didSetValue: () -> Void) {
+    public func setValue(
-        
+        _ value: Any?,
        forKvcKey KVCKey: KeyPathString,
        didSetValue: () -> Void
    ) {
        self.willChangeValue(forKey: KVCKey)
        defer {
@@ -177,8 +193,13 @@ extension NSManagedObject {
     - parameter didSetValue: called after executing `setPrimitiveValue(forKey:)`.
     */
    @nonobjc @inline(__always)
-    public func setValue<T>(_ value: T, forKvcKey KVCKey: KeyPathString, willSetValue: (T) throws -> Any?, didSetValue: (Any?) -> Void = { _ in }) rethrows {
+    public func setValue<T>(
-        
+        _ value: T,
        forKvcKey KVCKey: KeyPathString,
        willSetValue: (T) throws(any Swift.Error) -> Any?,
        didSetValue: (Any?) -> Void = { _ in }
    ) rethrows {
        self.willChangeValue(forKey: KVCKey)
        defer {
--- a/Sources/NSManagedObjectContext+Querying.swift
+++ b/Sources/NSManagedObjectContext+Querying.swift
@@ -34,8 +34,10 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    // MARK: FetchableSource
    @nonobjc
-    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ object: O
    ) -> O? {
        let rawObject = object.cs_toRaw()
        if rawObject.objectID.isTemporaryID {
@@ -75,8 +77,10 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
+    public func fetchExisting<O: DynamicObject>(
-        
+        _ objectID: NSManagedObjectID
    ) -> O? {
        do {
            let existingObject = try self.existingObject(with: objectID)
@@ -89,26 +93,36 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objects: S
    ) -> [O] where S.Iterator.Element == O {
        return objects.compactMap({ self.fetchExisting($0.cs_id()) })
    }
    @nonobjc
-    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objectIDs: S) -> [O] where S.Iterator.Element == NSManagedObjectID {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(
-        
+        _ objectIDs: S
    ) -> [O] where S.Iterator.Element == NSManagedObjectID {
        return objectIDs.compactMap({ self.fetchExisting($0) })
    }
    @nonobjc
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> O? {
        return try self.fetchOne(from, fetchClauses)
    }
    @nonobjc
-    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
+    public func fetchOne<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> O? {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -120,20 +134,31 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
+    public func fetchOne<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
-        return try self.fetchOne(clauseChain.from, clauseChain.fetchClauses)
+    ) throws(CoreStoreError) -> B.ObjectType? {
        return try self.fetchOne(
            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
    @nonobjc
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [O] {
        return try self.fetchAll(from, fetchClauses)
    }
    @nonobjc
-    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
+    public func fetchAll<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [O] {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -146,20 +171,31 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
+    public func fetchAll<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
-        return try self.fetchAll(clauseChain.from, clauseChain.fetchClauses)
+    ) throws(CoreStoreError) -> [B.ObjectType] {
        return try self.fetchAll(
            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
    @nonobjc
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(
-    
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> Int {
        return try self.fetchCount(from, fetchClauses)
    }
    @nonobjc
-    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> Int {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSNumber>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -170,20 +206,31 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
+    public func fetchCount<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
-        return try self.fetchCount(clauseChain.from, clauseChain.fetchClauses)
+    ) throws(CoreStoreError) -> Int {
        return try self.fetchCount(
            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
    @nonobjc
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        return try self.fetchObjectID(from, fetchClauses)
    }
    @nonobjc
-    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObjectID>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -195,19 +242,30 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
+    public func fetchObjectID<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
-        return try self.fetchObjectID(clauseChain.from, clauseChain.fetchClauses)
+    ) throws(CoreStoreError) -> NSManagedObjectID? {
        return try self.fetchObjectID(
            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
    @nonobjc
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
-        
+        _ from: From<O>,
        _ fetchClauses: FetchClause...
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        return try self.fetchObjectIDs(from, fetchClauses)
    }
    @nonobjc
-    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(
        _ from: From<O>,
        _ fetchClauses: [FetchClause]
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObjectID>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -220,14 +278,21 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<B: FetchChainableBuilderType>(
-        
+        _ clauseChain: B
-        return try self.fetchObjectIDs(clauseChain.from, clauseChain.fetchClauses)
+    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        return try self.fetchObjectIDs(
            clauseChain.from,
            clauseChain.fetchClauses
        )
    }
    @nonobjc
-    internal func fetchObjectIDs(_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObjectID>) throws -> [NSManagedObjectID] {
+    internal func fetchObjectIDs(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObjectID>
    ) throws(CoreStoreError) -> [NSManagedObjectID] {
        var fetchResults: [NSManagedObjectID]?
        var fetchError: Error?
        self.performAndWait {
@@ -257,14 +322,22 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    // MARK: QueryableSource
    @nonobjc
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> U? {
        return try self.queryValue(from, selectClause, queryClauses)
    }
    @nonobjc
-    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> U? {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSDictionary>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -277,20 +350,34 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    }
    @nonobjc
-    public func queryValue<B>(_ clauseChain: B) throws -> B.ResultType? where B: QueryChainableBuilderType, B.ResultType: QueryableAttributeType {
+    public func queryValue<B>(
-        
+        _ clauseChain: B
-        return try self.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+    ) throws(CoreStoreError) -> B.ResultType? where B: QueryChainableBuilderType, B.ResultType: QueryableAttributeType {
        return try self.queryValue(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
    @nonobjc
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> [[String: Any]] {
        return try self.queryAttributes(from, selectClause, queryClauses)
    }
    @nonobjc
-    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(
-        
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> [[String: Any]] {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSDictionary>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -302,9 +389,15 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
        return try self.queryAttributes(fetchRequest)
    }
-    public func queryAttributes<B>(_ clauseChain: B) throws -> [[String : Any]] where B : QueryChainableBuilderType, B.ResultType == NSDictionary {
+    public func queryAttributes<B>(
-        
+        _ clauseChain: B
-        return try self.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+    ) throws(CoreStoreError) -> [[String : Any]] where B : QueryChainableBuilderType, B.ResultType == NSDictionary {
        return try self.queryAttributes(
            clauseChain.from,
            clauseChain.select,
            clauseChain.queryClauses
        )
    }
@@ -320,8 +413,11 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
    // MARK: Deleting
    @nonobjc
-    internal func deleteAll<O>(_ from: From<O>, _ deleteClauses: [FetchClause]) throws -> Int {
+    internal func deleteAll<O>(
-        
+        _ from: From<O>,
        _ deleteClauses: [FetchClause]
    ) throws(CoreStoreError) -> Int {
        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
        try from.applyToFetchRequest(fetchRequest, context: self)
@@ -343,10 +439,12 @@ extension NSManagedObjectContext {
    // MARK: Fetching
    @nonobjc
-    internal func fetchOne<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> O? {
+    internal func fetchOne<O: NSManagedObject>(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<O>
    ) throws(CoreStoreError) -> O? {
        var fetchResults: [O]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -371,10 +469,12 @@ extension NSManagedObjectContext {
    }
    @nonobjc
-    internal func fetchAll<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> [O] {
+    internal func fetchAll<O: NSManagedObject>(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<O>
    ) throws(CoreStoreError) -> [O] {
        var fetchResults: [O]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -399,10 +499,12 @@ extension NSManagedObjectContext {
    }
    @nonobjc
-    internal func fetchCount(_ fetchRequest: Internals.CoreStoreFetchRequest<NSNumber>) throws -> Int {
+    internal func fetchCount(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<NSNumber>
    ) throws(CoreStoreError) -> Int {
        var count = 0
-        var countError: Error?
+        var countError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -427,10 +529,12 @@ extension NSManagedObjectContext {
    }
    @nonobjc
-    internal func fetchObjectID(_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObjectID>) throws -> NSManagedObjectID? {
+    internal func fetchObjectID(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObjectID>
    ) throws(CoreStoreError) -> NSManagedObjectID? {
        var fetchResults: [NSManagedObjectID]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -458,10 +562,13 @@ extension NSManagedObjectContext {
    // MARK: Querying
    @nonobjc
-    internal func queryValue<O, U: QueryableAttributeType>(_ selectTerms: [SelectTerm<O>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> U? {
+    internal func queryValue<O, U: QueryableAttributeType>(
-        
+        _ selectTerms: [SelectTerm<O>],
        fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>
    ) throws(CoreStoreError) -> U? {
        var fetchResults: [Any]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -491,10 +598,13 @@ extension NSManagedObjectContext {
    }
    @nonobjc
-    internal func queryValue<O>(_ selectTerms: [SelectTerm<O>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> Any? {
+    internal func queryValue<O>(
-        
+        _ selectTerms: [SelectTerm<O>],
        fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>
    ) throws(CoreStoreError) -> Any? {
        var fetchResults: [Any]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -524,10 +634,12 @@ extension NSManagedObjectContext {
    }
    @nonobjc
-    internal func queryAttributes(_ fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> [[String: Any]] {
+    internal func queryAttributes(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>
    ) throws(CoreStoreError) -> [[String: Any]] {
        var fetchResults: [Any]?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
            do {
@@ -555,14 +667,16 @@ extension NSManagedObjectContext {
    // MARK: Deleting
    @nonobjc
-    internal func deleteAll<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> Int {
+    internal func deleteAll<O: NSManagedObject>(
-        
+        _ fetchRequest: Internals.CoreStoreFetchRequest<O>
    ) throws(CoreStoreError) -> Int {
        var numberOfDeletedObjects: Int?
-        var fetchError: Error?
+        var fetchError: (any Swift.Error)?
        self.performAndWait {
-            autoreleasepool {
+            Internals.autoreleasepool {
-                
+
                do {
                    let fetchResults = try self.fetch(fetchRequest.staticCast())
--- a/Sources/NSPersistentStoreCoordinator+Setup.swift
+++ b/Sources/NSPersistentStoreCoordinator+Setup.swift
@@ -32,14 +32,18 @@ import CoreData
 extension NSPersistentStoreCoordinator {
    @nonobjc
-    internal func performAsynchronously(_ closure: @escaping () -> Void) {
+    internal func performAsynchronously(
-        
+        _ closure: @escaping () -> Void
    ) {
        self.perform(closure)
    }
    @nonobjc
-    internal func performSynchronously<T>(_ closure: @escaping () -> T) -> T {
+    internal func performSynchronously<T>(
-        
+        _ closure: @escaping () -> T
    ) -> T {
        var result: T?
        self.performAndWait {
@@ -49,9 +53,11 @@ extension NSPersistentStoreCoordinator {
    }
    @nonobjc
-    internal func performSynchronously<T>(_ closure: @escaping () throws -> T) throws -> T {
+    internal func performSynchronously<T>(
-        
+        _ closure: @escaping () throws(any Swift.Error) -> T
-        var closureError: Error?
+    ) throws(CoreStoreError) -> T {
        var closureError: (any Swift.Error)?
        var result: T?
        self.performAndWait {
@@ -66,29 +72,27 @@ extension NSPersistentStoreCoordinator {
        }
        if let closureError = closureError {
-            throw closureError
+            throw CoreStoreError(closureError)
        }
        return result!
    }
-    
+
    @nonobjc
-    internal func addPersistentStoreSynchronously(_ storeType: String, configuration: ModelConfiguration, URL storeURL: URL?, options: [AnyHashable: Any]?) throws -> NSPersistentStore {
+    internal func addPersistentStoreSynchronously(
-        
+        _ storeType: String,
        configuration: ModelConfiguration,
        URL storeURL: URL?,
        options: [AnyHashable: Any]?
    ) throws(CoreStoreError) -> NSPersistentStore {
        return try self.performSynchronously {
-            
+
-            do {
+            return try self.addPersistentStore(
-                
+                ofType: storeType,
-                return try self.addPersistentStore(
+                configurationName: configuration,
-                    ofType: storeType,
+                at: storeURL,
-                    configurationName: configuration,
+                options: options
-                    at: storeURL,
+            )
                    options: options
                )
            }
            catch {
                throw CoreStoreError(error)
            }
        }
    }
 }
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -408,12 +408,6 @@ public final class ObjectMonitor<O: DynamicObject>: Hashable, ObjectRepresentati
            inObject: observer
        )
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/ObjectProxy.swift
+++ b/Sources/ObjectProxy.swift
@@ -38,7 +38,9 @@ public struct ObjectProxy<O: CoreStoreObject> {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>) -> FieldProxy<V> {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>
    ) -> FieldProxy<V> {
        return .init(rawObject: self.rawObject, keyPath: member)
    }
@@ -46,7 +48,9 @@ public struct ObjectProxy<O: CoreStoreObject> {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) -> FieldProxy<V> {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>
    ) -> FieldProxy<V> {
        return .init(rawObject: self.rawObject, keyPath: member)
    }
@@ -54,7 +58,9 @@ public struct ObjectProxy<O: CoreStoreObject> {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>) -> FieldProxy<V> {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>
    ) -> FieldProxy<V> {
        return .init(rawObject: self.rawObject, keyPath: member)
    }
@@ -111,22 +117,34 @@ public struct ObjectProxy<O: CoreStoreObject> {
        // MARK: Internal
-        internal init<OBase>(rawObject: CoreStoreManagedObject, keyPath: KeyPath<O, FieldContainer<OBase>.Stored<V>>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            keyPath: KeyPath<O, FieldContainer<OBase>.Stored<V>>
        ) {
            self.init(rawObject: rawObject, field: O.meta[keyPath: keyPath])
        }
-        internal init<OBase>(rawObject: CoreStoreManagedObject, keyPath: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            keyPath: KeyPath<O, FieldContainer<OBase>.Virtual<V>>
        ) {
            self.init(rawObject: rawObject, field: O.meta[keyPath: keyPath])
        }
-        internal init<OBase>(rawObject: CoreStoreManagedObject, keyPath: KeyPath<O, FieldContainer<OBase>.Coded<V>>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            keyPath: KeyPath<O, FieldContainer<OBase>.Coded<V>>
        ) {
            self.init(rawObject: rawObject, field: O.meta[keyPath: keyPath])
        }
-        internal init<OBase>(rawObject: CoreStoreManagedObject, field: FieldContainer<OBase>.Stored<V>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            field: FieldContainer<OBase>.Stored<V>
        ) {
            let keyPathString = field.keyPath
            self.getValue = {
@@ -157,7 +175,10 @@ public struct ObjectProxy<O: CoreStoreObject> {
            }
        }
-        internal init<OBase>(rawObject: CoreStoreManagedObject, field: FieldContainer<OBase>.Virtual<V>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            field: FieldContainer<OBase>.Virtual<V>
        ) {
            let keyPathString = field.keyPath
            self.getValue = {
@@ -190,7 +211,10 @@ public struct ObjectProxy<O: CoreStoreObject> {
            }
        }
-        internal init<OBase>(rawObject: CoreStoreManagedObject, field: FieldContainer<OBase>.Coded<V>) {
+        internal init<OBase>(
            rawObject: CoreStoreManagedObject,
            field: FieldContainer<OBase>.Coded<V>
        ) {
            let keyPathString = field.keyPath
            self.getValue = {
--- a/Sources/ObjectPublisher+Reactive.swift
+++ b/Sources/ObjectPublisher+Reactive.swift
@@ -94,8 +94,10 @@ extension ObjectPublisher.ReactiveNamespace {
     - parameter emitInitialValue: If `true`, the current value is immediately emitted to the first subscriber. If `false`, the event fires only starting the next `ObjectSnapshot` update.
     - returns: A `Publisher` that emits an `ObjectSnapshot?` whenever changes occur in the `ObjectPublisher`. The event emits `nil` if the object has been deletd.
     */
-    public func snapshot(emitInitialValue: Bool = true) -> ObjectPublisher.SnapshotPublisher {
+    public func snapshot(
-        
+        emitInitialValue: Bool = true
    ) -> ObjectPublisher.SnapshotPublisher {
        return .init(
            objectPublisher: self.base,
            emitInitialValue: emitInitialValue
@@ -111,7 +113,9 @@ extension ObjectPublisher.ReactiveNamespace where O: NSManagedObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<V: AllowedObjectiveCKeyPathValue>(dynamicMember member: KeyPath<O, V>) -> some Publisher {
+    public subscript<V: AllowedObjectiveCKeyPathValue>(
        dynamicMember member: KeyPath<O, V>
    ) -> some Publisher {
        return self
            .snapshot(emitInitialValue: true)
@@ -127,8 +131,10 @@ extension ObjectPublisher.ReactiveNamespace where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>) -> some Publisher {
+    public subscript<OBase, V>(
-        
+        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>
    ) -> some Publisher {
        return self
            .snapshot(emitInitialValue: true)
            .map({ $0?[dynamicMember: member] })
@@ -137,8 +143,10 @@ extension ObjectPublisher.ReactiveNamespace where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) -> some Publisher {
+    public subscript<OBase, V>(
-        
+        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>
    ) -> some Publisher {
        return self
            .snapshot(emitInitialValue: true)
            .map({ $0?[dynamicMember: member] })
@@ -147,8 +155,10 @@ extension ObjectPublisher.ReactiveNamespace where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>) -> some Publisher {
+    public subscript<OBase, V>(
-        
+        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>
    ) -> some Publisher {
        return self
            .snapshot(emitInitialValue: true)
            .map({ $0?[dynamicMember: member] })
--- a/Sources/ObjectPublisher.SnapshotPublisher.swift
+++ b/Sources/ObjectPublisher.SnapshotPublisher.swift
@@ -52,8 +52,10 @@ extension ObjectPublisher {
        public typealias Output = ObjectSnapshot<O>?
        public typealias Failure = Never
-        public func receive<S: Subscriber>(subscriber: S) where S.Input == Output, S.Failure == Failure {
+        public func receive<S: Subscriber>(
-            
+            subscriber: S
        ) where S.Input == Output, S.Failure == Failure {
            subscriber.receive(
                subscription: ObjectSnapshotSubscription(
                    publisher: self.objectPublisher,
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -333,15 +333,6 @@ extension ObjectPublisher where O: NSManagedObject {
        return self.snapshot?[dynamicMember: member]
    }
    // MARK: Deprecated
    @available(*, deprecated, message: "Accessing the property directly now works")
    public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
        return self[dynamicMember: keyPath]
    }
 }
@@ -432,62 +423,6 @@ extension ObjectPublisher where O: CoreStoreObject {
        return V.cs_toPublishedType(from: snapshotValue, in: self.context)
     }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> D? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [D]? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<D>? {
        return self.object?[keyPath: member].value
    }
    /**
     Returns the value for the property identified by a given key.
     */
@@ -496,3 +431,48 @@ extension ObjectPublisher where O: CoreStoreObject {
        return self.object?[keyPath: member]
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension ObjectPublisher where O: CoreStoreObject {
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>) -> V? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> D? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [D]? {
        return self.object?[keyPath: member].value
    }
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<D>? {
        return self.object?[keyPath: member].value
    }
 }
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -189,7 +189,9 @@ extension ObjectSnapshot where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>) -> V {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Stored<V>>
    ) -> V {
        get {
@@ -206,7 +208,9 @@ extension ObjectSnapshot where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>) -> V {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Virtual<V>>
    ) -> V {
        get {
@@ -223,7 +227,9 @@ extension ObjectSnapshot where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>) -> V {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Coded<V>>
    ) -> V {
        get {
@@ -240,7 +246,9 @@ extension ObjectSnapshot where O: CoreStoreObject {
    /**
     Returns the value for the property identified by a given key.
     */
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, FieldContainer<OBase>.Relationship<V>>) -> V.PublishedType {
+    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, FieldContainer<OBase>.Relationship<V>>
    ) -> V.PublishedType {
        get {
@@ -255,11 +263,19 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = V.cs_toSnapshotType(from: newValue)
        }
    }
 }
-    /**
+
-     Returns the value for the property identified by a given key.
+// MARK: - Deprecated
-     */
+
-    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>) -> V {
+@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension ObjectSnapshot where O: CoreStoreObject {
    public subscript<OBase, V>(
        dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>
    ) -> V {
        get {
@@ -273,10 +289,9 @@ extension ObjectSnapshot where O: CoreStoreObject {
        }
    }
-    /**
+    public subscript<OBase, V>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>
-     */
+    ) -> V? {
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>) -> V? {
        get {
@@ -289,11 +304,10 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = newValue
        }
    }
-
+    
-    /**
+    public subscript<OBase, V>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>
-     */
+    ) -> V {
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>) -> V {
        get {
@@ -306,11 +320,10 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = newValue
        }
    }
-
+    
-    /**
+    public subscript<OBase, V>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>
-     */
+    ) -> V? {
    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>) -> V? {
        get {
@@ -323,11 +336,10 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = newValue
        }
    }
-
+    
-    /**
+    public subscript<OBase, D>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>
-     */
+    ) -> ObjectPublisher<D>? {
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> ObjectPublisher<D>? {
        get {
@@ -344,11 +356,10 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = newValue?.objectID()
        }
    }
-
+    
-    /**
+    public subscript<OBase, D>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>
-     */
+    ) -> [ObjectPublisher<D>] {
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [ObjectPublisher<D>] {
        get {
@@ -363,11 +374,10 @@ extension ObjectSnapshot where O: CoreStoreObject {
            self.values[key] = newValue.map({ $0.objectID() })
        }
    }
-
+    
-    /**
+    public subscript<OBase, D>(
-     Returns the value for the property identified by a given key.
+        dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>
-     */
+    ) -> Set<ObjectPublisher<D>> {
    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<ObjectPublisher<D>> {
        get {
--- a/Sources/OrderBy.swift
+++ b/Sources/OrderBy.swift
@@ -151,7 +151,7 @@ public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
-        public static func ascending(_ keyPath: KeyPathString) -> SortKey {
+        public static func ascending(_ keyPath: KeyPathString) -> Self {
            return SortKey(descriptor: .init(key: keyPath, ascending: true))
        }
@@ -159,7 +159,7 @@ public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
-        public static func descending(_ keyPath: KeyPathString) -> SortKey {
+        public static func descending(_ keyPath: KeyPathString) -> Self {
            return SortKey(descriptor: .init(key: keyPath, ascending: false))
        }
@@ -170,7 +170,7 @@ public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
-        public static func ascending<T>(_ keyPath: KeyPath<O, T>) -> SortKey where O: NSManagedObject {
+        public static func ascending<T>(_ keyPath: KeyPath<O, T>) -> Self where O: NSManagedObject {
            return .ascending(keyPath._kvcKeyPathString!)
        }
@@ -178,7 +178,7 @@ public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
-        public static func descending<T>(_ keyPath: KeyPath<O, T>) -> SortKey where O: NSManagedObject {
+        public static func descending<T>(_ keyPath: KeyPath<O, T>) -> Self where O: NSManagedObject {
            return .descending(keyPath._kvcKeyPathString!)
        }
@@ -189,94 +189,24 @@ public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
-        public static func ascending<T>(_ attribute: KeyPath<O, FieldContainer<O>.Stored<T>>) -> SortKey {
+        public static func ascending<T>(_ attribute: KeyPath<O, FieldContainer<O>.Stored<T>>) -> Self {
            return .ascending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
        public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> SortKey {
            return .ascending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
        public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> SortKey {
            return .ascending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
        public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> SortKey {
            return .ascending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in ascending order
         */
        public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> SortKey {
            return .ascending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
-        public static func descending<T>(_ attribute: KeyPath<O, FieldContainer<O>.Stored<T>>) -> SortKey {
+        public static func descending<T>(_ attribute: KeyPath<O, FieldContainer<O>.Stored<T>>) -> Self {
            return .descending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
        public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> SortKey {
            return .descending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
        public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> SortKey {
            return .descending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
        public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> SortKey {
            return .descending(O.meta[keyPath: attribute].keyPath)
        }
        /**
         Indicates that the `KeyPathString` should be sorted in descending order
         */
        public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> SortKey {
            return .descending(O.meta[keyPath: attribute].keyPath)
        }
        // MARK: Private
        fileprivate let descriptor: NSSortDescriptor
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
@@ -287,7 +217,7 @@ extension OrderBy.SortKey where O: CoreStoreObject {
    /**
     Indicates that the `KeyPathString` should be sorted in ascending order
     */
-    public static func ascending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> OrderBy<O>.SortKey {
+    public static func ascending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> Self {
        return .ascending(attribute(O.meta).cs_keyPathString)
    }
@@ -295,7 +225,7 @@ extension OrderBy.SortKey where O: CoreStoreObject {
    /**
     Indicates that the `KeyPathString` should be sorted in descending order
     */
-    public static func descending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> OrderBy<O>.SortKey {
+    public static func descending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> Self {
        return .descending(attribute(O.meta).cs_keyPathString)
    }
@@ -333,3 +263,52 @@ extension Sequence where Iterator.Element: OrderByClause {
        return OrderBy(self.flatMap({ $0.sortDescriptors }))
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension OrderBy.SortKey where O: CoreStoreObject {
    public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> Self {
        return .ascending(O.meta[keyPath: attribute].keyPath)
    }
    public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> Self {
        return .ascending(O.meta[keyPath: attribute].keyPath)
    }
    public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> Self {
        return .ascending(O.meta[keyPath: attribute].keyPath)
    }
    public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> Self {
        return .ascending(O.meta[keyPath: attribute].keyPath)
    }
    public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> Self {
        return .descending(O.meta[keyPath: attribute].keyPath)
    }
    public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> Self {
        return .descending(O.meta[keyPath: attribute].keyPath)
    }
    public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> Self {
        return .descending(O.meta[keyPath: attribute].keyPath)
    }
    public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> Self {
        return .descending(O.meta[keyPath: attribute].keyPath)
    }
 }
--- a/Sources/PartialObject.swift
+++ b/Sources/PartialObject.swift
@@ -154,192 +154,6 @@ public struct PartialObject<O: CoreStoreObject> {
    }
    // MARK: Value.Required accessors/mutators
    /**
     Returns the value for the property identified by a given key.
     */
    public func value<V>(for property: (O) -> ValueContainer<O>.Required<V>) -> V {
        return V.cs_fromQueryableNativeType(
            self.rawObject.value(forKey: property(O.meta).keyPath)! as! V.QueryableNativeType
        )!
    }
    /**
     Sets the property of the receiver specified by a given key to a given value.
     */
    public func setValue<V>(_ value: V, for property: (O) -> ValueContainer<O>.Required<V>) {
        self.rawObject.setValue(
            value.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    /**
     Returns the value for the specified property from the managed object’s private internal storage.
     This method does not invoke the access notification methods (`willAccessValue(forKey:)` and `didAccessValue(forKey:)`). This method is used primarily by subclasses that implement custom accessor methods that need direct access to the receiver’s private storage.
     */
    public func primitiveValue<V>(for property: (O) -> ValueContainer<O>.Required<V>) -> V {
        return V.cs_fromQueryableNativeType(
            self.rawObject.primitiveValue(forKey: property(O.meta).keyPath)! as! V.QueryableNativeType
        )!
    }
    /**
     Sets in the object's private internal storage the value of a given property.
     Sets in the receiver’s private internal storage the value of the property specified by key to value.
     */
    public func setPrimitiveValue<V>(_ value: V, for property: (O) -> ValueContainer<O>.Required<V>) {
        self.rawObject.setPrimitiveValue(
            value.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    // MARK: Value.Optional utilities
    /**
     Returns the value for the property identified by a given key.
     */
    public func value<V>(for property: (O) -> ValueContainer<O>.Optional<V>) -> V? {
        return (self.rawObject.value(forKey: property(O.meta).keyPath) as! V.QueryableNativeType?)
            .flatMap(V.cs_fromQueryableNativeType)
    }
    /**
     Sets the property of the receiver specified by a given key to a given value.
     */
    public func setValue<V>(_ value: V?, for property: (O) -> ValueContainer<O>.Optional<V>) {
        self.rawObject.setValue(
            value?.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    /**
     Returns the value for the specified property from the managed object’s private internal storage.
     This method does not invoke the access notification methods (`willAccessValue(forKey:)` and `didAccessValue(forKey:)`). This method is used primarily by subclasses that implement custom accessor methods that need direct access to the receiver’s private storage.
     */
    public func primitiveValue<V>(for property: (O) -> ValueContainer<O>.Optional<V>) -> V? {
        return (self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V.QueryableNativeType?)
            .flatMap(V.cs_fromQueryableNativeType)
    }
    /**
     Sets in the object's private internal storage the value of a given property.
     Sets in the receiver’s private internal storage the value of the property specified by key to value.
     */
    public func setPrimitiveValue<V>(_ value: V?, for property: (O) -> ValueContainer<O>.Optional<V>) {
        self.rawObject.setPrimitiveValue(
            value?.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    // MARK: Transformable.Required utilities
    /**
     Returns the value for the property identified by a given key.
     */
    public func value<V>(for property: (O) -> TransformableContainer<O>.Required<V>) -> V {
        return self.rawObject.value(forKey: property(O.meta).keyPath)! as! V
    }
    /**
     Sets the property of the receiver specified by a given key to a given value.
     */
    public func setValue<V>(_ value: V, for property: (O) -> TransformableContainer<O>.Required<V>) {
        self.rawObject.setValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    /**
     Returns the value for the specified property from the managed object’s private internal storage.
     This method does not invoke the access notification methods (`willAccessValue(forKey:)` and `didAccessValue(forKey:)`). This method is used primarily by subclasses that implement custom accessor methods that need direct access to the receiver’s private storage.
     */
    public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Required<V>) -> V {
        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath)! as! V
    }
    /**
     Sets in the object's private internal storage the value of a given property.
     Sets in the receiver’s private internal storage the value of the property specified by key to value.
     */
    public func setPrimitiveValue<V>(_ value: V, for property: (O) -> TransformableContainer<O>.Required<V>) {
        self.rawObject.setPrimitiveValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    // MARK: Transformable.Optional utilities
    /**
     Returns the value for the property identified by a given key.
     */
    public func value<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
        return self.rawObject.value(forKey: property(O.meta).keyPath) as! V?
    }
    /**
     Sets the property of the receiver specified by a given key to a given value.
     */
    public func setValue<V>(_ value: V?, for property: (O) -> TransformableContainer<O>.Optional<V>) {
        self.rawObject.setValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    /**
     Returns the value for the specified property from the managed object’s private internal storage.
     This method does not invoke the access notification methods (`willAccessValue(forKey:)` and `didAccessValue(forKey:)`). This method is used primarily by subclasses that implement custom accessor methods that need direct access to the receiver’s private storage.
     */
    public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V?
    }
    /**
     Sets in the object's private internal storage the value of a given property.
     Sets in the receiver’s private internal storage the value of the property specified by key to value.
     */
    public func setPrimitiveValue<V>(_ value: V?, for property: (O) -> TransformableContainer<O>.Optional<V>) {
        self.rawObject.setPrimitiveValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    // MARK: Internal
    internal let rawObject: NSManagedObject
@@ -349,3 +163,122 @@ public struct PartialObject<O: CoreStoreObject> {
        self.rawObject = rawObject
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension PartialObject {
    public func value<V>(for property: (O) -> ValueContainer<O>.Required<V>) -> V {
        return V.cs_fromQueryableNativeType(
            self.rawObject.value(forKey: property(O.meta).keyPath)! as! V.QueryableNativeType
        )!
    }
    public func setValue<V>(_ value: V, for property: (O) -> ValueContainer<O>.Required<V>) {
        self.rawObject.setValue(
            value.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    public func primitiveValue<V>(for property: (O) -> ValueContainer<O>.Required<V>) -> V {
        return V.cs_fromQueryableNativeType(
            self.rawObject.primitiveValue(forKey: property(O.meta).keyPath)! as! V.QueryableNativeType
        )!
    }
    public func setPrimitiveValue<V>(_ value: V, for property: (O) -> ValueContainer<O>.Required<V>) {
        self.rawObject.setPrimitiveValue(
            value.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    public func value<V>(for property: (O) -> ValueContainer<O>.Optional<V>) -> V? {
        return (self.rawObject.value(forKey: property(O.meta).keyPath) as! V.QueryableNativeType?)
            .flatMap(V.cs_fromQueryableNativeType)
    }
    public func setValue<V>(_ value: V?, for property: (O) -> ValueContainer<O>.Optional<V>) {
        self.rawObject.setValue(
            value?.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    public func primitiveValue<V>(for property: (O) -> ValueContainer<O>.Optional<V>) -> V? {
        return (self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V.QueryableNativeType?)
            .flatMap(V.cs_fromQueryableNativeType)
    }
    public func setPrimitiveValue<V>(_ value: V?, for property: (O) -> ValueContainer<O>.Optional<V>) {
        self.rawObject.setPrimitiveValue(
            value?.cs_toQueryableNativeType(),
            forKey: property(O.meta).keyPath
        )
    }
    public func value<V>(for property: (O) -> TransformableContainer<O>.Required<V>) -> V {
        return self.rawObject.value(forKey: property(O.meta).keyPath)! as! V
    }
    public func setValue<V>(_ value: V, for property: (O) -> TransformableContainer<O>.Required<V>) {
        self.rawObject.setValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Required<V>) -> V {
        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath)! as! V
    }
    public func setPrimitiveValue<V>(_ value: V, for property: (O) -> TransformableContainer<O>.Required<V>) {
        self.rawObject.setPrimitiveValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    public func value<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
        return self.rawObject.value(forKey: property(O.meta).keyPath) as! V?
    }
    public func setValue<V>(_ value: V?, for property: (O) -> TransformableContainer<O>.Optional<V>) {
        self.rawObject.setValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
    public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V?
    }
    public func setPrimitiveValue<V>(_ value: V?, for property: (O) -> TransformableContainer<O>.Optional<V>) {
        self.rawObject.setPrimitiveValue(
            value,
            forKey: property(O.meta).keyPath
        )
    }
 }
--- a/Sources/QueryChainBuilder.swift
+++ b/Sources/QueryChainBuilder.swift
@@ -49,12 +49,6 @@ public struct QueryChainBuilder<O: DynamicObject, R: SelectResultType>: QueryCha
    public var from: From<O>
    public var select: Select<O, R>
    public var queryClauses: [QueryClause] = []
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/QueryableSource.swift
+++ b/Sources/QueryableSource.swift
@@ -45,7 +45,11 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U?
+    func queryValue<O, U: QueryableAttributeType>(
        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> U?
    /**
     Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
@@ -58,8 +62,12 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U?
+    func queryValue<O, U: QueryableAttributeType>(
-    
+        _ from: From<O>,
        _ selectClause: Select<O, U>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> U?
    /**
     Queries a property value or aggregate as specified by the `QueryChainableBuilderType` built from a chain of clauses.
@@ -75,7 +83,9 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType
+    func queryValue<B: QueryChainableBuilderType>(
        _ clauseChain: B
    ) throws(CoreStoreError) -> B.ResultType? where B.ResultType: QueryableAttributeType
    /**
     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
@@ -88,7 +98,11 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]]
+    func queryAttributes<O>(
        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: QueryClause...
    ) throws(CoreStoreError) -> [[String: Any]]
    /**
     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
@@ -101,8 +115,12 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query. The type of the return value is specified by the generic type of the `Select<U>` parameter.
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]]
+    func queryAttributes<O>(
-    
+        _ from: From<O>,
        _ selectClause: Select<O, NSDictionary>,
        _ queryClauses: [QueryClause]
    ) throws(CoreStoreError) -> [[String: Any]]
    /**
     Queries a dictionary of attribute values or  as specified by the `QueryChainableBuilderType` built from a chain of clauses.
@@ -127,8 +145,10 @@ public protocol QueryableSource: AnyObject {
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`
     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary
+    func queryAttributes<B: QueryChainableBuilderType>(
-    
+        _ clauseChain: B
    ) throws(CoreStoreError) -> [[String: Any]] where B.ResultType == NSDictionary
    /**
     The internal `NSManagedObjectContext` managed by this `QueryableSource`. Using this context directly should typically be avoided, and is provided by CoreStore only for extremely specialized cases.
     */
--- a/Sources/Relationship.ToManyOrdered.swift
+++ b/Sources/Relationship.ToManyOrdered.swift
@@ -27,44 +27,15 @@ import CoreData
 import Foundation
-// MARK: - RelationshipContainer
+// MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer {
    // MARK: - ToManyOrdered
    /**
     The containing type for to-many ordered relationships. Any `CoreStoreObject` subclass can be a destination type. Inverse relationships should be declared from the destination type as well, using the `inverse:` argument for the relationship.
     ```
     class Dog: CoreStoreObject {
         let master = Relationship.ToOne<Person>("master")
     }
     class Person: CoreStoreObject {
         let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
     }
     ```
     - Important: `Relationship.ToManyOrdered` properties are required to be stored properties. Computed properties will be ignored, including `lazy` and `weak` properties.
     */
    public final class ToManyOrdered<D: CoreStoreObject>: ToManyRelationshipKeyPathStringConvertible, RelationshipProtocol {
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            minCount: Int = 0,
@@ -85,26 +56,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            minCount: Int = 0,
@@ -126,26 +78,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            minCount: Int = 0,
@@ -167,26 +100,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            minCount: Int = 0,
@@ -208,10 +122,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         The relationship value
         */
        public var value: ReturnValueType {
            get {
@@ -223,34 +134,19 @@ extension RelationshipContainer {
                self.nativeValue = NSOrderedSet(array: newValue.map({ $0.rawObject! }))
            }
        }
-
+        
        // MARK: AnyKeyPathStringConvertible
        public var cs_keyPathString: String {
            return self.keyPath
        }
        // MARK: KeyPathStringConvertible
        public typealias ObjectType = O
        public typealias DestinationValueType = D
        // MARK: RelationshipKeyPathStringConvertible
        public typealias ReturnValueType = [DestinationValueType]
        // MARK: PropertyProtocol
        internal let keyPath: KeyPathString
        // MARK: RelationshipProtocol
        internal let entityDescriptionValues: () -> RelationshipProtocol.EntityDescriptionValues
        internal var rawObject: CoreStoreManagedObject?
@@ -303,9 +199,6 @@ extension RelationshipContainer {
            return self.value.map({ $0.objectID() })
        }
        // MARK: Private
        private init(keyPath: String, minCount: Int, maxCount: Int, inverseKeyPath: @escaping () -> String?, deleteRule: DeleteRule, versionHashModifier: @autoclosure @escaping () -> String?, renamingIdentifier: @autoclosure @escaping () -> String?, affectedByKeyPaths: @autoclosure @escaping () -> Set<String>) {
            self.keyPath = keyPath
@@ -327,13 +220,11 @@ extension RelationshipContainer {
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Convenience
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension RelationshipContainer.ToManyOrdered: RandomAccessCollection {
    // MARK: Sequence
    public typealias Iterator = AnyIterator<D>
    public func makeIterator() -> Iterator {
@@ -342,9 +233,6 @@ extension RelationshipContainer.ToManyOrdered: RandomAccessCollection {
        return AnyIterator({ iterator.next().flatMap({ D.cs_fromRaw(object: $0 as! NSManagedObject) }) })
    }
    // MARK: Collection
    public typealias Index = Int
    public var startIndex: Index {
@@ -368,51 +256,21 @@ extension RelationshipContainer.ToManyOrdered: RandomAccessCollection {
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Operations
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension RelationshipContainer.ToManyOrdered {
    /**
     Assigns a sequence of objects to the relationship. The operation
     ```
     person.pets .= [dog, cat]
     ```
     is equivalent to
     ```
     person.pets.value = [dog, cat]
     ```
     */
    public static func .= <S: Sequence>(_ relationship: RelationshipContainer<O>.ToManyOrdered<D>, _ newValue: S) where S.Iterator.Element == D {
        relationship.nativeValue = NSOrderedSet(array: newValue.map({ $0.rawObject! }))
    }
-
+    
    /**
     Assigns a sequence of objects to the relationship. The operation
     ```
     person.pets .= anotherPerson.pets
     ```
     is equivalent to
     ```
     person.pets.value = anotherPerson.pets.value
     ```
     */
    public static func .= <O2>(_ relationship: RelationshipContainer<O>.ToManyOrdered<D>, _ relationship2: RelationshipContainer<O2>.ToManyOrdered<D>) {
        relationship.nativeValue = relationship2.nativeValue
    }
-
+    
    /**
     Compares equality between a relationship's objects and a collection of objects
     ```
     if person.pets .== [dog, cat] { ... }
     ```
     is equivalent to
     ```
     if person.pets.value == [dog, cat] { ... }
     ```
     */
    public static func .== <C: Collection>(_ relationship: RelationshipContainer<O>.ToManyOrdered<D>, _ collection: C) -> Bool where C.Iterator.Element == D {
        return relationship.nativeValue.elementsEqual(
@@ -420,17 +278,7 @@ extension RelationshipContainer.ToManyOrdered {
            by: { ($0 as! NSManagedObject) == $1 }
        )
    }
-
+    
    /**
     Compares equality between a collection of objects and a relationship's objects
     ```
     if [dog, cat] .== person.pets { ... }
     ```
     is equivalent to
     ```
     if [dog, cat] == person.pets.value { ... }
     ```
     */
    public static func .== <C: Collection>(_ collection: C, _ relationship: RelationshipContainer<O>.ToManyOrdered<D>) -> Bool where C.Iterator.Element == D {
        return relationship.nativeValue.elementsEqual(
@@ -438,17 +286,7 @@ extension RelationshipContainer.ToManyOrdered {
            by: { ($0 as! NSManagedObject) == $1 }
        )
    }
-
+    
    /**
     Compares equality between a relationship's objects and a collection of objects
     ```
     if person.pets .== anotherPerson.pets { ... }
     ```
     is equivalent to
     ```
     if person.pets.value == anotherPerson.pets.value { ... }
     ```
     */
    public static func .== <O2>(_ relationship: RelationshipContainer<O>.ToManyOrdered<D>, _ relationship2: RelationshipContainer<O2>.ToManyOrdered<D>) -> Bool {
        return relationship.nativeValue == relationship2.nativeValue
--- a/Sources/Relationship.ToManyUnordered.swift
+++ b/Sources/Relationship.ToManyUnordered.swift
@@ -27,45 +27,15 @@ import CoreData
 import Foundation
-// MARK: - RelationshipContainer
+// MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer {
    // MARK: - ToManyUnordered
    /**
     The containing type for to-many unordered relationships. Any `CoreStoreObject` subclass can be a destination type. Inverse relationships should be declared from the destination type as well, using the `inverse:` argument for the relationship.
     ```
     class Dog: CoreStoreObject {
         let master = Relationship.ToOne<Person>("master")
     }
     class Person: CoreStoreObject {
         let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
     }
     ```
     - Important: `Relationship.ToManyUnordered` properties are required to be stored properties. Computed properties will be ignored, including `lazy` and `weak` properties.
     */
    public final class ToManyUnordered<D: CoreStoreObject>: ToManyRelationshipKeyPathStringConvertible, RelationshipProtocol {
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            deleteRule: DeleteRule = .nullify,
@@ -86,26 +56,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToOne<O>,
@@ -127,26 +78,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToManyOrdered<O>,
@@ -168,26 +100,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyOrdered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter minCount: the minimum number of objects in this relationship UNLESS THE RELATIONSHIP IS EMPTY. This means there might be zero objects in the relationship, which might be less than `minCount`. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter maxCount: the maximum number of objects in this relationship. If the number of objects in the relationship do not satisfy `minCount` and `maxCount`, the transaction's commit (or auto-commit) would fail with a validation error.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToManyUnordered<O>,
@@ -209,10 +122,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         The relationship value
         */
        public var value: ReturnValueType {
            get {
@@ -225,33 +135,18 @@ extension RelationshipContainer {
            }
        }
        // MARK: AnyKeyPathStringConvertible
        public var cs_keyPathString: String {
            return self.keyPath
        }
        // MARK: KeyPathStringConvertible
        public typealias ObjectType = O
        public typealias DestinationValueType = D
        // MARK: RelationshipKeyPathStringConvertible
        public typealias ReturnValueType = Set<DestinationValueType>
        // MARK: PropertyProtocol
        internal let keyPath: KeyPathString
        // MARK: RelationshipProtocol
        internal let entityDescriptionValues: () -> RelationshipProtocol.EntityDescriptionValues
        internal var rawObject: CoreStoreManagedObject?
@@ -304,9 +199,6 @@ extension RelationshipContainer {
            return Set(self.value.map({ $0.objectID() }))
        }
        // MARK: Private
        private init(keyPath: KeyPathString, inverseKeyPath: @escaping () -> KeyPathString?, deleteRule: DeleteRule, minCount: Int, maxCount: Int, versionHashModifier: @autoclosure @escaping () -> String?, renamingIdentifier: @autoclosure @escaping () -> String?, affectedByKeyPaths: @autoclosure @escaping () -> Set<String>) {
            self.keyPath = keyPath
@@ -328,30 +220,21 @@ extension RelationshipContainer {
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Convenience
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension RelationshipContainer.ToManyUnordered: Sequence {
    /**
     The number of elements in the set.
     */
    public var count: Int {
        return self.nativeValue.count
    }
-
+    
    /**
     A Boolean value indicating whether the range contains no elements.
     */
    public var isEmpty: Bool {
        return self.nativeValue.count == 0
    }
    // MARK: Sequence
    public typealias Iterator = AnyIterator<D>
    public func makeIterator() -> Iterator {
@@ -361,96 +244,36 @@ extension RelationshipContainer.ToManyUnordered: Sequence {
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Operations
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension RelationshipContainer.ToManyUnordered {
    /**
     Assigns a sequence of objects to the relationship. The operation
     ```
     person.pets .= [dog, cat]
     ```
     is equivalent to
     ```
     person.pets.value = [dog, cat]
     ```
     */
    public static func .= <S: Sequence>(_ relationship: RelationshipContainer<O>.ToManyUnordered<D>, _ newValue: S) where S.Iterator.Element == D {
        relationship.nativeValue = NSSet(array: newValue.map({ $0.rawObject! }))
    }
-
+    
    /**
     Assigns a sequence of objects to the relationship. The operation
     ```
     person.pets .= anotherPerson.pets
     ```
     is equivalent to
     ```
     person.pets.value = anotherPerson.pets.value
     ```
     */
    public static func .= <O2>(_ relationship: RelationshipContainer<O>.ToManyUnordered<D>, _ relationship2: RelationshipContainer<O2>.ToManyUnordered<D>) {
        relationship.nativeValue = relationship2.nativeValue
    }
-
+    
    /**
     Assigns a sequence of objects to the relationship. The operation
     ```
     person.pets .= anotherPerson.pets
     ```
     is equivalent to
     ```
     person.pets.value = anotherPerson.pets.value
     ```
     */
    public static func .= <O2>(_ relationship: RelationshipContainer<O>.ToManyUnordered<D>, _ relationship2: RelationshipContainer<O2>.ToManyOrdered<D>) {
        relationship.nativeValue = NSSet(set: relationship2.nativeValue.set)
    }
-
+    
    /**
     Compares the if the relationship's objects and a set of objects have the same elements.
     ```
     if person.pets .== Set<Animal>([dog, cat]) { ... }
     ```
     is equivalent to
     ```
     if person.pets.value == Set<Animal>([dog, cat]) { ... }
     ```
     */
    public static func .== (_ relationship: RelationshipContainer<O>.ToManyUnordered<D>, _ set: Set<D>) -> Bool {
        return relationship.nativeValue.isEqual(to: Set(set.map({ $0.rawObject! })))
    }
-
+    
    /**
     Compares if a set of objects and a relationship's objects have the same elements.
     ```
     if Set<Animal>([dog, cat]) .== person.pets { ... }
     ```
     is equivalent to
     ```
     if Set<Animal>([dog, cat]) == person.pets.value { ... }
     ```
     */
    public static func .== (_ set: Set<D>, _ relationship: RelationshipContainer<O>.ToManyUnordered<D>) -> Bool {
        return relationship.nativeValue.isEqual(to: Set(set.map({ $0.rawObject! })))
    }
-
+    
    /**
     Compares if a relationship's objects and another relationship's objects have the same elements.
     ```
     if person.pets .== anotherPerson.pets { ... }
     ```
     is equivalent to
     ```
     if person.pets.value == anotherPerson.pets.value { ... }
     ```
     */
    public static func .== <O2>(_ relationship: RelationshipContainer<O>.ToManyUnordered<D>, _ relationship2: RelationshipContainer<O2>.ToManyUnordered<D>) -> Bool {
        return relationship.nativeValue.isEqual(relationship2.nativeValue)
--- a/Sources/Relationship.ToOne.swift
+++ b/Sources/Relationship.ToOne.swift
@@ -27,42 +27,15 @@ import CoreData
 import Foundation
-// MARK: - RelationshipContainer
+// MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer {
    // MARK: - ToOne
    /**
     The containing type for to-one relationships. Any `CoreStoreObject` subclass can be a destination type. Inverse relationships should be declared from the destination type as well, using the `inverse:` argument for the relationship.
     ```
     class Dog: CoreStoreObject {
         let master = Relationship.ToOne<Person>("master")
     }
     class Person: CoreStoreObject {
         let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
     }
     ```
     - Important: `Relationship.ToOne` properties are required to be stored properties. Computed properties will be ignored, including `lazy` and `weak` properties.
     */
    public final class ToOne<D: CoreStoreObject>: RelationshipKeyPathStringConvertible, RelationshipProtocol {
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            deleteRule: DeleteRule = .nullify,
@@ -80,23 +53,6 @@ extension RelationshipContainer {
            )
        }
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToOne<O>,
@@ -114,24 +70,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToManyOrdered<O>,
@@ -149,24 +88,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         Initializes the metadata for the relationship. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object. Make sure to declare this relationship's inverse relationship on its destination object. Due to Swift's compiler limitation, only one of the relationship and its inverse can declare an `inverse:` argument.
         ```
         class Dog: CoreStoreObject {
             let master = Relationship.ToOne<Person>("master")
         }
         class Person: CoreStoreObject {
             let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
         }
         ```
         - parameter keyPath: the permanent name for this relationship.
         - parameter inverse: the inverse relationship that is declared for the destination object. All relationships require an "inverse", so updates to to this object's relationship are also reflected on its destination object.
         - parameter deleteRule: defines what happens to relationship when an object is deleted. Valid values are `.nullify`, `.cascade`, and `.delete`. Defaults to `.nullify`.
         - parameter versionHashModifier: used to mark or denote a relationship as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public convenience init(
            _ keyPath: KeyPathString,
            inverse: @escaping (D) -> RelationshipContainer<D>.ToManyUnordered<O>,
@@ -184,10 +106,7 @@ extension RelationshipContainer {
                affectedByKeyPaths: affectedByKeyPaths()
            )
        }
-
+        
        /**
         The relationship value
         */
        public var value: ReturnValueType {
            get {
@@ -200,33 +119,18 @@ extension RelationshipContainer {
            }
        }
        // MARK: AnyKeyPathStringConvertible
        public var cs_keyPathString: String {
            return self.keyPath
        }
        // MARK: KeyPathStringConvertible
        public typealias ObjectType = O
        public typealias DestinationValueType = D
        // MARK: RelationshipKeyPathStringConvertible
        public typealias ReturnValueType = DestinationValueType?
        // MARK: PropertyProtocol
        internal let keyPath: KeyPathString
        // MARK: RelationshipProtocol
        internal let entityDescriptionValues: () -> RelationshipProtocol.EntityDescriptionValues
        internal var rawObject: CoreStoreManagedObject?
@@ -302,80 +206,31 @@ extension RelationshipContainer {
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Operations
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension RelationshipContainer.ToOne {
    /**
     Assigns an object to the relationship. The operation
     ```
     dog.master .= person
     ```
     is equivalent to
     ```
     dog.master.value = person
     ```
     */
    public static func .= (_ relationship: RelationshipContainer<O>.ToOne<D>, _ newObject: D?) {
        relationship.nativeValue = newObject?.cs_toRaw()
    }
    /**
     Assigns an object from another relationship. The operation
     ```
     dog.master .= anotherDog.master
     ```
     is equivalent to
     ```
     dog.master.value = anotherDog.master.value
     ```
     */
    public static func .= <O2>(_ relationship: RelationshipContainer<O>.ToOne<D>, _ relationship2: RelationshipContainer<O2>.ToOne<D>) {
        relationship.nativeValue = relationship2.nativeValue
    }
    /**
     Compares equality between a relationship's object and another object
     ```
     if dog.master .== person { ... }
     ```
     is equivalent to
     ```
     if dog.master.value == person { ... }
     ```
     */
    public static func .== (_ relationship: RelationshipContainer<O>.ToOne<D>, _ object: D?) -> Bool {
        return relationship.nativeValue == object?.cs_toRaw()
    }
-
+    
    /**
     Compares equality between an object and a relationship's object
     ```
     if dog.master .== person { ... }
     ```
     is equivalent to
     ```
     if dog.master.value == person { ... }
     ```
     */
    public static func .== (_ object: D?, _ relationship: RelationshipContainer<O>.ToOne<D>) -> Bool {
        return object?.cs_toRaw() == relationship.nativeValue
    }
-
+    
    /**
     Compares equality between a relationship's object and another relationship's object
     ```
     if dog.master .== person { ... }
     ```
     is equivalent to
     ```
     if dog.master.value == person { ... }
     ```
     */
    public static func .== <O2>(_ relationship: RelationshipContainer<O>.ToOne<D>, _ relationship2: RelationshipContainer<O2>.ToOne<D>) -> Bool {
        return relationship.nativeValue == relationship2.nativeValue
--- a/Sources/Relationship.swift
+++ b/Sources/Relationship.swift
@@ -27,46 +27,21 @@ import CoreData
 import Foundation
-// MARK: - DynamicObject
+// MARK: - Deprecated
 extension DynamicObject where Self: CoreStoreObject {
-    /**
+    @available(*, deprecated, message: """
-     The containing type for relationships. `Relationship`s can be any `CoreStoreObject` subclass.
+    Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-     ```
+    """)
     class Dog: CoreStoreObject {
         let master = Relationship.ToOne<Person>("master")
     }
     class Person: CoreStoreObject {
         let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
     }
     ```
     - Important: `Relationship` properties are required to be stored properties. Computed properties will be ignored, including `lazy` and `weak` properties.
     */
    public typealias Relationship = RelationshipContainer<Self>
 }
-
+@available(*, deprecated, message: """
-// MARK: - RelationshipContainer
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 /**
 The containing type for relationships. Use the `DynamicObject.Relationship` typealias instead for shorter syntax.
 ```
 class Dog: CoreStoreObject {
     let master = Relationship.ToOne<Person>("master")
 }
 class Person: CoreStoreObject {
     let pets = Relationship.ToManyUnordered<Dog>("pets", inverse: { $0.master })
 }
 ```
 */
 public enum RelationshipContainer<O: CoreStoreObject> {
    // MARK: - DeleteRule
    /**
     These constants define what happens to relationships when an object is deleted.
     */
    public enum DeleteRule {
        // MARK: Public
--- a/Sources/SQLiteStore.swift
+++ b/Sources/SQLiteStore.swift
@@ -43,8 +43,13 @@ public final class SQLiteStore: LocalStorage {
     - parameter migrationMappingProviders: an array of `SchemaMappingProviders` that provides the complete mapping models for custom migrations. All lightweight inferred mappings and/or migration mappings provided by *xcmappingmodel files are automatically used as fallback (as `InferredSchemaMappingProvider`) and may be omitted from the array.
     - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.none`.
     */
-    public init(fileURL: URL, configuration: ModelConfiguration = nil, migrationMappingProviders: [SchemaMappingProvider] = [], localStorageOptions: LocalStorageOptions = nil) {
+    public init(
-        
+        fileURL: URL,
        configuration: ModelConfiguration = nil,
        migrationMappingProviders: [SchemaMappingProvider] = [],
        localStorageOptions: LocalStorageOptions = nil
    ) {
        self.fileURL = fileURL
        self.configuration = configuration
        self.migrationMappingProviders = migrationMappingProviders
@@ -60,8 +65,13 @@ public final class SQLiteStore: LocalStorage {
     - parameter migrationMappingProviders: an array of `SchemaMappingProviders` that provides the complete mapping models for custom migrations. All lightweight inferred mappings and/or migration mappings provided by *xcmappingmodel files are automatically used as fallback (as `InferredSchemaMappingProvider`) and may be omitted from the array.
     - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
     */
-    public init(fileName: String, configuration: ModelConfiguration = nil, migrationMappingProviders: [SchemaMappingProvider] = [], localStorageOptions: LocalStorageOptions = nil) {
+    public init(
-        
+        fileName: String,
        configuration: ModelConfiguration = nil,
        migrationMappingProviders: [SchemaMappingProvider] = [],
        localStorageOptions: LocalStorageOptions = nil
    ) {
        self.fileURL = SQLiteStore.defaultRootDirectory
            .appendingPathComponent(fileName, isDirectory: false)
        self.configuration = configuration
@@ -91,8 +101,13 @@ public final class SQLiteStore: LocalStorage {
     - parameter migrationMappingProviders: an array of `SchemaMappingProviders` that provides the complete mapping models for custom migrations. All lightweight inferred mappings and/or migration mappings provided by *xcmappingmodel files are automatically used as fallback (as `InferredSchemaMappingProvider`) and may be omitted from the array.
     - parameter localStorageOptions: When the `SQLiteStore` is passed to the `DataStack`'s `addStorage()` methods, tells the `DataStack` how to setup the persistent store. Defaults to `.None`.
     */
-    public static func legacy(fileName: String, configuration: ModelConfiguration = nil, migrationMappingProviders: [SchemaMappingProvider] = [], localStorageOptions: LocalStorageOptions = nil) -> SQLiteStore {
+    public static func legacy(
-        
+        fileName: String,
        configuration: ModelConfiguration = nil,
        migrationMappingProviders: [SchemaMappingProvider] = [],
        localStorageOptions: LocalStorageOptions = nil
    ) -> SQLiteStore {
        return SQLiteStore(
            fileURL: SQLiteStore.legacyDefaultRootDirectory
                .appendingPathComponent(fileName, isDirectory: false),
@@ -192,8 +207,10 @@ public final class SQLiteStore: LocalStorage {
    /**
     The options dictionary for the specified `LocalStorageOptions`
     */
-    public func dictionary(forOptions options: LocalStorageOptions) -> [AnyHashable: Any]? {
+    public func dictionary(
-        
+        forOptions options: LocalStorageOptions
    ) -> [AnyHashable: Any]? {
        if options == .none {
            return self.storeOptions
@@ -211,8 +228,10 @@ public final class SQLiteStore: LocalStorage {
    /**
     Called by the `DataStack` to perform checkpoint operations on the storage. For `SQLiteStore`, this converts the database's WAL journaling mode to DELETE to force a checkpoint.
     */
-    public func cs_finalizeStorageAndWait(soureModelHint: NSManagedObjectModel) throws {
+    public func cs_finalizeStorageAndWait(
-        
+        soureModelHint: NSManagedObjectModel
    ) throws(any Swift.Error) {
        _ = try withExtendedLifetime(NSPersistentStoreCoordinator(managedObjectModel: soureModelHint)) { (coordinator: NSPersistentStoreCoordinator) in
            var storeOptions = self.storeOptions ?? [:]
@@ -230,10 +249,16 @@ public final class SQLiteStore: LocalStorage {
    /**
     Called by the `DataStack` to perform actual deletion of the store file from disk. Do not call directly! The `sourceModel` argument is a hint for the existing store's model version. For `SQLiteStore`, this converts the database's WAL journaling mode to DELETE before deleting the file.
     */
-    public func cs_eraseStorageAndWait(metadata: [String: Any], soureModelHint: NSManagedObjectModel?) throws {
+    public func cs_eraseStorageAndWait(
-        
+        metadata: [String: Any],
-        func deleteFiles(storeURL: URL, extraFiles: [String] = []) throws {
+        soureModelHint: NSManagedObjectModel?
-            
+    ) throws(any Swift.Error) {
        func deleteFiles(
            storeURL: URL,
            extraFiles: [String] = []
        ) throws(any Swift.Error) {
            let fileManager = FileManager.default
            let extraFiles: [String] = [
                storeURL.path.appending("-wal"),
@@ -263,7 +288,8 @@ public final class SQLiteStore: LocalStorage {
                    return extraFile
                }
                DispatchQueue.global(qos: .background).async {
-                    
+
                    let fileManager = FileManager.default
                    _ = try? fileManager.removeItem(at: temporaryFileURL)
                    extraTemporaryFiles.forEach({ _ = try? fileManager.removeItem(atPath: $0) })
                }
@@ -276,7 +302,7 @@ public final class SQLiteStore: LocalStorage {
        }
        let fileURL = self.fileURL
-        try autoreleasepool {
+        try Internals.autoreleasepool {
            if let soureModel = soureModelHint ?? NSManagedObjectModel.mergedModel(from: nil, forStoreMetadata: metadata) {
--- a/Sources/SchemaHistory.swift
+++ b/Sources/SchemaHistory.swift
@@ -57,8 +57,14 @@ public final class SchemaHistory: ExpressibleByArrayLiteral {
     - parameter xcodeDataModeld: a tuple returned from the `XcodeDataModelSchema.from(modelName:bundle:migrationChain:)` method.
     - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
     */
-    public convenience init(_ xcodeDataModeld: (allSchema: [XcodeDataModelSchema], currentModelVersion: ModelVersion), migrationChain: MigrationChain = nil) {
+    public convenience init(
-        
+        _ xcodeDataModeld: (
            allSchema: [XcodeDataModelSchema],
            currentModelVersion: ModelVersion
        ),
        migrationChain: MigrationChain = nil
    ) {
        self.init(
            allSchema: xcodeDataModeld.allSchema,
            migrationChain: migrationChain,
@@ -73,8 +79,13 @@ public final class SchemaHistory: ExpressibleByArrayLiteral {
     - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
     - parameter exactCurrentModelVersion: an optional string to explicitly select the current model version string. This is useful if the `DataStack` should load a non-latest model version (usually to prepare data before migration). If not provided, the current model version will be computed from the `MigrationChain`.
     */
-    public convenience init(_ schema: DynamicSchema, _ otherSchema: DynamicSchema..., migrationChain: MigrationChain = nil, exactCurrentModelVersion: String? = nil) {
+    public convenience init(
-        
+        _ schema: DynamicSchema,
        _ otherSchema: DynamicSchema...,
        migrationChain: MigrationChain = nil,
        exactCurrentModelVersion: String? = nil
    ) {
        self.init(
            allSchema: [schema] + otherSchema,
            migrationChain: migrationChain,
@@ -88,8 +99,12 @@ public final class SchemaHistory: ExpressibleByArrayLiteral {
     - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
     - parameter exactCurrentModelVersion: an optional string to explicitly select the current model version string. This is useful if the `DataStack` should load a non-latest model version (usually to prepare data before migration). If not provided, the current model version will be computed from the `MigrationChain`.
     */
-    public required init(allSchema: [DynamicSchema], migrationChain: MigrationChain = nil, exactCurrentModelVersion: String? = nil) {
+    public required init(
-        
+        allSchema: [DynamicSchema],
        migrationChain: MigrationChain = nil,
        exactCurrentModelVersion: String? = nil
    ) {
        if allSchema.isEmpty {
            Internals.abort("The \"allSchema\" argument of the \(Internals.typeName(SchemaHistory.self)) initializer cannot be empty.")
--- a/Sources/SchemaMappingProvider.swift
+++ b/Sources/SchemaMappingProvider.swift
@@ -37,5 +37,12 @@ public protocol SchemaMappingProvider {
    /**
     Do not call directly.
     */
-    func cs_createMappingModel(from sourceSchema: DynamicSchema, to destinationSchema: DynamicSchema, storage: LocalStorage) throws -> (mappingModel: NSMappingModel, migrationType: MigrationType)
+    func cs_createMappingModel(
        from sourceSchema: DynamicSchema,
        to destinationSchema: DynamicSchema,
        storage: LocalStorage
    ) throws(CoreStoreError) -> (
        mappingModel: NSMappingModel,
        migrationType: MigrationType
    )
 }
--- a/Sources/SectionBy.swift
+++ b/Sources/SectionBy.swift
@@ -75,24 +75,6 @@ public struct SectionBy<O: DynamicObject> {
    internal let sectionKeyPath: KeyPathString
    internal let sectionIndexTransformer: (_ sectionName: String?) -> String?
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init(
        _ sectionKeyPath: KeyPathString,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
 }
@@ -130,21 +112,6 @@ extension SectionBy where O: NSManagedObject {
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, T>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath._kvcKeyPathString!,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
 }
@@ -190,12 +157,70 @@ extension SectionBy where O: CoreStoreObject {
            sectionIndexTransformer: { _ in nil }
        )
    }
-    
+
    /**
-     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
+     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
-     
+
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Stored<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Virtual<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Coded<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension SectionBy {
    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
        self.init(
@@ -204,11 +229,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     */
    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
        self.init(
@@ -217,11 +237,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     */
    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
        self.init(
@@ -230,11 +245,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     */
    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
        self.init(
@@ -243,13 +253,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
@@ -260,68 +263,7 @@ extension SectionBy where O: CoreStoreObject {
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Stored<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Virtual<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Coded<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
@@ -333,13 +275,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
@@ -351,13 +286,6 @@ extension SectionBy where O: CoreStoreObject {
        )
    }
    /**
     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section index title
     - Important: Some utilities (such as `ListMonitor`s) may keep `SectionBy`s in memory and may thus introduce retain cycles if reference captures are not handled properly.
     - parameter sectionKeyPath: the key path to use to group the objects into sections
     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section index title
     */
    public init<T>(
        _ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>,
        sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
@@ -368,91 +296,4 @@ extension SectionBy where O: CoreStoreObject {
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Stored<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            O.meta[keyPath: sectionKeyPath].keyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Virtual<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, FieldContainer<O>.Coded<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
    @available(*, deprecated, renamed: "init(_:sectionIndexTransformer:)")
    public init<T>(
        _ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>,
        _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?
    ) {
        self.init(
            sectionKeyPath,
            sectionIndexTransformer: sectionIndexTransformer
        )
    }
 }
--- a/Sources/SectionMonitorBuilder.swift
+++ b/Sources/SectionMonitorBuilder.swift
@@ -47,12 +47,6 @@ public struct SectionMonitorChainBuilder<O: DynamicObject>: SectionMonitorBuilde
    public var from: From<O>
    public var sectionBy: SectionBy<O>
    public var fetchClauses: [FetchClause] = []
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
--- a/Sources/Select.swift
+++ b/Sources/Select.swift
@@ -43,7 +43,9 @@ public protocol SelectResultType {}
 */
 public protocol SelectAttributesResultType: SelectResultType {
-    static func cs_fromQueryResultsNativeType(_ result: [Any]) -> [[String: Any]]
+    static func cs_fromQueryResultsNativeType(
        _ result: [Any]
    ) -> [[String: Any]]
 }
@@ -74,8 +76,10 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter keyPath: the attribute name
     - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
     */
-    public static func attribute(_ keyPath: KeyPathString) -> SelectTerm<O> {
+    public static func attribute(
-        
+        _ keyPath: KeyPathString
    ) -> SelectTerm<O> {
        return ._attribute(keyPath)
    }
@@ -91,8 +95,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the average value of an attribute
     */
-    public static func average(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func average(
-        
+        _ keyPath: KeyPathString,
        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._aggregate(
            function: "average:",
            keyPath: keyPath,
@@ -113,8 +120,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for a count query
     */
-    public static func count(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func count(
-        
+        _ keyPath: KeyPathString,
        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._aggregate(
            function: "count:",
            keyPath: keyPath,
@@ -135,8 +145,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute
     */
-    public static func maximum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func maximum(
-        
+        _ keyPath: KeyPathString,
        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._aggregate(
            function: "max:",
            keyPath: keyPath,
@@ -157,8 +170,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute
     */
-    public static func minimum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func minimum(
-        
+        _ keyPath: KeyPathString,
        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._aggregate(
            function: "min:",
            keyPath: keyPath,
@@ -179,8 +195,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
     */
-    public static func sum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func sum(
-        
+        _ keyPath: KeyPathString,
        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._aggregate(
            function: "sum:",
            keyPath: keyPath,
@@ -202,8 +221,10 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "objecID" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
     */
-    public static func objectID(as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func objectID(
-        
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return ._identity(
            alias: alias ?? "objectID",
            nativeType: .objectIDAttributeType
@@ -231,8 +252,11 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
    // MARK: Equatable
-    public static func == (lhs: SelectTerm<O>, rhs: SelectTerm<O>) -> Bool {
+    public static func == (
-        
+        lhs: SelectTerm<O>,
        rhs: SelectTerm<O>
    ) -> Bool {
        switch (lhs, rhs) {
        case (._attribute(let keyPath1), ._attribute(let keyPath2)):
@@ -284,9 +308,19 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
    // MARK: Internal
    case _attribute(KeyPathString)
-    case _aggregate(function: String, keyPath: KeyPathString, alias: String, nativeType: NSAttributeType)
+
-    case _identity(alias: String, nativeType: NSAttributeType)
+    case _aggregate(
-    
+        function: String,
        keyPath: KeyPathString,
        alias: String,
        nativeType: NSAttributeType
    )
    case _identity(
        alias: String,
        nativeType: NSAttributeType
    )
    internal var keyPathString: String {
        switch self {
@@ -296,12 +330,6 @@ public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
        case ._identity(let alias, _):          return alias
        }
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
@@ -314,8 +342,10 @@ extension SelectTerm where O: NSManagedObject {
     - parameter keyPath: the attribute name
     - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
     */
-    public static func attribute<V>(_ keyPath: KeyPath<O, V>) -> SelectTerm<O> {
+    public static func attribute<V>(
-        
+        _ keyPath: KeyPath<O, V>
    ) -> SelectTerm<O> {
        return self.attribute(keyPath._kvcKeyPathString!)
    }
@@ -325,9 +355,15 @@ extension SelectTerm where O: NSManagedObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the average value of an attribute
     */
-    public static func average<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func average<V>(
-        
+        _ keyPath: KeyPath<O, V>,
-        return self.average(keyPath._kvcKeyPathString!, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return self.average(
            keyPath._kvcKeyPathString!,
            as: alias
        )
    }
    /**
@@ -336,9 +372,15 @@ extension SelectTerm where O: NSManagedObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for a count query
     */
-    public static func count<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func count<V>(
-        
+        _ keyPath: KeyPath<O, V>,
-        return self.count(keyPath._kvcKeyPathString!, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return self.count(
            keyPath._kvcKeyPathString!,
            as: alias
        )
    }
    /**
@@ -347,9 +389,15 @@ extension SelectTerm where O: NSManagedObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute
     */
-    public static func maximum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func maximum<V>(
-        
+        _ keyPath: KeyPath<O, V>,
-        return self.maximum(keyPath._kvcKeyPathString!, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return self.maximum(
            keyPath._kvcKeyPathString!,
            as: alias
        )
    }
    /**
@@ -358,9 +406,15 @@ extension SelectTerm where O: NSManagedObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute
     */
-    public static func minimum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func minimum<V>(
-        
+        _ keyPath: KeyPath<O, V>,
-        return self.minimum(keyPath._kvcKeyPathString!, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return self.minimum(
            keyPath._kvcKeyPathString!,
            as: alias
        )
    }
    /**
@@ -369,9 +423,15 @@ extension SelectTerm where O: NSManagedObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
     */
-    public static func sum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
+    public static func sum<V>(
-        
+        _ keyPath: KeyPath<O, V>,
-        return self.sum(keyPath._kvcKeyPathString!, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> {
        return self.sum(
            keyPath._kvcKeyPathString!,
            as: alias
        )
    }
 }
@@ -385,7 +445,9 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter keyPath: the attribute name
     - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
     */
-    public static func attribute<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O, K>) -> SelectTerm<O> where K.ObjectType == O {
+    public static func attribute<K: AttributeKeyPathStringConvertible>(
        _ keyPath: KeyPath<O, K>
    ) -> SelectTerm<O> where K.ObjectType == O {
        return self.attribute(O.meta[keyPath: keyPath].cs_keyPathString)
    }
@@ -396,9 +458,15 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the average value of an attribute
     */
-    public static func average<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O, K>, as alias: KeyPathString? = nil) -> SelectTerm<O> where K.ObjectType == O{
+    public static func average<K: AttributeKeyPathStringConvertible>(
-        
+        _ keyPath: KeyPath<O, K>,
-        return self.average(O.meta[keyPath: keyPath].cs_keyPathString, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> where K.ObjectType == O{
        return self.average(
            O.meta[keyPath: keyPath].cs_keyPathString,
            as: alias
        )
    }
    /**
@@ -407,10 +475,15 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for a count query
     */
-    public static func count<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O,
+    public static func count<K: AttributeKeyPathStringConvertible>(
-        K>, as alias: KeyPathString? = nil) -> SelectTerm<O> where K.ObjectType == O {
+        _ keyPath: KeyPath<O, K>,
-        
+        as alias: KeyPathString? = nil
-        return self.count(O.meta[keyPath: keyPath].cs_keyPathString, as: alias)
+    ) -> SelectTerm<O> where K.ObjectType == O {
        return self.count(
            O.meta[keyPath: keyPath].cs_keyPathString,
            as: alias
        )
    }
    /**
@@ -419,10 +492,15 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute
     */
-    public static func maximum<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O,
+    public static func maximum<K: AttributeKeyPathStringConvertible>(
-        K>, as alias: KeyPathString? = nil) -> SelectTerm<O> where K.ObjectType == O {
+        _ keyPath: KeyPath<O, K>,
-        
+        as alias: KeyPathString? = nil
-        return self.maximum(O.meta[keyPath: keyPath].cs_keyPathString, as: alias)
+    ) -> SelectTerm<O> where K.ObjectType == O {
        return self.maximum(
            O.meta[keyPath: keyPath].cs_keyPathString,
            as: alias
        )
    }
    /**
@@ -431,9 +509,15 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute
     */
-    public static func minimum<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O, K>, as alias: KeyPathString? = nil) -> SelectTerm<O> where K.ObjectType == O {
+    public static func minimum<K: AttributeKeyPathStringConvertible>(
-        
+        _ keyPath: KeyPath<O, K>,
-        return self.minimum(O.meta[keyPath: keyPath].cs_keyPathString, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> where K.ObjectType == O {
        return self.minimum(
            O.meta[keyPath: keyPath].cs_keyPathString,
            as: alias
        )
    }
    /**
@@ -442,9 +526,15 @@ extension SelectTerm where O: CoreStoreObject {
     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum(<attributeName>)" is used
     - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
     */
-    public static func sum<K: AttributeKeyPathStringConvertible>(_ keyPath: KeyPath<O, K>, as alias: KeyPathString? = nil) -> SelectTerm<O> where K.ObjectType == O {
+    public static func sum<K: AttributeKeyPathStringConvertible>(
-        
+        _ keyPath: KeyPath<O, K>,
-        return self.sum(O.meta[keyPath: keyPath].cs_keyPathString, as: alias)
+        as alias: KeyPathString? = nil
    ) -> SelectTerm<O> where K.ObjectType == O {
        return self.sum(
            O.meta[keyPath: keyPath].cs_keyPathString,
            as: alias
        )
    }
 }
@@ -485,8 +575,11 @@ public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hasha
     - parameter selectTerm: a `SelectTerm`
     - parameter selectTerms: a series of `SelectTerm`s
     */
-    public init(_ selectTerm: SelectTerm<O>, _ selectTerms: SelectTerm<O>...) {
+    public init(
-        
+        _ selectTerm: SelectTerm<O>,
        _ selectTerms: SelectTerm<O>...
    ) {
        self.selectTerms = [selectTerm] + selectTerms
    }
@@ -495,15 +588,20 @@ public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hasha
     - parameter selectTerms: a series of `SelectTerm`s
     */
-    public init(_ selectTerms: [SelectTerm<O>]) {
+    public init(
-        
+        _ selectTerms: [SelectTerm<O>]
    ) {
        self.selectTerms = selectTerms
    }
    // MARK: Equatable
-    public static func == <T1, T2>(lhs: Select<O, T1>, rhs: Select<O, T2>) -> Bool {
+    public static func == <T1, T2>(
        lhs: Select<O, T1>,
        rhs: Select<O, T2>
    ) -> Bool {
        return lhs.selectTerms == rhs.selectTerms
    }
@@ -527,8 +625,10 @@ public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hasha
    // MARK: Internal
-    internal func applyToFetchRequest(_ fetchRequest: NSFetchRequest<NSDictionary>) {
+    internal func applyToFetchRequest(
-        
+        _ fetchRequest: NSFetchRequest<NSDictionary>
    ) {
        fetchRequest.includesPendingChanges = false
        fetchRequest.resultType = .dictionaryResultType
@@ -611,12 +711,6 @@ public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hasha
        fetchRequest.propertiesToFetch = propertiesToFetch
    }
    // MARK: Deprecated
    @available(*, deprecated, renamed: "O")
    public typealias D = O
 }
 extension Select where T: NSManagedObjectID {
@@ -642,48 +736,6 @@ extension Select where O: NSManagedObject {
    }
 }
 extension Select where O: CoreStoreObject, T: ImportableAttributeType {
    /**
     Initializes a `Select` that queries the value of an attribute pertained by a keyPath
     - parameter keyPath: the keyPath for the attribute
     */
    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
        self.init(.attribute(keyPath))
    }
    /**
     Initializes a `Select` that queries the value of an attribute pertained by a keyPath
     - parameter keyPath: the keyPath for the attribute
     */
    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
        self.init(.attribute(keyPath))
    }
 }
 extension Select where O: CoreStoreObject, T: ImportableAttributeType & NSCoding & NSCopying {
    /**
     Initializes a `Select` that queries the value of an attribute pertained by a keyPath
     - parameter keyPath: the keyPath for the attribute
     */
    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
        self.init(.attribute(keyPath))
    }
    /**
     Initializes a `Select` that queries the value of an attribute pertained by a keyPath
     - parameter keyPath: the keyPath for the attribute
     */
    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
        self.init(.attribute(keyPath))
    }
 }
 // MARK: - SelectClause
@@ -715,8 +767,45 @@ extension NSDictionary: SelectAttributesResultType {
    // MARK: SelectAttributesResultType
-    public static func cs_fromQueryResultsNativeType(_ result: [Any]) -> [[String : Any]] {
+    public static func cs_fromQueryResultsNativeType(
-        
+        _ result: [Any]
    ) -> [[String : Any]] {
        return result as! [[String: Any]]
    }
 }
 // MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension Select where O: CoreStoreObject, T: ImportableAttributeType {
    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
        self.init(.attribute(keyPath))
    }
    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
        self.init(.attribute(keyPath))
    }
 }
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension Select where O: CoreStoreObject, T: ImportableAttributeType & NSCoding & NSCopying {
    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
        self.init(.attribute(keyPath))
    }
    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
        self.init(.attribute(keyPath))
    }
 }
--- a/Sources/StorageInterface.swift
+++ b/Sources/StorageInterface.swift
@@ -139,17 +139,24 @@ public protocol LocalStorage: StorageInterface {
    /**
     The options dictionary for the specified `LocalStorageOptions`
     */
-    func dictionary(forOptions options: LocalStorageOptions) -> [AnyHashable: Any]?
+    func dictionary(
-    
+        forOptions options: LocalStorageOptions
    ) -> [AnyHashable: Any]?
    /**
     Called by the `DataStack` to perform checkpoint operations on the storage. (SQLite stores for example, can convert the database's WAL journaling mode to DELETE to force a checkpoint)
     */
-    func cs_finalizeStorageAndWait(soureModelHint: NSManagedObjectModel) throws
+    func cs_finalizeStorageAndWait(
-    
+        soureModelHint: NSManagedObjectModel
    ) throws(any Swift.Error)
    /**
     Called by the `DataStack` to perform actual deletion of the store file from disk. **Do not call directly!** The `sourceModel` argument is a hint for the existing store's model version. Implementers can use the `sourceModel` to perform necessary store operations. (SQLite stores for example, can convert WAL journaling mode to DELETE before deleting)
     */
-    func cs_eraseStorageAndWait(metadata: [String: Any], soureModelHint: NSManagedObjectModel?) throws
+    func cs_eraseStorageAndWait(
        metadata: [String: Any], 
        soureModelHint: NSManagedObjectModel?
    ) throws(any Swift.Error)
 }
 extension LocalStorage {
--- a/Sources/SynchronousDataTransaction.swift
+++ b/Sources/SynchronousDataTransaction.swift
@@ -41,8 +41,8 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     ```
     - Important: Always use plain `try` on a `cancel()` call. Never use `try?` or `try!`. Using `try?` will swallow the cancellation and the transaction will proceed to commit as normal. Using `try!` will crash the app as `cancel()` will *always* throw an error.
     */
-    public func cancel() throws -> Never {
+    public func cancel() throws(CoreStoreError) -> Never {
-        
+
        throw CoreStoreError.userCancelled
    }
@@ -55,8 +55,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     - parameter into: the `Into` clause indicating the destination `NSManagedObject` or `CoreStoreObject` entity type and the destination configuration
     - returns: a new `NSManagedObject` or `CoreStoreObject` instance of the specified entity type.
     */
-    public override func create<O>(_ into: Into<O>) -> O {
+    public override func create<O>(
-        
+        _ into: Into<O>
    ) -> O {
        Internals.assert(
            !self.isCommitted,
            "Attempted to create an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
@@ -71,8 +73,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public override func edit<O: DynamicObject>(_ object: O?) -> O? {
+    public override func edit<O: DynamicObject>(
-        
+        _ object: O?
    ) -> O? {
        Internals.assert(
            !self.isCommitted,
            "Attempted to update an entity of type \(Internals.typeName(object)) from an already committed \(Internals.typeName(self))."
@@ -88,8 +92,11 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     - parameter objectID: the `NSManagedObjectID` for the object to be edited
     - returns: an editable proxy for the specified `NSManagedObject` or `CoreStoreObject`.
     */
-    public override func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
+    public override func edit<O>(
-        
+        _ into: Into<O>,
        _ objectID: NSManagedObjectID
    ) -> O? {
        Internals.assert(
            !self.isCommitted,
            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
@@ -103,7 +110,9 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
     */
-    public override func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+    public override func delete<S: Sequence>(
        objectIDs: S
    ) where S.Iterator.Element: NSManagedObjectID {
        Internals.assert(
            !self.isCommitted,
@@ -119,7 +128,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
     - parameter object: the `ObjectRepresentation` representing an `NSManagedObject` or `CoreStoreObject` to be deleted
     - parameter objects: other `ObjectRepresentation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public override func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+    public override func delete<O: ObjectRepresentation>(
        _ object: O?,
        _ objects: O?...
    ) {
        Internals.assert(
            !self.isCommitted,
@@ -134,7 +146,9 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    - parameter objects: the `ObjectRepresenation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
     */
-    public override func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
+    public override func delete<S: Sequence>(
        _ objects: S
    ) where S.Iterator.Element: ObjectRepresentation {
        Internals.assert(
            !self.isCommitted,
@@ -162,8 +176,13 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
        )
    }
-    internal func autoCommit(waitForMerge: Bool) -> (hasChanges: Bool, error: CoreStoreError?) {
+    internal func autoCommit(
-        
+        waitForMerge: Bool
    ) -> (
        hasChanges: Bool,
        error: CoreStoreError?
    ) {
        self.isCommitted = true
        let result = self.context.saveSynchronously(
            waitForMerge: waitForMerge,
--- a/Sources/Transformable.Optional.swift
+++ b/Sources/Transformable.Optional.swift
@@ -27,62 +27,15 @@ import CoreData
 import Foundation
-// MARK: - TransformableContainer
+// MARK: - Deprecated
@available(*, deprecated, message: """
 Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
 """)
 extension TransformableContainer {
-
+    
    // MARK: - Optional
    /**
     The containing type for optional transformable properties. Any type that conforms to `NSCoding & NSCopying` are supported.
     ```
     class Animal: CoreStoreObject {
         let species = Value.Required<String>("species", initial: "")
         let nickname = Value.Optional<String>("nickname")
         let color = Transformable.Optional<UIColor>("color")
     }
     ```
     - Important: `Transformable.Optional` properties are required to be stored properties. Computed properties will be ignored, including `lazy` and `weak` properties.
     */
    public final class Optional<V: NSCoding & NSCopying>: AttributeKeyPathStringConvertible, AttributeProtocol {
-
+        
        /**
         Initializes the metadata for the property.
         ```
         class Animal: CoreStoreObject {
             let species = Value.Required<String>("species", initial: "")
             let color = Transformable.Optional<UIColor>(
                 "color",
                 isTransient: true,
                 customGetter: Animal.getColor(_:)
             )
         }
         private static func getColor(_ partialObject: PartialObject<Animal>) -> UIColor? {
             if let cachedColor = partialObject.primitiveValue(for: { $0.color }) {
                 return cachedColor
             }
             let color: UIColor?
             switch partialObject.value(for: { $0.species }) {
             case "Swift": color = UIColor.orange
             case "Bulbasaur": color = UIColor.green
             default: return nil
             }
             partialObject.setPrimitiveValue(color, for: { $0.color })
             return color
         }
         ```
         - parameter keyPath: the permanent attribute name for this property.
         - parameter initial: the initial value for the property that is shared for all instances of this object. Note that this is evaluated during `DataStack` setup, not during object creation. Defaults to the `ImportableAttributeType`'s empty value if not specified.
         - parameter isTransient: `true` if the property is transient, otherwise `false`. Defaults to `false` if not specified. The transient flag specifies whether or not a property's value is ignored when an object is saved to a persistent store. Transient properties are not saved to the persistent store, but are still managed for undo, redo, validation, and so on.
         - parameter allowsExternalBinaryDataStorage: `true` if the attribute allows external binary storage, otherwise `false`.
         - parameter versionHashModifier: used to mark or denote a property as being a different "version" than another even if all of the values which affect persistence are equal. (Such a difference is important in cases where the properties are unchanged but the format or content of its data are changed.)
         - parameter renamingIdentifier: used to resolve naming conflicts between models. When creating an entity mapping between entities in two managed object models, a source entity property and a destination entity property that share the same identifier indicate that a property mapping should be configured to migrate from the source to the destination. If unset, the identifier will be the property's name.
         - parameter customGetter: use this closure as an "override" for the default property getter. The closure receives a `PartialObject<O>`, which acts as a fast, type-safe KVC interface for `CoreStoreObject`. The reason a `CoreStoreObject` instance is not passed directly is because the Core Data runtime is not aware of `CoreStoreObject` properties' static typing, and so loading those info everytime KVO invokes this accessor method incurs a cumulative performance hit (especially in KVO-heavy operations such as `ListMonitor` observing.) When accessing the property value from `PartialObject<O>`, make sure to use `PartialObject<O>.primitiveValue(for:)` instead of `PartialObject<O>.value(for:)`, which would unintentionally execute the same closure again recursively.
         - parameter customSetter: use this closure as an "override" for the default property setter. The closure receives a `PartialObject<O>`, which acts as a fast, type-safe KVC interface for `CoreStoreObject`. The reason a `CoreStoreObject` instance is not passed directly is because the Core Data runtime is not aware of `CoreStoreObject` properties' static typing, and so loading those info everytime KVO invokes this accessor method incurs a cumulative performance hit (especially in KVO-heavy operations such as `ListMonitor` observing.) When accessing the property value from `PartialObject<O>`, make sure to use `PartialObject<O>.setPrimitiveValue(_:for:)` instead of `PartialObject<O>.setValue(_:for:)`, which would unintentionally execute the same closure again recursively.
         - parameter affectedByKeyPaths: a set of key paths for properties whose values affect the value of the receiver. This is similar to `NSManagedObject.keyPathsForValuesAffectingValue(forKey:)`.
         */
        public init(
            _ keyPath: KeyPathString,
            initial: @autoclosure @escaping () -> V? = nil,
@@ -110,10 +63,7 @@ extension TransformableContainer {
            self.customGetter = customGetter
            self.customSetter = customSetter
        }
-
+        
        /**
         The attribute value
         */
        public var value: ReturnValueType {
            get {
@@ -163,28 +113,16 @@ extension TransformableContainer {
            }
        }
        // MARK: AnyKeyPathStringConvertible
        public var cs_keyPathString: String {
            return self.keyPath
        }
        // MARK: KeyPathStringConvertible
        public typealias ObjectType = O
        public typealias DestinationValueType = V
        // MARK: AttributeKeyPathStringConvertible
        public typealias ReturnValueType = DestinationValueType?
        // MARK: PropertyProtocol
        internal let keyPath: KeyPathString
@@ -240,59 +178,26 @@ extension TransformableContainer {
            return self.value
        }
        // MARK: Private
        private let customGetter: ((_ partialObject: PartialObject<O>) -> V?)?
        private let customSetter: ((_ partialObject: PartialObject<O>, _ newValue: V?) -> Void)?
    }
 }
-
+@available(*, deprecated, message: """
-// MARK: - Operations
+Legacy `Value.*`, `Transformable.*`, and `Relationship.*` declarations will soon be obsoleted. Please migrate your models and stores to new models that use `@Field.*` property wrappers. See: https://github.com/JohnEstropia/CoreStore?tab=readme-ov-file#new-field-property-wrapper-syntax
-
+""")
 extension TransformableContainer.Optional {
    /**
     Assigns an optional transformable value to the property. The operation
     ```
     animal.color .= UIColor.red
     ```
     is equivalent to
     ```
     animal.color.value = UIColor.red
     ```
     */
    public static func .= (_ property: TransformableContainer<O>.Optional<V>, _ newValue: V?) {
        property.value = newValue
    }
-
+    
    /**
     Assigns an optional transformable value from another property. The operation
     ```
     animal.color .= anotherAnimal.color
     ```
     is equivalent to
     ```
     animal.color.value = anotherAnimal.color.value
     ```
     */
    public static func .= <O2>(_ property: TransformableContainer<O>.Optional<V>, _ property2: TransformableContainer<O2>.Optional<V>) {
        property.value = property2.value
    }
-
+    
    /**
     Assigns a transformable value from another property. The operation
     ```
     animal.color .= anotherAnimal.color
     ```
     is equivalent to
     ```
     animal.color.value = anotherAnimal.color.value
     ```
     */
    public static func .= <O2>(_ property: TransformableContainer<O>.Optional<V>, _ property2: TransformableContainer<O2>.Required<V>) {
        property.value = property2.value
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Estropia	104def4611	bump min development version to iOS 16 and macOS 13	2024-10-31 14:05:02 +09:00
John Estropia	5dcf29011a	Support typed errors. Misc formatting	2024-09-10 11:14:39 +09:00
John Estropia	c9e091a6a4	Merge pull request #510 from DavidTiimo/develop issue #509 \| Xcode 16.0 beta 6 error - "'CATransaction' is unavailable in watchOS"	2024-09-10 11:11:32 +09:00
David Hansson	010a79ef6a	Reverse check, as only watch os is having troubles	2024-09-04 12:55:24 +02:00
David Hansson	9f9ecb4820	Only available for iOS	2024-09-04 12:35:08 +02:00
David Hansson	3fb2b5927b	Comment out broken code for Xcode beta	2024-08-13 09:47:48 +02:00
John Estropia	7c2129e38f	Deprecation of legacy ValueContainer and RelationshipContainer properties in favor of @Field propertyWrapper counterpart	2024-01-28 22:11:21 +09:00