From d4deed0cf7cfd713b73a12013a8ff03804abed2d Mon Sep 17 00:00:00 2001
From: jagbryrmiginte <jagbryrmiginte@mailbox.org>
Date: Sun, 21 Jul 2019 12:09:53 +0200
Subject: [PATCH 01/58] Specify minimum deployment target for Swift Package
 Manager, fixes Issue #328

---
 Package.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Package.swift b/Package.swift
index 271d129..39f6c58 100644
--- a/Package.swift
+++ b/Package.swift
@@ -28,6 +28,9 @@ import PackageDescription
 
 let package = Package(
     name: "CoreStore",
+    platforms: [
+           .macOS(.v10_12), .iOS(.v10), .tvOS(.v10), .watchOS(.v3)
+    ],
     products: [
         .library(name: "CoreStore", type: .static, targets: ["CoreStore"])
     ],

From f0dac2454cc657f9ae14a10491a2be7d06ad90bd Mon Sep 17 00:00:00 2001
From: jagbryrmiginte <jagbryrmiginte@mailbox.org>
Date: Sun, 21 Jul 2019 12:12:30 +0200
Subject: [PATCH 02/58] Bump SPM package description to 5.0 to resolve compiler
 error

---
 Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index 39f6c58..f6ec31f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 //
 //  Package.swift
 //  CoreStore

From 8e3c44c072ed5e2d50af724817fe66e09b321829 Mon Sep 17 00:00:00 2001
From: Pushpendra <pushpendra.singh@omniwyse.com>
Date: Fri, 13 Sep 2019 15:27:46 +0530
Subject: [PATCH 03/58] Added Support for Swift 5 Upgraded Xcode build version
 Added missing reference of for different targets

---
 .travis.yml                         | 26 +++++++++++++-------------
 CoreStore.xcodeproj/project.pbxproj | 12 ++++++++++++
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 48d3626..ebabb75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10.2
+osx_image: xcode11
 sudo: false
 git:
   submodules: false
@@ -11,16 +11,16 @@ env:
   - LANG=en_US.UTF-8
   matrix:
     - DESTINATION="arch=x86_64"                         SCHEME="CoreStore OSX"     SDK=macosx10.14          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=iPhone XS"              SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0.1,name=iPhone 8"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.3.1,name=iPhone 7"             SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=iPhone 7"               SCHEME="CoreStore iOS"     SDK=iphonesimulator12.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=4.0,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator5.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=Apple TV 4K"            SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"         SCHEME="CoreStore tvOS"    SDK=appletvsimulator12.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=iPhone XS"              SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.0.1,name=iPhone 8"             SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.3.1,name=iPhone 7"             SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.1,name=iPhone 7"               SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=4.0,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=12.0,name=Apple TV 4K"            SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=10.2,name=Apple TV 1080p"         SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
 before_install:
   - gem install cocoapods --no-rdoc --no-ri --no-document
   - gem install xcpretty --no-rdoc --no-ri --no-document
@@ -34,8 +34,8 @@ script:
       xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
       xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
     fi
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator12.0" -destination "OS=11.0.1,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator13.0" -destination "OS=13.0,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator13.0" -destination "OS=13.0,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
   - if [ $POD_LINT == "YES" ]; then
       pod lib lint --quick;
     fi
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index c28d06d..8a8f958 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -7,6 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2C22D43E38009FA3BA /* KeyPath+KeyPaths.swift */; };
+		18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2C22D43E38009FA3BA /* KeyPath+KeyPaths.swift */; };
+		18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2C22D43E38009FA3BA /* KeyPath+KeyPaths.swift */; };
+		18166887232B9ED60097C275 /* String+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2A22D43931009FA3BA /* String+KeyPaths.swift */; };
+		18166888232B9ED70097C275 /* String+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2A22D43931009FA3BA /* String+KeyPaths.swift */; };
+		18166889232B9ED80097C275 /* String+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2A22D43931009FA3BA /* String+KeyPaths.swift */; };
 		2F03A53619C5C6DA005002A5 /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A54C19C5C872005002A5 /* CoreData.framework */; };
 		2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
@@ -2121,6 +2127,7 @@
 				B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */,
 				B5E1B5951CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
+				18166887232B9ED60097C275 /* String+KeyPaths.swift in Sources */,
 				B5ECDC2B1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				B56923F11EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				82BA18A11C4BBD1D00A0916E /* CoreStore.swift in Sources */,
@@ -2215,6 +2222,7 @@
 				B5A991ED1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEE1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D162227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
@@ -2316,6 +2324,7 @@
 				B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5220E1F1D130810009BC71E /* CSListObserver.swift in Sources */,
 				B52DD1941BE1F92500949AFE /* CoreStore.swift in Sources */,
+				18166889232B9ED80097C275 /* String+KeyPaths.swift in Sources */,
 				B52DD1A61BE1F92F00949AFE /* BaseDataTransaction+Importing.swift in Sources */,
 				B56923F31EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B5220E1D1D13080A009BC71E /* CSDataStack+Observing.swift in Sources */,
@@ -2410,6 +2419,7 @@
 				B5A991EF1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5220E201D130813009BC71E /* CSObjectMonitor.swift in Sources */,
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D182227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
@@ -2511,6 +2521,7 @@
 				B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5E1B5961CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				B5ECDC2C1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
+				18166888232B9ED70097C275 /* String+KeyPaths.swift in Sources */,
 				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
 				B56923F21EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B546F95A1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
@@ -2605,6 +2616,7 @@
 				B5A991EE1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEF1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D172227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,

From 6d75dcbc329965703aa8bd397a802b87fca1dbd0 Mon Sep 17 00:00:00 2001
From: dmatushkin <dmatushkin@gmail.com>
Date: Sun, 15 Sep 2019 14:57:20 +0400
Subject: [PATCH 04/58] Fix for build on iOS with Swift Package Manager

---
 Sources/CoreStore+CustomDebugStringConvertible.swift | 2 +-
 Sources/CoreStoreSchema.swift                        | 2 +-
 Sources/DataStack+Migration.swift                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift
index 894932a..0973a55 100644
--- a/Sources/CoreStore+CustomDebugStringConvertible.swift
+++ b/Sources/CoreStore+CustomDebugStringConvertible.swift
@@ -1204,7 +1204,7 @@ extension NSEntityDescription: CoreStoreDebugStringConvertible {
             
             info.append(("compoundIndexes", self.compoundIndexes))
         }
-        if #available(macOS 10.11, *) {
+        if #available(macOS 10.11, iOS 9.0, *) {
             
             info.append(("uniquenessConstraints", self.uniquenessConstraints))
         }
diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift
index 0db2166..967e763 100644
--- a/Sources/CoreStoreSchema.swift
+++ b/Sources/CoreStoreSchema.swift
@@ -451,7 +451,7 @@ public final class CoreStoreSchema: DynamicSchema {
         }
         for (entity, entityDescription) in entityDescriptionsByEntity {
 
-            if #available(macOS 10.11, *) {
+            if #available(macOS 10.11, iOS 9.0, *) {
                 
                 let uniqueConstraints = entity.uniqueConstraints.filter({ !$0.isEmpty })
                 if !uniqueConstraints.isEmpty {
diff --git a/Sources/DataStack+Migration.swift b/Sources/DataStack+Migration.swift
index bda75e1..12632fa 100644
--- a/Sources/DataStack+Migration.swift
+++ b/Sources/DataStack+Migration.swift
@@ -750,7 +750,7 @@ extension DataStack {
         }
         let fileManager = FileManager.default
         let systemTemporaryDirectoryURL: URL
-        if #available(macOS 10.12, *) {
+        if #available(macOS 10.12, iOS 10.0, *) {
 
             systemTemporaryDirectoryURL = fileManager.temporaryDirectory
         }

From c5a996d5ed62e0511a17b6f3138a42d50cc9d665 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 4 Oct 2019 08:43:04 +0900
Subject: [PATCH 05/58] WIP: do not use yet

---
 CoreStore.xcodeproj/project.pbxproj           |  20 ++
 .../CoreStoreDemo.xcodeproj/project.pbxproj   |  20 ++
 .../CoreStoreDemo/Base.lproj/Main.storyboard  | 185 +++++++-----
 .../CoreStoreDemo/MenuViewController.swift    |  92 ++++++
 .../SwiftUIHostingController.swift            |  22 ++
 .../SwiftUI Demo/SwiftUIView.swift            |  90 ++++++
 Sources/Internals.DiffDelegate.swift          | 276 ++++++++++++++++++
 Sources/LiveList.swift                        | 130 +++++++++
 8 files changed, 761 insertions(+), 74 deletions(-)
 create mode 100644 CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
 create mode 100644 CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift
 create mode 100644 CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
 create mode 100644 Sources/Internals.DiffDelegate.swift
 create mode 100644 Sources/LiveList.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index e4f95bb..075a457 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -70,6 +70,14 @@
 		82BA18D81C4BBD7100A0916E /* Internals.WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */; };
 		82BA18DC1C4BBD9C00A0916E /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
 		82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
+		B501322A2344ECB500FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
+		B501322B2346A9AE00FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
+		B501322D2346A9B000FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
+		B501322E2346A9B100FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
+		B50132302346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
+		B50132312346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
+		B50132322346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
+		B50132332346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
 		B501FDDD1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
@@ -775,6 +783,8 @@
 		82BA18DE1C4BBE2600A0916E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		82BA18E01C4BBE2C00A0916E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B500810F2290CDF800F4CEA5 /* bitrise.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = bitrise.yml; sourceTree = SOURCE_ROOT; };
+		B50132292344ECB500FC238B /* LiveList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveList.swift; sourceTree = "<group>"; };
+		B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffDelegate.swift; sourceTree = "<group>"; };
 		B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSectionBy.swift; sourceTree = "<group>"; };
 		B501FDE11CA8D1F500BE22EF /* CSListMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListMonitor.swift; sourceTree = "<group>"; };
 		B501FDE61CA8D20500BE22EF /* CSListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListObserver.swift; sourceTree = "<group>"; };
@@ -1536,6 +1546,7 @@
 				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
 				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
 				B5E84F1D1AFF84860064E85B /* ListMonitor.swift */,
+				B50132292344ECB500FC238B /* LiveList.swift */,
 				B5E84F1E1AFF84860064E85B /* ListObserver.swift */,
 			);
 			name = Observing;
@@ -1564,6 +1575,7 @@
 				B5474D142227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift */,
 				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
 				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
+				B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */,
 				B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */,
 				B5E84F2B1AFF849C0064E85B /* Internals.NotificationObserver.swift */,
 				B5DE522A230BD7CC00A22534 /* Internals.swift */,
@@ -1921,6 +1933,7 @@
 				B5ECDBFF1CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B5ECDC051CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B5981CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
+				B501322A2344ECB500FC238B /* LiveList.swift in Sources */,
 				B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */,
 				B5519A5F1CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
 				B52FD3AA1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
@@ -1943,6 +1956,7 @@
 				B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */,
 				B5E5FA4E22D162F400330931 /* ObjectSnapshot.swift in Sources */,
 				B5E1B5A81CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
+				B50132302346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
 				B5E1B59D1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
@@ -2170,6 +2184,7 @@
 				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
 				82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */,
 				82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */,
+				B50132312346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
 				82BA18D41C4BBD7100A0916E /* NSManagedObjectContext+Querying.swift in Sources */,
 				82BA18D51C4BBD7100A0916E /* NSManagedObjectContext+Setup.swift in Sources */,
 				B501FDE91CA8D20500BE22EF /* CSListObserver.swift in Sources */,
@@ -2244,6 +2259,7 @@
 				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
+				B501322B2346A9AE00FC238B /* LiveList.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAF1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2368,6 +2384,7 @@
 				B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */,
 				B52DD1C31BE1F94600949AFE /* Internals.NotificationObserver.swift in Sources */,
 				B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */,
+				B50132332346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
 				B5220E221D130818009BC71E /* CSSectionBy.swift in Sources */,
 				B52DD1BC1BE1F94000949AFE /* MigrationResult.swift in Sources */,
 				B52DD19D1BE1F92C00949AFE /* BaseDataTransaction.swift in Sources */,
@@ -2442,6 +2459,7 @@
 				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
+				B501322E2346A9B100FC238B /* LiveList.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB11FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5220E171D1306DF009BC71E /* UnsafeDataTransaction+Observing.swift in Sources */,
@@ -2566,6 +2584,7 @@
 				B56321971BD65216006C9394 /* Select.swift in Sources */,
 				B56321AB1BD6521C006C9394 /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B563219C1BD65216006C9394 /* SectionBy.swift in Sources */,
+				B50132322346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
 				B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */,
 				B5FE4DA41C8481E100FA6A91 /* StorageInterface.swift in Sources */,
 				B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */,
@@ -2640,6 +2659,7 @@
 				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
+				B501322D2346A9B000FC238B /* LiveList.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB01FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
index 9d3c230..ac94d63 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		B50132242344E24300FC238B /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132232344E24300FC238B /* SwiftUIView.swift */; };
+		B50132262344E44B00FC238B /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132252344E44B00FC238B /* MenuViewController.swift */; };
+		B50132282344E5E900FC238B /* SwiftUIHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132272344E5E900FC238B /* SwiftUIHostingController.swift */; };
 		B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */; };
 		B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */; };
 		B503FAE11AFDC71700F90881 /* Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADD1AFDC71700F90881 /* Palette.swift */; };
@@ -59,6 +62,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		B50132232344E24300FC238B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
+		B50132252344E44B00FC238B /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
+		B50132272344E5E900FC238B /* SwiftUIHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIHostingController.swift; sourceTree = "<group>"; };
 		B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADD1AFDC71700F90881 /* Palette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Palette.swift; sourceTree = "<group>"; };
@@ -114,6 +120,15 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		B50132222344E20B00FC238B /* SwiftUI Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B50132232344E24300FC238B /* SwiftUIView.swift */,
+				B50132272344E5E900FC238B /* SwiftUIHostingController.swift */,
+			);
+			path = "SwiftUI Demo";
+			sourceTree = "<group>";
+		};
 		B503FADA1AFDC71700F90881 /* List and Object Observers Demo */ = {
 			isa = PBXGroup;
 			children = (
@@ -166,6 +181,8 @@
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
+				B50132252344E44B00FC238B /* MenuViewController.swift */,
+				B50132222344E20B00FC238B /* SwiftUI Demo */,
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
 				B52977DB1B120F2C003D50A5 /* Transactions Demo */,
@@ -311,6 +328,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */,
+				B50132262344E44B00FC238B /* MenuViewController.swift in Sources */,
 				B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */,
 				B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */,
 				B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */,
@@ -332,10 +350,12 @@
 				B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */,
 				B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */,
 				B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */,
+				B50132282344E5E900FC238B /* SwiftUIHostingController.swift in Sources */,
 				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
 				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
 				B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */,
 				B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */,
+				B50132242344E24300FC238B /* SwiftUIView.swift in Sources */,
 				B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */,
 				B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */,
 			);
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index ef13862..3a6c376 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ni8-QF-XHB">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ni8-QF-XHB">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -68,10 +66,10 @@
                         </view>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="8b8-lM-Krq" detailTextLabel="hR1-Zb-BOk" style="IBUITableViewCellStyleValue1" id="dMt-nx-EO5">
-                                <rect key="frame" x="0.0" y="172" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="178" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dMt-nx-EO5" id="gdK-VV-zNb">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8b8-lM-Krq">
@@ -121,15 +119,15 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="WUc-3Y-Quw">
-                                <rect key="frame" x="0.0" y="324" width="375" height="343"/>
+                                <rect key="frame" x="0.0" y="304" width="375" height="363"/>
                                 <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="separatorColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrganismTableViewCell" id="WVb-th-o8c" customClass="OrganismTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="22" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WVb-th-o8c" id="JBq-Ml-a9p">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OQf-Bd-Zze">
@@ -170,25 +168,25 @@
                                 </connections>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XKA-Ub-c2X">
-                                <rect key="frame" x="0.0" y="64" width="375" height="260"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="260"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i7U-bW-juB" customClass="UIButton">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="260"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Organism" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxy-nY-P44">
-                                                <rect key="frame" x="20" y="90.5" width="335" height="26.5"/>
+                                                <rect key="frame" x="20" y="93.5" width="335" height="26.5"/>
                                                 <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="22"/>
                                                 <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="attributes" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Ac-xl-ldZ">
-                                                <rect key="frame" x="20" y="131.5" width="335" height="20.5"/>
+                                                <rect key="frame" x="20" y="134.5" width="335" height="20.5"/>
                                                 <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
                                                 <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="rAZ-eJ-sxy">
-                                                <rect key="frame" x="20" y="20" width="335" height="29"/>
+                                                <rect key="frame" x="20" y="20" width="335" height="32"/>
                                                 <segments>
                                                     <segment title="First"/>
                                                     <segment title="Second"/>
@@ -200,7 +198,7 @@
                                                 </connections>
                                             </segmentedControl>
                                             <progressView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="869-wx-Odb">
-                                                <rect key="frame" x="20" y="68" width="335" height="2"/>
+                                                <rect key="frame" x="20" y="71" width="335" height="2"/>
                                                 <color key="progressTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="trackTintColor" red="1" green="1" blue="1" alpha="0.20000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                             </progressView>
@@ -269,21 +267,21 @@
                             <tableViewSection id="wIP-Hn-YfF">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Q3n-Df-v1t" detailTextLabel="Hbn-cf-Y7m" style="IBUITableViewCellStyleSubtitle" id="AXm-KE-45G">
-                                        <rect key="frame" x="0.0" y="35" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="10" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AXm-KE-45G" id="9te-Wx-hkf">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Accounts" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Q3n-Df-v1t">
-                                                    <rect key="frame" x="16" y="6" width="82" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="82" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Setting up multiple persistent store configurations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hbn-cf-Y7m">
-                                                    <rect key="frame" x="16" y="30" width="263.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="263.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -296,21 +294,21 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="vpt-cT-gMo" detailTextLabel="ou9-TZ-8bf" style="IBUITableViewCellStyleSubtitle" id="fsb-zw-8Ii">
-                                        <rect key="frame" x="0.0" y="85" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="60" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fsb-zw-8Ii" id="Upm-AO-Fw3">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Colors" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vpt-cT-gMo">
-                                                    <rect key="frame" x="16" y="6" width="56" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="56" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Observing list changes and single object changes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ou9-TZ-8bf">
-                                                    <rect key="frame" x="16" y="30" width="260.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="260.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -323,21 +321,21 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="UbU-Kd-yrY" detailTextLabel="uP1-Jc-o9v" style="IBUITableViewCellStyleSubtitle" id="ekW-PJ-mbo">
-                                        <rect key="frame" x="0.0" y="135" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="110" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ekW-PJ-mbo" id="CYq-mg-PVS">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Placemarks" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UbU-Kd-yrY">
-                                                    <rect key="frame" x="16" y="6" width="100.5" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="100.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Making changes with transactions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uP1-Jc-o9v">
-                                                    <rect key="frame" x="16" y="30" width="179" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="179" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -350,21 +348,21 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="C8Y-0y-lEG" detailTextLabel="jZw-qE-0ws" style="IBUITableViewCellStyleSubtitle" id="ph1-8z-C1m">
-                                        <rect key="frame" x="0.0" y="185" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="160" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ph1-8z-C1m" id="nNz-rd-ksg">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Time Zones" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C8Y-0y-lEG">
-                                                    <rect key="frame" x="16" y="6" width="101.5" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="101.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Fetching objects and raw values" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jZw-qE-0ws">
-                                                    <rect key="frame" x="16" y="30" width="168.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="168.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -377,21 +375,21 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ZfY-Aq-Ykq" detailTextLabel="QzD-9b-k1j" style="IBUITableViewCellStyleSubtitle" id="wyK-rk-3tI">
-                                        <rect key="frame" x="0.0" y="235" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="210" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wyK-rk-3tI" id="fLd-KK-QcW">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZfY-Aq-Ykq">
-                                                    <rect key="frame" x="16" y="6" width="61" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="61" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Implementing a custom logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QzD-9b-k1j">
-                                                    <rect key="frame" x="16" y="30" width="159" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="159" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -404,21 +402,21 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="hSG-mG-YBw" detailTextLabel="X9P-TQ-LYh" style="IBUITableViewCellStyleSubtitle" id="xTM-Cf-0if">
-                                        <rect key="frame" x="0.0" y="285" width="375" height="50"/>
+                                        <rect key="frame" x="0.0" y="260" width="375" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xTM-Cf-0if" id="DfO-BW-krd">
-                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Evolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hSG-mG-YBw">
-                                                    <rect key="frame" x="16" y="6" width="78.5" height="24"/>
+                                                    <rect key="frame" x="16" y="7" width="78.5" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Migrating and de-migrating stores" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X9P-TQ-LYh">
-                                                    <rect key="frame" x="16" y="30" width="179.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="31" width="179.5" height="13.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -430,6 +428,33 @@
                                             <segue destination="iVv-Vc-nCL" kind="show" id="HbO-rU-Qfj"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="o2r-2N-Xda" detailTextLabel="2hh-MM-Oea" style="IBUITableViewCellStyleSubtitle" id="f25-dJ-AuT">
+                                        <rect key="frame" x="0.0" y="310" width="375" height="50"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f25-dJ-AuT" id="86t-0w-JT9">
+                                            <rect key="frame" x="0.0" y="0.0" width="348" height="50"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="SwiftUI" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="o2r-2N-Xda">
+                                                    <rect key="frame" x="16" y="7" width="60.5" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.13079629840000001" green="0.1840757281" blue="0.245942995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Binding with SwiftUI and Combine" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2hh-MM-Oea">
+                                                    <rect key="frame" x="16" y="31" width="178" height="13.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                    <color key="textColor" red="0.13079629840000001" green="0.1840757281" blue="0.245942995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="ulu-lC-FPB" kind="show" id="dvI-Dt-IDZ"/>
+                                        </connections>
+                                    </tableViewCell>
                                 </cells>
                             </tableViewSection>
                         </sections>
@@ -444,6 +469,16 @@
             </objects>
             <point key="canvasLocation" x="2634" y="2013"/>
         </scene>
+        <!--SwiftUI-->
+        <scene sceneID="ZD4-62-HWp">
+            <objects>
+                <hostingController id="ulu-lC-FPB" customClass="SwiftUIHostingController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" title="SwiftUI" id="0mY-rn-HTS"/>
+                </hostingController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="TNz-sK-Pj4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2292" y="2849"/>
+        </scene>
         <!--Object Observer-->
         <scene sceneID="Y7v-tc-8cX">
             <objects>
@@ -453,18 +488,18 @@
                         <viewControllerLayoutGuide type="bottom" id="aI4-O3-OCi"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="w8K-eN-RvU">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="301.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NhC-oM-bkd">
-                                <rect key="frame" x="16" y="69.5" width="343" height="70"/>
+                                <rect key="frame" x="16" y="69.5" width="343" height="80"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="TIX-qi-B34"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vfe-Yq-3Xa">
-                                <rect key="frame" x="16" y="149.5" width="343" height="18"/>
+                                <rect key="frame" x="16" y="159.5" width="343" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="4h9-ha-EzR"/>
                                 </constraints>
@@ -473,37 +508,37 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hue" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sgg-Md-Nf3">
-                                <rect key="frame" x="16" y="187.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="197.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Saturation" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rry-vh-bRK">
-                                <rect key="frame" x="16" y="225.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="235.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Brightness" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTa-ly-eyO">
-                                <rect key="frame" x="16" y="263.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="273.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="359" translatesAutoresizingMaskIntoConstraints="NO" id="YQ6-fq-3Wb">
-                                <rect key="frame" x="98" y="181.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="191.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="hueSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="9Hy-3h-llE"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="xXz-78-tAd">
-                                <rect key="frame" x="98" y="219.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="229.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="saturationSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="qtU-ua-ZTc"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="hpy-2d-eOP">
-                                <rect key="frame" x="98" y="257.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="267.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="brightnessSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="F09-EP-2iD"/>
                                 </connections>
@@ -581,13 +616,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5f-tW-lXf">
-                                <rect key="frame" x="0.0" y="64" width="375" height="301.5"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="311.5"/>
                                 <connections>
                                     <segue destination="5Fw-je-9gI" kind="embed" id="YcI-2Z-ijV"/>
                                 </connections>
                             </containerView>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
-                                <rect key="frame" x="0.0" y="365.5" width="375" height="301.5"/>
+                                <rect key="frame" x="0.0" y="355.5" width="375" height="311.5"/>
                                 <connections>
                                     <segue destination="sll-yo-mBc" kind="embed" id="AAl-HS-dq2"/>
                                 </connections>
@@ -620,7 +655,7 @@
                     <tabBarItem key="tabBarItem" title="Demo" image="second" id="3iQ-I2-4LW"/>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="00L-5k-Eno">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="barTintColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -643,14 +678,14 @@
             <objects>
                 <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="DAz-BE-6Ca">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="301.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="22" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G3X-70-BCD" id="aT8-nz-i5l">
-                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uQX-PI-UWF">
@@ -668,6 +703,7 @@
                                         </label>
                                     </subviews>
                                     <constraints>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="HJC-5w-lIN" secondAttribute="trailing" id="8FZ-9e-AdN"/>
                                         <constraint firstItem="HJC-5w-lIN" firstAttribute="height" secondItem="uQX-PI-UWF" secondAttribute="height" id="8Py-Ub-gQD"/>
                                         <constraint firstItem="uQX-PI-UWF" firstAttribute="top" secondItem="aT8-nz-i5l" secondAttribute="topMargin" id="9e4-wD-lwf"/>
                                         <constraint firstAttribute="centerY" secondItem="HJC-5w-lIN" secondAttribute="centerY" id="AeC-j4-DBE"/>
@@ -702,15 +738,15 @@
             <objects>
                 <tableViewController id="lCE-i6-UCT" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Zba-8M-Zd7">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="301.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="zSO-3e-OVq" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="22" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zSO-3e-OVq" id="cHA-by-n4b">
-                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5uq-Yi-XwH">
@@ -734,6 +770,7 @@
                                         <constraint firstItem="5uq-Yi-XwH" firstAttribute="top" secondItem="cHA-by-n4b" secondAttribute="topMargin" id="NqW-uA-mqj"/>
                                         <constraint firstItem="Zyu-PC-WmO" firstAttribute="height" secondItem="5uq-Yi-XwH" secondAttribute="height" id="Yd5-bt-R8q"/>
                                         <constraint firstItem="5uq-Yi-XwH" firstAttribute="leading" secondItem="cHA-by-n4b" secondAttribute="leadingMargin" id="a2a-Ol-0HV"/>
+                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Zyu-PC-WmO" secondAttribute="trailing" id="oip-jd-KsV"/>
                                     </constraints>
                                 </tableViewCellContentView>
                                 <connections>
@@ -791,11 +828,11 @@
                         <viewControllerLayoutGuide type="bottom" id="RZg-hi-T8O"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="k4s-iL-Krh">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <mapView verifyAmbiguity="ignoreSizes" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                                 <connections>
                                     <outlet property="delegate" destination="jPl-fH-NlD" id="Sjn-YC-haS"/>
                                 </connections>
@@ -832,14 +869,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" indicatorStyle="white" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TpK-gX-CTN">
-                                <rect key="frame" x="0.0" y="142" width="375" height="525"/>
+                                <rect key="frame" x="0.0" y="125" width="375" height="542"/>
                                 <color key="backgroundColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="textColor" red="0.92706394195556641" green="0.72759377956390381" blue="0.064024783670902252" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="15"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bordered" momentary="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4iq-B4-k0p">
-                                <rect key="frame" x="20" y="94" width="335" height="29"/>
+                                <rect key="frame" x="20" y="74" width="335" height="32"/>
                                 <segments>
                                     <segment title="Log"/>
                                     <segment title="Error"/>
@@ -916,7 +953,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="WGY-kX-mAx">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="44" width="375" height="623"/>
                                 <color key="backgroundColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="separatorColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <view key="tableHeaderView" contentMode="scaleToFill" id="iaH-1W-Sbo">
@@ -924,7 +961,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bordered" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="YVj-dA-fyV">
-                                            <rect key="frame" x="20" y="26" width="335" height="29"/>
+                                            <rect key="frame" x="20" y="24.5" width="335" height="32"/>
                                             <segments>
                                                 <segment title="Fetch"/>
                                                 <segment title="Query"/>
@@ -944,14 +981,14 @@
                                 </view>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="6db-P0-6Ms" style="IBUITableViewCellStyleDefault" id="vUr-WV-qur">
-                                        <rect key="frame" x="0.0" y="102" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="108" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vUr-WV-qur" id="Vr0-hE-cn9">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="349" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6db-P0-6Ms">
-                                                    <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="326" height="44"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="18"/>
                                                     <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -998,21 +1035,21 @@
                         <color key="separatorColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="RgX-yK-1L2" detailTextLabel="QZ4-A2-x4h" style="IBUITableViewCellStyleSubtitle" id="uBt-Iy-nWP">
-                                <rect key="frame" x="0.0" y="36" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="28" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uBt-Iy-nWP" id="6SD-ur-9zp">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RgX-yK-1L2">
-                                            <rect key="frame" x="16" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="12" width="48.5" height="24"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QZ4-A2-x4h">
-                                            <rect key="frame" x="16" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="36" width="31" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1044,21 +1081,21 @@
                         <color key="separatorColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="Syt-QJ-KXg" detailTextLabel="yHS-dP-IKS" style="IBUITableViewCellStyleSubtitle" id="q7Q-aF-Ftl">
-                                <rect key="frame" x="0.0" y="36" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="28" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q7Q-aF-Ftl" id="fc3-eg-yes">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Syt-QJ-KXg">
-                                            <rect key="frame" x="16" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="12" width="48.5" height="24"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yHS-dP-IKS">
-                                            <rect key="frame" x="16" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="36" width="31" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift b/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
new file mode 100644
index 0000000..1d07f24
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
@@ -0,0 +1,92 @@
+//
+//  MenuViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/02.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+// MARK: - MenuViewController
+
+final class MenuViewController: UITableViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Uncomment the following line to preserve selection between presentations
+        // self.clearsSelectionOnViewWillAppear = false
+
+        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+        // self.navigationItem.rightBarButtonItem = self.editButtonItem
+    }
+
+    // MARK: - Table view data source
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        // #warning Incomplete implementation, return the number of sections
+        return 0
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        // #warning Incomplete implementation, return the number of rows
+        return 0
+    }
+
+    /*
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)
+
+        // Configure the cell...
+
+        return cell
+    }
+    */
+
+    /*
+    // Override to support conditional editing of the table view.
+    override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+        // Return false if you do not want the specified item to be editable.
+        return true
+    }
+    */
+
+    /*
+    // Override to support editing the table view.
+    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
+        if editingStyle == .delete {
+            // Delete the row from the data source
+            tableView.deleteRows(at: [indexPath], with: .fade)
+        } else if editingStyle == .insert {
+            // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+        }    
+    }
+    */
+
+    /*
+    // Override to support rearranging the table view.
+    override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
+
+    }
+    */
+
+    /*
+    // Override to support conditional rearranging of the table view.
+    override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
+        // Return false if you do not want the item to be re-orderable.
+        return true
+    }
+    */
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift
new file mode 100644
index 0000000..f9c5df2
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift	
@@ -0,0 +1,22 @@
+//
+//  SwiftUIHostingController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/02.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+#if canImport(SwiftUI)
+
+import SwiftUI
+import UIKit
+
+@available(iOS 13.0.0, *)
+class SwiftUIHostingController: UIHostingController<SwiftUIView> {
+
+    @objc required dynamic init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder, rootView: SwiftUIView())
+    }
+}
+
+#endif
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
new file mode 100644
index 0000000..1f0d52e
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -0,0 +1,90 @@
+//
+//  SwiftUIView.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/02.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+#if canImport(SwiftUI)
+
+import SwiftUI
+import CoreStore
+
+@available(iOS 13.0.0, *)
+extension EnvironmentValues {
+    
+    var dataStack: DataStack {
+        return ColorsDemo.stack
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct SwiftUIView: View {
+    
+    @Environment(\.dataStack) var dataStack: DataStack
+    
+    var palettes = ColorsDemo.palettes
+    
+    var body: some View {
+        NavigationView {
+            List {
+                ForEach(palettes.objectsInAllSections(), id: \.self) { palette in
+                    NavigationLink(
+                        destination: DetailView(palette: palette)
+                    ) {
+                        HStack {
+                            Color(palette.color)
+                                .frame(width: 30, height: 30, alignment: .leading)
+                            Text(palette.colorText)
+                        }
+                    }
+                }.onDelete { indices in
+                    //                self.events.delete(at: indices, from: self.viewContext)
+                }
+            }
+            .navigationBarTitle(Text("Master"))
+            .navigationBarItems(
+                leading: EditButton(),
+                trailing: Button(
+                    action: {
+                        
+                        self.dataStack.perform(
+                            asynchronous: { transaction in
+
+                                let palette = transaction.create(Into<Palette>())
+                                palette.setInitialValues(in: transaction)
+                            },
+                            completion: { _ in }
+                        )
+                }
+                ) {
+                    Image(systemName: "plus")
+                }
+            )
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct DetailView: View {
+    @ObservedObject var palette: Palette
+
+    var body: some View {
+        HStack {
+            EmptyView()
+                .foregroundColor(.init(palette.color))
+            Text(palette.colorText)
+                .navigationBarTitle(Text("Detail"))
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct SwiftUIView_Previews: PreviewProvider {
+    static var previews: some View {
+        SwiftUIView()
+    }
+}
+
+#endif
diff --git a/Sources/Internals.DiffDelegate.swift b/Sources/Internals.DiffDelegate.swift
new file mode 100644
index 0000000..bb00ffd
--- /dev/null
+++ b/Sources/Internals.DiffDelegate.swift
@@ -0,0 +1,276 @@
+//
+//  Internals.FetchedResultsControllerDelegate.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - FetchedResultsControllerHandler
+
+@available(macOS 10.12, *)
+internal protocol FetchedResultsControllerHandler: AnyObject {
+    
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?)
+    
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType)
+    
+    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>)
+    
+    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>)
+    
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String?
+}
+
+
+// MARK: - Internal
+
+extension Internals {
+
+    // MARK: - FetchedResultsControllerDelegate
+
+    @available(macOS 10.12, *)
+    internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
+
+        // MARK: Internal
+
+        @nonobjc
+        internal var enabled = true
+
+        @nonobjc
+        internal let taskGroup = DispatchGroup()
+
+        @nonobjc
+        internal weak var handler: FetchedResultsControllerHandler?
+
+        @nonobjc
+        internal weak var fetchedResultsController: Internals.CoreStoreFetchedResultsController? {
+
+            didSet {
+
+                oldValue?.delegate = nil
+                self.fetchedResultsController?.delegate = self
+            }
+        }
+
+        deinit {
+
+            self.fetchedResultsController?.delegate = nil
+        }
+
+
+        // MARK: NSFetchedResultsControllerDelegate
+        
+        @available(iOS 13.0, *)
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot) {
+            
+        }
+
+        @objc
+        dynamic func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+
+            self.taskGroup.enter()
+            guard self.enabled else {
+
+                return
+            }
+
+            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {}
+            else {
+
+                self.deletedSections = []
+                self.insertedSections = []
+            }
+
+            self.handler?.controllerWillChangeContent(controller)
+        }
+
+        @objc
+        dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+
+            defer {
+
+                self.taskGroup.leave()
+            }
+            guard self.enabled else {
+
+                return
+            }
+
+            self.handler?.controllerDidChangeContent(controller)
+        }
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+
+            guard self.enabled else {
+
+                return
+            }
+
+            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {
+
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: indexPath,
+                    forChangeType: type,
+                    newIndexPath: newIndexPath
+                )
+                return
+            }
+
+            guard var actualType = NSFetchedResultsChangeType(rawValue: type.rawValue) else {
+
+                // This fix is for a bug where iOS passes 0 for NSFetchedResultsChangeType, but this is not a valid enum case.
+                // Swift will then always execute the first case of the switch causing strange behaviour.
+                // https://forums.developer.apple.com/thread/12184#31850
+                return
+            }
+
+            // This whole dance is a workaround for a nasty bug introduced in XCode 7 targeted at iOS 8 devices
+            // http://stackoverflow.com/questions/31383760/ios-9-attempt-to-delete-and-reload-the-same-index-path/31384014#31384014
+            // https://forums.developer.apple.com/message/9998#9998
+            // https://forums.developer.apple.com/message/31849#31849
+
+            if case .update = actualType,
+                indexPath != nil,
+                newIndexPath != nil {
+
+                actualType = .move
+            }
+
+            switch actualType {
+
+            case .update:
+                guard let section = indexPath?[0] else {
+
+                    return
+                }
+                if self.deletedSections.contains(section)
+                    || self.insertedSections.contains(section) {
+
+                    return
+                }
+
+            case .move:
+                guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
+
+                    return
+                }
+                guard indexPath == newIndexPath else {
+
+                    break
+                }
+                if self.insertedSections.contains(indexPath[0]) {
+
+                    // Observers that handle the .Move change are advised to delete then reinsert the object instead of just moving. This is especially true when indexPath and newIndexPath are equal. For example, calling tableView.moveRowAtIndexPath(_:toIndexPath) when both indexPaths are the same will crash the tableView.
+                    self.handler?.controller(
+                        controller,
+                        didChangeObject: anObject,
+                        atIndexPath: indexPath,
+                        forChangeType: .move,
+                        newIndexPath: newIndexPath
+                    )
+                    return
+                }
+                if self.deletedSections.contains(indexPath[0]) {
+
+                    self.handler?.controller(
+                        controller,
+                        didChangeObject: anObject,
+                        atIndexPath: nil,
+                        forChangeType: .insert,
+                        newIndexPath: indexPath
+                    )
+                    return
+                }
+                self.handler?.controller(
+                    controller,
+                    didChangeObject: anObject,
+                    atIndexPath: indexPath,
+                    forChangeType: .update,
+                    newIndexPath: nil
+                )
+                return
+
+            default:
+                break
+            }
+
+            self.handler?.controller(
+                controller,
+                didChangeObject: anObject,
+                atIndexPath: indexPath,
+                forChangeType: actualType,
+                newIndexPath: newIndexPath
+            )
+        }
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
+
+            guard self.enabled else {
+
+                return
+            }
+
+            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {}
+            else {
+
+                switch type {
+
+                case .delete:   self.deletedSections.insert(sectionIndex)
+                case .insert:   self.insertedSections.insert(sectionIndex)
+                default: break
+                }
+            }
+
+            self.handler?.controller(
+                controller,
+                didChangeSection: sectionInfo,
+                atIndex: sectionIndex,
+                forChangeType: type
+            )
+        }
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String) -> String? {
+
+            return self.handler?.controller(
+                controller,
+                sectionIndexTitleForSectionName: sectionName
+            )
+        }
+
+
+        // MARK: Private
+
+        @nonobjc
+        private var deletedSections = Set<Int>()
+
+        @nonobjc
+        private var insertedSections = Set<Int>()
+    }
+}
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
new file mode 100644
index 0000000..642143c
--- /dev/null
+++ b/Sources/LiveList.swift
@@ -0,0 +1,130 @@
+//
+//  LiveList.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(Combine)
+
+import Combine
+import CoreData
+
+
+// MARK: - LiveList
+
+@available(iOS 13.0, *)
+public class LiveList<D: DynamicObject>: Hashable, ObservableObject {
+    
+    // MARK: Public (Accessors)
+    
+    /**
+     The type for the objects contained bye the `ListMonitor`
+     */
+    public typealias ObjectType = D
+    
+    public var snapshot: Snapshot = []
+    
+    
+    // MARK: ObservableObject
+    
+    public var objectWillChange: ObservableObjectPublisher {
+        
+        return self.cs_toRaw().objectWillChange
+    }
+    
+    
+    // MARK: Private
+    
+    private let observer: Internals.FetchedResultsControllerDelegate
+    
+    
+    // MARK: - Snapshot
+    
+    public struct Snapshot: RandomAccessCollection {
+
+        // MARK: RandomAccessCollection
+        
+        public var startIndex: Index {
+            
+        }
+
+        public var endIndex: Index {
+        
+        }
+
+        public subscript(position: Index) -> ObjectType {
+        
+        }
+        
+        
+        // MARK: Sequence
+
+        public typealias Element = ObjectType
+
+        public typealias Index = Int
+
+//        public typealias SubSequence = Slice<Snapshot<ObjectType>>
+//
+//        /// A type that represents the indices that are valid for subscripting the
+//        /// collection, in ascending order.
+//        public typealias Indices = Range<Int>
+//
+//        /// A type that provides the collection's iteration interface and
+//        /// encapsulates its iteration state.
+//        ///
+//        /// By default, a collection conforms to the `Sequence` protocol by
+//        /// supplying `IndexingIterator` as its associated `Iterator`
+//        /// type.
+//        public typealias Iterator = IndexingIterator<FetchedResults<Result>>
+        
+        private let diffableSource: NSDiffable
+    }
+}
+
+extension ListMonitor: ObservableObject {
+
+    public var objectWillChange: ObservableObjectPublisher {
+        
+        return withUnsafePointer(to: &Static.objectWillChange) {
+            self.userInfo[
+                $0,
+                lazyInit: ObservableObjectPublisher.init
+            ] as! ObservableObjectPublisher
+        }
+    }
+}
+
+@available(iOS 13.0, *)
+extension CoreStoreObject: ObservableObject {
+    
+    public var objectWillChange: ObservableObjectPublisher {
+        
+        return self.cs_toRaw().objectWillChange
+    }
+}
+
+fileprivate enum Static {
+    
+    static var objectWillChange: Void?
+}
+
+#endif

From 953c9723a88c7aef696c782f064d59dd7c9ab1bd Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 4 Oct 2019 19:12:32 +0900
Subject: [PATCH 06/58] (WIP) SwiftUI working demo for LiveList<D>

---
 CoreStore.xcodeproj/project.pbxproj           |  50 +-
 .../ListObserverDemoViewController.swift      |  14 +-
 .../SwiftUIHostingController.swift            |  11 +-
 .../SwiftUI Demo/SwiftUIView.swift            |  42 +-
 CoreStoreTests/LiveListTests.swift            | 683 ++++++++++++++++++
 Sources/CoreStoreObject+DataSources.swift     |  29 +
 Sources/DataStack+DataSources.swift           | 171 +++++
 Sources/DataStack+Observing.swift             |  24 +-
 Sources/Internals.DiffDelegate.swift          | 276 -------
 ...edDiffableDataSourceSnapshotDelegate.swift |  94 +++
 Sources/ListMonitor.swift                     |   4 +-
 Sources/LiveList.swift                        | 371 +++++++++-
 12 files changed, 1422 insertions(+), 347 deletions(-)
 create mode 100644 CoreStoreTests/LiveListTests.swift
 create mode 100644 Sources/CoreStoreObject+DataSources.swift
 create mode 100644 Sources/DataStack+DataSources.swift
 delete mode 100644 Sources/Internals.DiffDelegate.swift
 create mode 100644 Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 075a457..31f6205 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -74,10 +74,10 @@
 		B501322B2346A9AE00FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
 		B501322D2346A9B000FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
 		B501322E2346A9B100FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
-		B50132302346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
-		B50132312346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
-		B50132322346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
-		B50132332346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */; };
+		B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
+		B50132312346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
+		B50132322346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
+		B50132332346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
 		B501FDDD1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
@@ -95,6 +95,10 @@
 		B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
+		B50EE14223473C92009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
+		B50EE14323473C96009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
+		B50EE14423473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
+		B50EE14523473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
 		B512607F1E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */; };
 		B51260801E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */; };
 		B51260811E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */; };
@@ -578,6 +582,13 @@
 		B5D7A5B81CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5B91CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5BA1CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
+		B5D8CA762346E7590055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
+		B5D8CA772346EAEE0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
+		B5D8CA782346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
+		B5D8CA792346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
+		B5D8CA7C2346EC5F0055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
+		B5D8CA7D2346EC610055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
+		B5D8CA7E2346EC610055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
 		B5DAFB482203D9F8003FCCD0 /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
 		B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
 		B5DBE2CD1C9914A900B5CEFA /* CSCoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */; };
@@ -784,13 +795,14 @@
 		82BA18E01C4BBE2C00A0916E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B500810F2290CDF800F4CEA5 /* bitrise.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = bitrise.yml; sourceTree = SOURCE_ROOT; };
 		B50132292344ECB500FC238B /* LiveList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveList.swift; sourceTree = "<group>"; };
-		B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffDelegate.swift; sourceTree = "<group>"; };
+		B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FetchedDiffableDataSourceSnapshotDelegate.swift; sourceTree = "<group>"; };
 		B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSectionBy.swift; sourceTree = "<group>"; };
 		B501FDE11CA8D1F500BE22EF /* CSListMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListMonitor.swift; sourceTree = "<group>"; };
 		B501FDE61CA8D20500BE22EF /* CSListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListObserver.swift; sourceTree = "<group>"; };
 		B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Transaction.swift"; sourceTree = "<group>"; };
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
 		B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableAttributeType.swift; sourceTree = "<group>"; };
+		B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+DataSources.swift"; sourceTree = "<group>"; };
 		B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Convenience.swift"; sourceTree = "<group>"; };
 		B51260881E9B252B00402229 /* NSEntityDescription+DynamicModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSEntityDescription+DynamicModel.swift"; sourceTree = "<group>"; };
 		B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.EntityIdentifier.swift; sourceTree = "<group>"; };
@@ -916,6 +928,8 @@
 		B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		B5D7A5B51CA3BF8F005C752B /* CSInto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInto.swift; sourceTree = "<group>"; };
+		B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DataStack+DataSources.swift"; sourceTree = "<group>"; };
+		B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveListTests.swift; sourceTree = "<group>"; };
 		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
 		B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Where.Expression.swift; sourceTree = "<group>"; };
 		B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathGenericBindings.swift; sourceTree = "<group>"; };
@@ -1128,6 +1142,7 @@
 				B5220E0B1D0D0D19009BC71E /* ImportTests.swift */,
 				B525576B1CFAF18F00E51965 /* IntoTests.swift */,
 				B5220E0F1D0DA6AB009BC71E /* ListObserverTests.swift */,
+				B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */,
 				B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */,
 				B5220E071D0C5F8D009BC71E /* ObjectObserverTests.swift */,
 				B52557771D02826E00E51965 /* OrderByTests.swift */,
@@ -1442,7 +1457,10 @@
 		B5E5FA4C22D15D3C00330931 /* DataSources */ = {
 			isa = PBXGroup;
 			children = (
+				B50132292344ECB500FC238B /* LiveList.swift */,
+				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */,
+				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -1546,7 +1564,6 @@
 				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
 				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
 				B5E84F1D1AFF84860064E85B /* ListMonitor.swift */,
-				B50132292344ECB500FC238B /* LiveList.swift */,
 				B5E84F1E1AFF84860064E85B /* ListObserver.swift */,
 			);
 			name = Observing;
@@ -1575,7 +1592,7 @@
 				B5474D142227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift */,
 				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
 				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
-				B501322F2346B76E00FC238B /* Internals.DiffDelegate.swift */,
+				B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */,
 				B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */,
 				B5E84F2B1AFF849C0064E85B /* Internals.NotificationObserver.swift */,
 				B5DE522A230BD7CC00A22534 /* Internals.swift */,
@@ -1954,9 +1971,10 @@
 				B53FBA121CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B751F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */,
+				B5D8CA762346E7590055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B5E5FA4E22D162F400330931 /* ObjectSnapshot.swift in Sources */,
 				B5E1B5A81CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
-				B50132302346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
+				B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
 				B5E1B59D1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
@@ -2002,6 +2020,7 @@
 				B5E84F0D1AFF847B0064E85B /* BaseDataTransaction+Querying.swift in Sources */,
 				B52F74451E9B8724005F3DAC /* XcodeDataModelSchema.swift in Sources */,
 				B5FAD6AC1B51285300714891 /* Internals.MigrationManager.swift in Sources */,
+				B50EE14223473C92009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
 				B5E84EF61AFF846E0064E85B /* DataStack+Transaction.swift in Sources */,
 				B5FEC18E1C9166E200532541 /* NSPersistentStore+Setup.swift in Sources */,
 				B596BBB61DD5BC67001DCDD9 /* FetchableSource.swift in Sources */,
@@ -2087,6 +2106,7 @@
 				B5220E101D0DA6AB009BC71E /* ListObserverTests.swift in Sources */,
 				B5519A401CA1B17B002BEF78 /* ErrorTests.swift in Sources */,
 				B525577C1D0291FE00E51965 /* GroupByTests.swift in Sources */,
+				B5D8CA7C2346EC5F0055D7D1 /* LiveListTests.swift in Sources */,
 				B52557741D02791400E51965 /* WhereTests.swift in Sources */,
 				B5DC47C61C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B525576C1CFAF18F00E51965 /* IntoTests.swift in Sources */,
@@ -2159,6 +2179,7 @@
 				B549F6741E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */,
+				B50EE14323473C96009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
 				B5E1B5951CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				18166887232B9ED60097C275 /* String+KeyPaths.swift in Sources */,
 				B5ECDC2B1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
@@ -2184,7 +2205,7 @@
 				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
 				82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */,
 				82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */,
-				B50132312346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
+				B50132312346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				82BA18D41C4BBD7100A0916E /* NSManagedObjectContext+Querying.swift in Sources */,
 				82BA18D51C4BBD7100A0916E /* NSManagedObjectContext+Setup.swift in Sources */,
 				B501FDE91CA8D20500BE22EF /* CSListObserver.swift in Sources */,
@@ -2195,6 +2216,7 @@
 				B5ECDC131CA816E500C7F112 /* CSTweak.swift in Sources */,
 				B56923C51EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
 				82BA18C91C4BBD5900A0916E /* MigrationType.swift in Sources */,
+				B5D8CA772346EAEE0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				82BA18D01C4BBD7100A0916E /* Internals.MigrationManager.swift in Sources */,
 				B5DE5231230BDA1300A22534 /* Shared.swift in Sources */,
 				B52F74461E9B8724005F3DAC /* XcodeDataModelSchema.swift in Sources */,
@@ -2287,6 +2309,7 @@
 				B5220E111D0DA6AB009BC71E /* ListObserverTests.swift in Sources */,
 				B5519A411CA1B17B002BEF78 /* ErrorTests.swift in Sources */,
 				B525577D1D0291FE00E51965 /* GroupByTests.swift in Sources */,
+				B5D8CA7D2346EC610055D7D1 /* LiveListTests.swift in Sources */,
 				B52557751D02791400E51965 /* WhereTests.swift in Sources */,
 				B5DC47C71C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B5DBE2E01C9939E100B5CEFA /* BridgingTests.m in Sources */,
@@ -2359,6 +2382,7 @@
 				B549F6761E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5220E1F1D130810009BC71E /* CSListObserver.swift in Sources */,
+				B50EE14523473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
 				B52DD1941BE1F92500949AFE /* CoreStore.swift in Sources */,
 				18166889232B9ED80097C275 /* String+KeyPaths.swift in Sources */,
 				B52DD1A61BE1F92F00949AFE /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2384,7 +2408,7 @@
 				B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */,
 				B52DD1C31BE1F94600949AFE /* Internals.NotificationObserver.swift in Sources */,
 				B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */,
-				B50132332346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
+				B50132332346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5220E221D130818009BC71E /* CSSectionBy.swift in Sources */,
 				B52DD1BC1BE1F94000949AFE /* MigrationResult.swift in Sources */,
 				B52DD19D1BE1F92C00949AFE /* BaseDataTransaction.swift in Sources */,
@@ -2395,6 +2419,7 @@
 				B5A1DACB1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B52DD1B81BE1F94000949AFE /* DataStack+Migration.swift in Sources */,
 				B5ECDC091CA8138100C7F112 /* CSOrderBy.swift in Sources */,
+				B5D8CA792346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B56923C71EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
 				B5DE5233230BDA1300A22534 /* Shared.swift in Sources */,
 				B52DD1A51BE1F92F00949AFE /* ImportableUniqueObject.swift in Sources */,
@@ -2487,6 +2512,7 @@
 				B5220E271D1308D1009BC71E /* ObjectObserverTests.swift in Sources */,
 				B525577E1D0291FE00E51965 /* GroupByTests.swift in Sources */,
 				B52557761D02791400E51965 /* WhereTests.swift in Sources */,
+				B5D8CA7E2346EC610055D7D1 /* LiveListTests.swift in Sources */,
 				B5DC47C81C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B5DBE2E11C9939E100B5CEFA /* BridgingTests.m in Sources */,
 				B5220E0E1D0D0D19009BC71E /* ImportTests.swift in Sources */,
@@ -2559,6 +2585,7 @@
 				B549F6751E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5E1B5961CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
+				B50EE14423473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
 				B5ECDC2C1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				18166888232B9ED70097C275 /* String+KeyPaths.swift in Sources */,
 				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2584,7 +2611,7 @@
 				B56321971BD65216006C9394 /* Select.swift in Sources */,
 				B56321AB1BD6521C006C9394 /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B563219C1BD65216006C9394 /* SectionBy.swift in Sources */,
-				B50132322346B76E00FC238B /* Internals.DiffDelegate.swift in Sources */,
+				B50132322346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B56321B21BD6521C006C9394 /* NSManagedObjectContext+Querying.swift in Sources */,
 				B5FE4DA41C8481E100FA6A91 /* StorageInterface.swift in Sources */,
 				B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */,
@@ -2595,6 +2622,7 @@
 				B5A1DACA1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B56321AE1BD6521C006C9394 /* Internals.NotificationObserver.swift in Sources */,
 				B56321931BD65216006C9394 /* DataStack+Querying.swift in Sources */,
+				B5D8CA782346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B56923C61EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
 				B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */,
 				B5DE5232230BDA1300A22534 /* Shared.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 265d4f5..e41661e 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -52,7 +52,7 @@ struct ColorsDemo {
     
     static let stack: DataStack = {
      
-        return DataStack(
+        let dataStack = DataStack(
             CoreStoreSchema(
                 modelVersion: "ColorsDemo",
                 entities: [
@@ -63,16 +63,18 @@ struct ColorsDemo {
                 ]
             )
         )
-    }()
-    
-    static let palettes: ListMonitor<Palette> = {
-        
-        try! ColorsDemo.stack.addStorageAndWait(
+
+        try! dataStack.addStorageAndWait(
             SQLiteStore(
                 fileName: "ColorsDemo.sqlite",
                 localStorageOptions: .recreateStoreOnModelMismatch
             )
         )
+        return dataStack
+    }()
+    
+    static let palettes: ListMonitor<Palette> = {
+
         return ColorsDemo.stack.monitorSectionedList(
             From<Palette>()
                 .sectionBy(\.colorName)
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift
index f9c5df2..57a83e5 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift	
@@ -10,12 +10,21 @@
 
 import SwiftUI
 import UIKit
+import CoreStore
 
 @available(iOS 13.0.0, *)
 class SwiftUIHostingController: UIHostingController<SwiftUIView> {
 
     @objc required dynamic init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder, rootView: SwiftUIView())
+        super.init(
+            coder: aDecoder,
+            rootView: SwiftUIView(
+                palettes: DataStackEnvironment.defaultValue.liveList(
+                    From<Palette>()
+                        .orderBy(.ascending(\.hue))
+                )
+            )
+        )
     }
 }
 
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 1f0d52e..68178ff 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -11,11 +11,23 @@
 import SwiftUI
 import CoreStore
 
+@available(iOS 13.0, *)
+struct DataStackEnvironment: EnvironmentKey {
+
+    static let defaultValue = ColorsDemo.stack
+}
+
+
 @available(iOS 13.0.0, *)
 extension EnvironmentValues {
-    
+
     var dataStack: DataStack {
-        return ColorsDemo.stack
+        get {
+            return self[DataStackEnvironment.self]
+        }
+        set {
+            self[DataStackEnvironment.self] = newValue
+        }
     }
 }
 
@@ -23,13 +35,13 @@ extension EnvironmentValues {
 struct SwiftUIView: View {
     
     @Environment(\.dataStack) var dataStack: DataStack
-    
-    var palettes = ColorsDemo.palettes
-    
+
+    @ObservedObject var palettes: LiveList<Palette>
+
     var body: some View {
         NavigationView {
             List {
-                ForEach(palettes.objectsInAllSections(), id: \.self) { palette in
+                ForEach(palettes.snapshot, id: \.self) { palette in
                     NavigationLink(
                         destination: DetailView(palette: palette)
                     ) {
@@ -40,7 +52,14 @@ struct SwiftUIView: View {
                         }
                     }
                 }.onDelete { indices in
-                    //                self.events.delete(at: indices, from: self.viewContext)
+                    let palettes = self.palettes.snapshot[indices]
+                    self.dataStack.perform(
+                        asynchronous: { transaction in
+
+                            palettes.forEach(transaction.delete(_:))
+                        },
+                        completion: { _ in }
+                    )
                 }
             }
             .navigationBarTitle(Text("Master"))
@@ -48,7 +67,7 @@ struct SwiftUIView: View {
                 leading: EditButton(),
                 trailing: Button(
                     action: {
-                        
+
                         self.dataStack.perform(
                             asynchronous: { transaction in
 
@@ -83,7 +102,12 @@ struct DetailView: View {
 @available(iOS 13.0.0, *)
 struct SwiftUIView_Previews: PreviewProvider {
     static var previews: some View {
-        SwiftUIView()
+        SwiftUIView(
+            palettes: DataStackEnvironment.defaultValue.liveList(
+                From<Palette>()
+                    .orderBy(.ascending(\.hue))
+            )
+        )
     }
 }
 
diff --git a/CoreStoreTests/LiveListTests.swift b/CoreStoreTests/LiveListTests.swift
new file mode 100644
index 0000000..e9ad339
--- /dev/null
+++ b/CoreStoreTests/LiveListTests.swift
@@ -0,0 +1,683 @@
+//
+//  LiveListTests.swift
+//  CoreStore iOS
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - LiveListTests
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+class LiveListTests: BaseTestDataTestCase {
+
+    @objc
+    dynamic func test_ThatLiveLists_CanReceiveInsertNotifications() {
+
+        self.prepareStack { (stack) in
+
+//            let observer = TestListObserver()
+            let liveList = stack.liveList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+//            monitor.addObserver(observer)
+//
+//            XCTAssertFalse(monitor.hasSections())
+//            XCTAssertFalse(monitor.hasObjects())
+//            XCTAssertTrue(monitor.objectsInAllSections().isEmpty)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didInsertSectionExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 1)
+//                    XCTAssertEqual(
+//                        ((note.userInfo as NSDictionary?) ?? [:]),
+//                        [
+//                            "sectionInfo": monitor.sectionInfo(at: 0),
+//                            "sectionIndex": 0
+//                        ] as NSDictionary
+//                    )
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1
+//                }
+//            )
+//            let didInsertObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+//                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//                    XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
+//                    XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "1"))
+//                    XCTAssertEqual(object?.testString, "nil:TestEntity1:1")
+//                    XCTAssertEqual(object?.testData, ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                    XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!)
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 2
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    let object = transaction.create(Into<TestEntity1>())
+                    object.testBoolean = NSNumber(value: true)
+                    object.testNumber = NSNumber(value: 1)
+                    object.testDecimal = NSDecimalNumber(string: "1")
+                    object.testString = "nil:TestEntity1:1"
+                    object.testData = ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                    object.testDate = self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!
+
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(liveList, {})
+        }
+    }
+
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveUpdateNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            XCTAssertTrue(monitor.hasSections())
+//            XCTAssertEqual(monitor.numberOfSections(), 2)
+//            XCTAssertTrue(monitor.hasObjects())
+//            XCTAssertTrue(monitor.hasObjects(in: 0))
+//            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
+//            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//
+//            let didUpdateObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssert(events == 1 || events == 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//                    let object = userInfo?["object"] as? TestEntity1
+//
+//                    switch object?.testEntityID {
+//
+//                    case NSNumber(value: 101)?:
+//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 1)
+//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
+//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
+//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
+//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
+//
+//                    case NSNumber(value: 102)?:
+//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
+//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
+//
+//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
+//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
+//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
+//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
+//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
+//
+//                    default:
+//                        XCTFail()
+//                    }
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1 || events == 2
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 3)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
+//
+//                        object.testNumber = NSNumber(value: 11)
+//                        object.testDecimal = NSDecimalNumber(string: "11")
+//                        object.testString = "nil:TestEntity1:11"
+//                        object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
+//                        object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+//
+//                        object.testNumber = NSNumber(value: 22)
+//                        object.testDecimal = NSDecimalNumber(string: "22")
+//                        object.testString = "nil:TestEntity1:22"
+//                        object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
+//                        object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveMoveNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didMoveObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 1)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["fromIndexPath", "toIndexPath", "object"]
+//                    )
+//
+//                    let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
+//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 0), 0)
+//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 1), 0)
+//
+//                    let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
+//                    XCTAssertEqual(toIndexPath?.index(atPosition: 0), 1)
+//                    XCTAssertEqual(toIndexPath?.index(atPosition: 1), 1)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
+//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 2)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 2
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    if let object = try transaction.fetchOne(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+//
+//                        object.testBoolean = NSNumber(value: true)
+//                    }
+//                    else {
+//
+//                        XCTFail()
+//                    }
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//
+//    @objc
+//    dynamic func test_ThatListObservers_CanReceiveDeleteNotifications() {
+//
+//        self.prepareStack { (stack) in
+//
+//            self.prepareTestDataForStack(stack)
+//
+//            let observer = TestListObserver()
+//            let monitor = stack.monitorSectionedList(
+//                From<TestEntity1>(),
+//                SectionBy(#keyPath(TestEntity1.testBoolean)),
+//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+//            )
+//            monitor.addObserver(observer)
+//
+//            var events = 0
+//
+//            let willChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 0)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 0
+//                }
+//            )
+//            let didUpdateObjectExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssert(events == 1 || events == 2)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["indexPath", "object"]
+//                    )
+//
+//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
+//
+//                    XCTAssertEqual(indexPath?.section, 0)
+//                    XCTAssert(indexPath?.index(atPosition: 1) == 0 || indexPath?.index(atPosition: 1) == 1)
+//
+//                    let object = userInfo?["object"] as? TestEntity1
+//                    XCTAssertEqual(object?.isDeleted, true)
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 1 || events == 2
+//                }
+//            )
+//            let didDeleteSectionExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 3)
+//
+//                    let userInfo = note.userInfo
+//                    XCTAssertNotNil(userInfo)
+//                    XCTAssertEqual(
+//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
+//                        ["sectionInfo", "sectionIndex"]
+//                    )
+//
+//                    let sectionInfo = userInfo?["sectionInfo"] as? NSFetchedResultsSectionInfo
+//                    XCTAssertNotNil(sectionInfo)
+//                    XCTAssertEqual(sectionInfo?.name, "0")
+//
+//                    let sectionIndex = userInfo?["sectionIndex"]
+//                    XCTAssertEqual(sectionIndex as? NSNumber, NSNumber(value: 0))
+//
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 3
+//                }
+//            )
+//            let didChangeExpectation = self.expectation(
+//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
+//                object: observer,
+//                handler: { (note) -> Bool in
+//
+//                    XCTAssertEqual(events, 4)
+//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
+//                    defer {
+//
+//                        events += 1
+//                    }
+//                    return events == 4
+//                }
+//            )
+//            let saveExpectation = self.expectation(description: "save")
+//            stack.perform(
+//                asynchronous: { (transaction) -> Bool in
+//
+//                    let count = try transaction.deleteAll(
+//                        From<TestEntity1>(),
+//                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
+//                    )
+//                    XCTAssertEqual(count, 2)
+//                    return transaction.hasChanges
+//                },
+//                success: { (hasChanges) in
+//
+//                    XCTAssertTrue(hasChanges)
+//                    saveExpectation.fulfill()
+//                },
+//                failure: { _ in
+//
+//                    XCTFail()
+//                }
+//            )
+//            self.waitAndCheckExpectations()
+//        }
+//    }
+//}
+//
+//
+//// MARK: TestListObserver
+//
+//@available(macOS 10.12, *)
+//class TestListObserver: ListSectionObserver {
+//
+//    // MARK: ListObserver
+//
+//    typealias ListEntityType = TestEntity1
+//
+//    func listMonitorWillChange(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorWillChange:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorDidChange(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorDidChange:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorWillRefetch(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorWillRefetch:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//    func listMonitorDidRefetch(_ monitor: ListMonitor<TestEntity1>) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitorDidRefetch:"),
+//            object: self,
+//            userInfo: [:]
+//        )
+//    }
+//
+//
+//    // MARK: ListObjectObserver
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertObject object: TestEntity1, toIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteObject object: TestEntity1, fromIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didUpdateObject object: TestEntity1, atIndexPath indexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "indexPath": indexPath
+//            ]
+//        )
+//    }
+//
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didMoveObject object: TestEntity1, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
+//            object: self,
+//            userInfo: [
+//                "object": object,
+//                "fromIndexPath": fromIndexPath,
+//                "toIndexPath": toIndexPath
+//            ]
+//        )
+//    }
+//
+//
+//    // MARK: ListSectionObserver
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
+//            object: self,
+//            userInfo: [
+//                "sectionInfo": sectionInfo,
+//                "sectionIndex": sectionIndex
+//            ]
+//        )
+//    }
+//
+//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+//
+//        NotificationCenter.default.post(
+//            name: Notification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
+//            object: self,
+//            userInfo: [
+//                "sectionInfo": sectionInfo,
+//                "sectionIndex": sectionIndex
+//            ]
+//        )
+//    }
+}
+
+#endif
+
diff --git a/Sources/CoreStoreObject+DataSources.swift b/Sources/CoreStoreObject+DataSources.swift
new file mode 100644
index 0000000..4080be2
--- /dev/null
+++ b/Sources/CoreStoreObject+DataSources.swift
@@ -0,0 +1,29 @@
+//
+//  CoreStoreObject+DataSources.swift
+//  CoreStore iOS
+//
+//  Created by John Estropia on 2019/10/04.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+#if canImport(Combine)
+import Combine
+
+// MARK: - LiveList: ObservableObject
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension CoreStoreObject: ObservableObject {
+
+    // MARK: ObservableObject
+
+    public var objectWillChange: ObservableObjectPublisher {
+
+        return self.cs_toRaw().objectWillChange
+    }
+}
+
+#endif
+
+#endif
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
new file mode 100644
index 0000000..3b0c24d
--- /dev/null
+++ b/Sources/DataStack+DataSources.swift
@@ -0,0 +1,171 @@
+//
+//  DataStack+DataSources.swift
+//  CoreStore iOS
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import Foundation
+import CoreData
+
+
+// MARK: - DataStack
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension DataStack {
+
+    public func liveList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
+
+        return self.liveList(from, fetchClauses)
+    }
+
+    public func liveList<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> LiveList<D> {
+
+        return LiveList(
+            dataStack: self,
+            from: from,
+            sectionBy: nil,
+            applyFetchClauses: { fetchRequest in
+
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+
+                Internals.assert(
+                    fetchRequest.sortDescriptors?.isEmpty == false,
+                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                )
+            }
+        )
+    }
+
+    public func liveList<B: FetchChainableBuilderType>(_ clauseChain: B) -> LiveList<B.ObjectType> {
+
+        return self.liveList(
+            clauseChain.from,
+            clauseChain.fetchClauses
+        )
+    }
+
+    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
+
+        self.liveList(
+            createAsynchronously: createAsynchronously,
+            from, fetchClauses
+        )
+    }
+
+    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
+
+        _ = LiveList(
+            dataStack: self,
+            from: from,
+            sectionBy: nil,
+            applyFetchClauses: { fetchRequest in
+
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+
+                Internals.assert(
+                    fetchRequest.sortDescriptors?.isEmpty == false,
+                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                )
+            },
+            createAsynchronously: createAsynchronously
+        )
+    }
+
+    public func liveList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
+
+        return self.liveList(
+            from,
+            sectionBy,
+            fetchClauses
+        )
+    }
+
+    public func liveList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> LiveList<D> {
+
+        return LiveList(
+            dataStack: self,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: { fetchRequest in
+
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+
+                Internals.assert(
+                    fetchRequest.sortDescriptors?.isEmpty == false,
+                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                )
+            }
+        )
+    }
+
+    public func liveList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> LiveList<B.ObjectType> {
+
+        return self.liveList(
+            clauseChain.from,
+            clauseChain.sectionBy,
+            clauseChain.fetchClauses
+        )
+    }
+
+    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
+
+        self.liveList(
+            createAsynchronously: createAsynchronously,
+            from,
+            sectionBy,
+            fetchClauses
+        )
+    }
+
+    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
+
+        _ = LiveList(
+            dataStack: self,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: { fetchRequest in
+
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+
+                Internals.assert(
+                    fetchRequest.sortDescriptors?.isEmpty == false,
+                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                )
+            },
+            createAsynchronously: createAsynchronously
+        )
+    }
+
+    public func liveList<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (LiveList<B.ObjectType>) -> Void, _ clauseChain: B) {
+
+        self.liveList(
+            createAsynchronously: createAsynchronously,
+            clauseChain.from,
+            clauseChain.sectionBy,
+            clauseChain.fetchClauses
+        )
+    }
+}
+
+#endif
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index 38f32b0..b298285 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -102,7 +102,10 @@ extension DataStack {
      */
     public func monitorList<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListMonitor<B.ObjectType> {
         
-        return self.monitorList(clauseChain.from, clauseChain.fetchClauses)
+        return self.monitorList(
+            clauseChain.from,
+            clauseChain.fetchClauses
+        )
     }
     
     /**
@@ -114,7 +117,11 @@ extension DataStack {
      */
     public func monitorList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
         
-        self.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+        self.monitorList(
+            createAsynchronously: createAsynchronously,
+            from,
+            fetchClauses
+        )
     }
     
     /**
@@ -182,7 +189,11 @@ extension DataStack {
      */
     public func monitorSectionedList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
         
-        return self.monitorSectionedList(from, sectionBy, fetchClauses)
+        return self.monitorSectionedList(
+            from,
+            sectionBy,
+            fetchClauses
+        )
     }
     
     /**
@@ -248,7 +259,12 @@ extension DataStack {
      */
     public func monitorSectionedList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
         
-        self.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+        self.monitorSectionedList(
+            createAsynchronously: createAsynchronously,
+            from,
+            sectionBy,
+            fetchClauses
+        )
     }
     
     /**
diff --git a/Sources/Internals.DiffDelegate.swift b/Sources/Internals.DiffDelegate.swift
deleted file mode 100644
index bb00ffd..0000000
--- a/Sources/Internals.DiffDelegate.swift
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-//  Internals.FetchedResultsControllerDelegate.swift
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-import CoreData
-
-
-// MARK: - FetchedResultsControllerHandler
-
-@available(macOS 10.12, *)
-internal protocol FetchedResultsControllerHandler: AnyObject {
-    
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeObject anObject: Any, atIndexPath indexPath: IndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: IndexPath?)
-    
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType)
-    
-    func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>)
-    
-    func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>)
-    
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String?
-}
-
-
-// MARK: - Internal
-
-extension Internals {
-
-    // MARK: - FetchedResultsControllerDelegate
-
-    @available(macOS 10.12, *)
-    internal final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
-
-        // MARK: Internal
-
-        @nonobjc
-        internal var enabled = true
-
-        @nonobjc
-        internal let taskGroup = DispatchGroup()
-
-        @nonobjc
-        internal weak var handler: FetchedResultsControllerHandler?
-
-        @nonobjc
-        internal weak var fetchedResultsController: Internals.CoreStoreFetchedResultsController? {
-
-            didSet {
-
-                oldValue?.delegate = nil
-                self.fetchedResultsController?.delegate = self
-            }
-        }
-
-        deinit {
-
-            self.fetchedResultsController?.delegate = nil
-        }
-
-
-        // MARK: NSFetchedResultsControllerDelegate
-        
-        @available(iOS 13.0, *)
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot) {
-            
-        }
-
-        @objc
-        dynamic func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
-
-            self.taskGroup.enter()
-            guard self.enabled else {
-
-                return
-            }
-
-            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {}
-            else {
-
-                self.deletedSections = []
-                self.insertedSections = []
-            }
-
-            self.handler?.controllerWillChangeContent(controller)
-        }
-
-        @objc
-        dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
-
-            defer {
-
-                self.taskGroup.leave()
-            }
-            guard self.enabled else {
-
-                return
-            }
-
-            self.handler?.controllerDidChangeContent(controller)
-        }
-
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
-
-            guard self.enabled else {
-
-                return
-            }
-
-            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {
-
-                self.handler?.controller(
-                    controller,
-                    didChangeObject: anObject,
-                    atIndexPath: indexPath,
-                    forChangeType: type,
-                    newIndexPath: newIndexPath
-                )
-                return
-            }
-
-            guard var actualType = NSFetchedResultsChangeType(rawValue: type.rawValue) else {
-
-                // This fix is for a bug where iOS passes 0 for NSFetchedResultsChangeType, but this is not a valid enum case.
-                // Swift will then always execute the first case of the switch causing strange behaviour.
-                // https://forums.developer.apple.com/thread/12184#31850
-                return
-            }
-
-            // This whole dance is a workaround for a nasty bug introduced in XCode 7 targeted at iOS 8 devices
-            // http://stackoverflow.com/questions/31383760/ios-9-attempt-to-delete-and-reload-the-same-index-path/31384014#31384014
-            // https://forums.developer.apple.com/message/9998#9998
-            // https://forums.developer.apple.com/message/31849#31849
-
-            if case .update = actualType,
-                indexPath != nil,
-                newIndexPath != nil {
-
-                actualType = .move
-            }
-
-            switch actualType {
-
-            case .update:
-                guard let section = indexPath?[0] else {
-
-                    return
-                }
-                if self.deletedSections.contains(section)
-                    || self.insertedSections.contains(section) {
-
-                    return
-                }
-
-            case .move:
-                guard let indexPath = indexPath, let newIndexPath = newIndexPath else {
-
-                    return
-                }
-                guard indexPath == newIndexPath else {
-
-                    break
-                }
-                if self.insertedSections.contains(indexPath[0]) {
-
-                    // Observers that handle the .Move change are advised to delete then reinsert the object instead of just moving. This is especially true when indexPath and newIndexPath are equal. For example, calling tableView.moveRowAtIndexPath(_:toIndexPath) when both indexPaths are the same will crash the tableView.
-                    self.handler?.controller(
-                        controller,
-                        didChangeObject: anObject,
-                        atIndexPath: indexPath,
-                        forChangeType: .move,
-                        newIndexPath: newIndexPath
-                    )
-                    return
-                }
-                if self.deletedSections.contains(indexPath[0]) {
-
-                    self.handler?.controller(
-                        controller,
-                        didChangeObject: anObject,
-                        atIndexPath: nil,
-                        forChangeType: .insert,
-                        newIndexPath: indexPath
-                    )
-                    return
-                }
-                self.handler?.controller(
-                    controller,
-                    didChangeObject: anObject,
-                    atIndexPath: indexPath,
-                    forChangeType: .update,
-                    newIndexPath: nil
-                )
-                return
-
-            default:
-                break
-            }
-
-            self.handler?.controller(
-                controller,
-                didChangeObject: anObject,
-                atIndexPath: indexPath,
-                forChangeType: actualType,
-                newIndexPath: newIndexPath
-            )
-        }
-
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
-
-            guard self.enabled else {
-
-                return
-            }
-
-            if #available(iOS 10.3, tvOS 10.3, watchOS 3.2, macOS 10.13, *) {}
-            else {
-
-                switch type {
-
-                case .delete:   self.deletedSections.insert(sectionIndex)
-                case .insert:   self.insertedSections.insert(sectionIndex)
-                default: break
-                }
-            }
-
-            self.handler?.controller(
-                controller,
-                didChangeSection: sectionInfo,
-                atIndex: sectionIndex,
-                forChangeType: type
-            )
-        }
-
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String) -> String? {
-
-            return self.handler?.controller(
-                controller,
-                sectionIndexTitleForSectionName: sectionName
-            )
-        }
-
-
-        // MARK: Private
-
-        @nonobjc
-        private var deletedSections = Set<Int>()
-
-        @nonobjc
-        private var insertedSections = Set<Int>()
-    }
-}
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
new file mode 100644
index 0000000..4489085
--- /dev/null
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -0,0 +1,94 @@
+//
+//  Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import Foundation
+import CoreData
+
+#if canImport(UIKit)
+
+import UIKit
+
+#elseif canImport(AppKit)
+
+import AppKit
+
+#endif
+
+
+// MARK: - FetchedDiffableDataSourceSnapshot
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject {
+
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: NSDiffableDataSourceSnapshotReference)
+}
+
+
+// MARK: - Internal
+
+extension Internals {
+
+    // MARK: - FetchedDiffableDataSourceSnapshotDelegate
+
+    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+    internal final class FetchedDiffableDataSourceSnapshotDelegate: NSObject, NSFetchedResultsControllerDelegate {
+
+        // MARK: Internal
+
+        @nonobjc
+        internal weak var handler: FetchedDiffableDataSourceSnapshotHandler?
+
+        @nonobjc
+        internal weak var fetchedResultsController: Internals.CoreStoreFetchedResultsController? {
+
+            didSet {
+
+                oldValue?.delegate = nil
+                self.fetchedResultsController?.delegate = self
+            }
+        }
+
+        deinit {
+
+            self.fetchedResultsController?.delegate = nil
+        }
+
+
+        // MARK: NSFetchedResultsControllerDelegate
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+
+            self.handler?.controller(
+                controller,
+                didChangContentWith: snapshot
+            )
+        }
+    }
+}
+
+#endif
diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift
index fb8a382..0f3645c 100644
--- a/Sources/ListMonitor.swift
+++ b/Sources/ListMonitor.swift
@@ -948,7 +948,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
                 return
             }
             
-            let (newFetchedResultsController, newFetchedResultsControllerDelegate) = ListMonitor.recreateFetchedResultsController(
+            let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
                 context: self.fetchedResultsController.managedObjectContext,
                 from: self.from,
                 sectionBy: self.sectionBy,
@@ -1083,7 +1083,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         self.isSectioned = (sectionBy != nil)
         self.from = from
         self.sectionBy = sectionBy
-        (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = ListMonitor.recreateFetchedResultsController(
+        (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
             context: context,
             from: from,
             sectionBy: sectionBy,
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 642143c..05818dd 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -23,16 +23,28 @@
 //  SOFTWARE.
 //
 
-#if canImport(Combine)
+#if canImport(UIKit) || canImport(AppKit)
 
-import Combine
 import CoreData
 
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
+
+#if canImport(SwiftUI)
+import SwiftUI
+
+#endif
+
 
 // MARK: - LiveList
 
-@available(iOS 13.0, *)
-public class LiveList<D: DynamicObject>: Hashable, ObservableObject {
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+public final class LiveList<D: DynamicObject>: Hashable {
     
     // MARK: Public (Accessors)
     
@@ -41,38 +53,272 @@ public class LiveList<D: DynamicObject>: Hashable, ObservableObject {
      */
     public typealias ObjectType = D
     
-    public var snapshot: Snapshot = []
-    
-    
-    // MARK: ObservableObject
-    
-    public var objectWillChange: ObservableObjectPublisher {
-        
-        return self.cs_toRaw().objectWillChange
+    public fileprivate(set) var snapshot: Snapshot = .empty {
+
+        didSet {
+
+
+            #if canImport(Combine)
+
+            let newValue = self.snapshot
+            guard newValue != oldValue else {
+
+                return
+            }
+
+            #if canImport(SwiftUI)
+            withAnimation {
+
+                self.objectWillChange.send()
+            }
+
+            #else
+            self.objectWillChange.send()
+
+            #endif
+
+            #endif
+        }
     }
+
+
+    // MARK: Equatable
+
+    public static func == (_ lhs: LiveList<D>, _ rhs: LiveList<D>) -> Bool {
+
+        return lhs === rhs
+    }
+
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+
+        hasher.combine(ObjectIdentifier(self))
+    }
+
+
+    // MARK: Internal
+
+    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+
+        self.init(
+            context: dataStack.mainContext,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses,
+            createAsynchronously: nil
+        )
+    }
+
+    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (LiveList<ObjectType>) -> Void) {
+
+        self.init(
+            context: dataStack.mainContext,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+
+        self.init(
+            context: unsafeTransaction.context,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses,
+            createAsynchronously: nil
+        )
+    }
+
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (LiveList<ObjectType>) -> Void) {
+
+        self.init(
+            context: unsafeTransaction.context,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+
+
+    // MARK: FilePrivate
+
+    fileprivate let rawObjectWillChange: Any?
     
     
     // MARK: Private
-    
-    private let observer: Internals.FetchedResultsControllerDelegate
+
+    private var fetchedResultsController: Internals.CoreStoreFetchedResultsController
+    private var fetchedResultsControllerDelegate: Internals.FetchedDiffableDataSourceSnapshotDelegate
+    private var applyFetchClauses: (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void
+    private var observerForWillChangePersistentStore: Internals.NotificationObserver!
+    private var observerForDidChangePersistentStore: Internals.NotificationObserver!
+
+    private let from: From<ObjectType>
+    private let sectionBy: SectionBy<ObjectType>?
+
+    private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedDiffableDataSourceSnapshotDelegate) {
+
+        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
+        fetchRequest.fetchLimit = 0
+        fetchRequest.resultType = .managedObjectResultType
+        fetchRequest.includesPendingChanges = false
+        fetchRequest.shouldRefreshRefetchedObjects = true
+
+        let fetchedResultsController = Internals.CoreStoreFetchedResultsController(
+            context: context,
+            fetchRequest: fetchRequest,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses
+        )
+
+        let fetchedResultsControllerDelegate = Internals.FetchedDiffableDataSourceSnapshotDelegate()
+        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
+
+        return (fetchedResultsController, fetchedResultsControllerDelegate)
+    }
+
+    private init(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((LiveList<ObjectType>) -> Void)?) {
+
+        self.from = from
+        self.sectionBy = sectionBy
+        (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
+            context: context,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses
+        )
+
+        #if canImport(Combine)
+        self.rawObjectWillChange = ObservableObjectPublisher()
+
+        #else
+        self.rawObjectWillChange = nil
+
+        #endif
+
+
+//        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
+//
+//            self.sectionIndexTransformer = sectionIndexTransformer
+//        }
+//        else {
+//
+//            self.sectionIndexTransformer = { $0 }
+//        }
+        self.applyFetchClauses = applyFetchClauses
+        self.fetchedResultsControllerDelegate.handler = self
+
+        guard let coordinator = context.parentStack?.coordinator else {
+
+            return
+        }
+
+        self.observerForWillChangePersistentStore = Internals.NotificationObserver(
+            notificationName: NSNotification.Name.NSPersistentStoreCoordinatorStoresWillChange,
+            object: coordinator,
+            queue: OperationQueue.main,
+            closure: { [weak self] (note) -> Void in
+
+                guard let `self` = self else {
+
+                    return
+                }
+
+//                self.isPersistentStoreChanging = true
+//
+//                guard let removedStores = (note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore]).flatMap(Set.init),
+//                    !Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? []).intersection(removedStores).isEmpty else {
+//
+//                        return
+//                }
+//                self.refetch(self.applyFetchClauses)
+            }
+        )
+
+        self.observerForDidChangePersistentStore = Internals.NotificationObserver(
+            notificationName: NSNotification.Name.NSPersistentStoreCoordinatorStoresDidChange,
+            object: coordinator,
+            queue: OperationQueue.main,
+            closure: { [weak self] (note) -> Void in
+
+                guard let `self` = self else {
+
+                    return
+                }
+
+//                if !self.isPendingRefetch {
+//
+//                    let previousStores = Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? [])
+//                    let currentStores = previousStores
+//                        .subtracting(note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore] ?? [])
+//                        .union(note.userInfo?[NSAddedPersistentStoresKey] as? [NSPersistentStore] ?? [])
+//
+//                    if previousStores != currentStores {
+//
+//                        self.refetch(self.applyFetchClauses)
+//                    }
+//                }
+//
+//                self.isPersistentStoreChanging = false
+            }
+        )
+
+        if let createAsynchronously = createAsynchronously {
+
+//            transactionQueue.async {
+//
+//                try! self.fetchedResultsController.performFetchFromSpecifiedStores()
+//                self.taskGroup.notify(queue: .main) {
+//
+//                    createAsynchronously(self)
+//                }
+//            }
+        }
+        else {
+
+            try! self.fetchedResultsController.performFetchFromSpecifiedStores()
+        }
+    }
     
     
     // MARK: - Snapshot
     
-    public struct Snapshot: RandomAccessCollection {
+    public struct Snapshot: RandomAccessCollection, Hashable {
+
+        public subscript(indices: IndexSet) -> [ObjectType] {
+
+            let context = self.context!
+            let objectIDs = self.snapshotStruct.itemIdentifiers
+            return indices.map { position in
+
+                let objectID = objectIDs[position]
+                return context.fetchExisting(objectID)!
+            }
+        }
 
         // MARK: RandomAccessCollection
         
         public var startIndex: Index {
-            
+
+            return 0
         }
 
         public var endIndex: Index {
-        
+
+            return self.snapshotStruct.numberOfItems
         }
 
         public subscript(position: Index) -> ObjectType {
-        
+
+            let context = self.context!
+            let objectID = self.snapshotStruct.itemIdentifiers[position]
+            return context.fetchExisting(objectID)!
         }
         
         
@@ -95,36 +341,85 @@ public class LiveList<D: DynamicObject>: Hashable, ObservableObject {
 //        /// supplying `IndexingIterator` as its associated `Iterator`
 //        /// type.
 //        public typealias Iterator = IndexingIterator<FetchedResults<Result>>
-        
-        private let diffableSource: NSDiffable
-    }
-}
 
-extension ListMonitor: ObservableObject {
 
-    public var objectWillChange: ObservableObjectPublisher {
+        // MARK: Equatable
+
+        public static func == (_ lhs: Snapshot, _ rhs: Snapshot) -> Bool {
+
+            return lhs.snapshotReference == rhs.snapshotReference
+        }
+
+
+        // MARK: Hashable
+
+        public func hash(into hasher: inout Hasher) {
+
+            hasher.combine(self.snapshotReference)
+        }
+
+
+        // MARK: Internal
+
+        internal static var empty: Snapshot {
+
+            return .init()
+        }
+
+        internal init(snapshotReference: NSDiffableDataSourceSnapshotReference, context: NSManagedObjectContext) {
+
+            self.snapshotReference = snapshotReference
+            self.snapshotStruct = snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+            self.context = context
+        }
+
+
+        // MARK: Private
         
-        return withUnsafePointer(to: &Static.objectWillChange) {
-            self.userInfo[
-                $0,
-                lazyInit: ObservableObjectPublisher.init
-            ] as! ObservableObjectPublisher
+        private let snapshotReference: NSDiffableDataSourceSnapshotReference
+        private let snapshotStruct: NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+        private let context: NSManagedObjectContext?
+
+        private init() {
+
+            self.snapshotReference = .init()
+            self.snapshotStruct = self.snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+            self.context = nil
         }
     }
 }
 
-@available(iOS 13.0, *)
-extension CoreStoreObject: ObservableObject {
-    
-    public var objectWillChange: ObservableObjectPublisher {
-        
-        return self.cs_toRaw().objectWillChange
+
+// MARK: - LiveList: FetchedDiffableDataSourceSnapshotHandler
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
+
+    // MARK: FetchedDiffableDataSourceSnapshotHandler
+
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+
+        self.snapshot = .init(snapshotReference: snapshot, context: controller.managedObjectContext)
     }
 }
 
-fileprivate enum Static {
-    
-    static var objectWillChange: Void?
+
+#if canImport(Combine)
+import Combine
+
+// MARK: - LiveList: ObservableObject
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension LiveList: ObservableObject {
+
+    // MARK: ObservableObject
+
+    public var objectWillChange: ObservableObjectPublisher {
+
+        return self.rawObjectWillChange! as! ObservableObjectPublisher
+    }
 }
 
 #endif
+
+#endif

From 56d9719984e92ca9f9587a70c4fd19868086f0ca Mon Sep 17 00:00:00 2001
From: Tim Fraedrich <32460316+timfraedrich@users.noreply.github.com>
Date: Fri, 4 Oct 2019 14:19:14 +0000
Subject: [PATCH 07/58] small correction to documentation

While using some code from the documentation that led to issues I noticed that some parts of it are not accurate anymore, so I corrected a few small things that came to my attention. Maybe it is worth having an even closer look though.
---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 327dff0..1a348c4 100644
--- a/README.md
+++ b/README.md
@@ -1513,10 +1513,10 @@ Including `ListObserver`, there are 3 observer protocols you can implement depen
 
 - `ListObjectObserver`: in addition to `ListObserver` methods, also lets you handle object inserts, updates, and deletes:
 ```swift
-    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didInsertObject object: MyPersonEntity, toIndexPath indexPath: NSIndexPath)
-    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didDeleteObject object: MyPersonEntity, fromIndexPath indexPath: NSIndexPath)
-    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didUpdateObject object: MyPersonEntity, atIndexPath indexPath: NSIndexPath)
-    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didMoveObject object: MyPersonEntity, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath)
+    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didInsertObject object: MyPersonEntity, toIndexPath indexPath: IndexPath)
+    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didDeleteObject object: MyPersonEntity, fromIndexPath indexPath: IndexPath)
+    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didUpdateObject object: MyPersonEntity, atIndexPath indexPath: IndexPath)
+    func listMonitor(_ monitor: ListMonitor<MyPersonEntity>, didMoveObject object: MyPersonEntity, fromIndexPath: IndexPath, toIndexPath: IndexPath)
 ```
 - `ListSectionObserver`: in addition to `ListObjectObserver` methods, also lets you handle section inserts and deletes:
 ```swift
@@ -1573,9 +1573,9 @@ func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -
 }
 ```
 
-To access the objects of a sectioned list, use an `NSIndexPath` or a tuple:
+To access the objects of a sectioned list, use an `IndexPath` or a tuple:
 ```swift
-let indexPath = NSIndexPath(forRow: 2, inSection: 1)
+let indexPath = IndexPath(row: 2, section: 1)
 let person1 = self.monitor[indexPath]
 let person2 = self.monitor[1, 2]
 // person1 and person2 are the same object

From b073b7e795330a342d832a7afef16d9ee56df8ab Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sun, 6 Oct 2019 23:37:04 +0900
Subject: [PATCH 08/58] swiftUI support done for now

---
 CoreStore.xcodeproj/project.pbxproj           |  75 ++++++-
 .../CoreStoreDemo.xcodeproj/project.pbxproj   |  16 +-
 .../CoreStoreDemo/Base.lproj/Main.storyboard  | 188 +++++++-----------
 .../CoreStoreDemo/MenuViewController.swift    |  92 ---------
 .../SwiftUIContainerViewController.swift      |  47 +++++
 .../SwiftUIHostingController.swift            |  31 ---
 .../SwiftUI Demo/SwiftUIView.swift            |  88 ++++----
 Sources/EnvironmentKeys.swift                 |  45 +++++
 Sources/ListSnapshot.swift                    | 131 ++++++++++++
 Sources/LiveList.swift                        | 164 +++------------
 Sources/LiveQuery.swift                       | 165 +++++++++++++++
 Sources/LiveResult.swift                      |  46 +++++
 Sources/Shared.swift                          |   1 -
 Sources/SnapshotResult.swift                  |  45 +++++
 14 files changed, 710 insertions(+), 424 deletions(-)
 delete mode 100644 CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
 create mode 100644 CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
 delete mode 100644 CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift
 create mode 100644 Sources/EnvironmentKeys.swift
 create mode 100644 Sources/ListSnapshot.swift
 create mode 100644 Sources/LiveQuery.swift
 create mode 100644 Sources/LiveResult.swift
 create mode 100644 Sources/SnapshotResult.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 31f6205..de467fc 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -78,6 +78,12 @@
 		B50132312346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
 		B50132322346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
 		B50132332346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
+		B501323723477F9300FC238B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323623477F9300FC238B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		B501323923477FAC00FC238B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323823477FAC00FC238B /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		B501323D23477FD500FC238B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323C23477FD500FC238B /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		B501323F23477FE800FC238B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323E23477FE800FC238B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		B501324023477FF800FC238B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323623477F9300FC238B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		B50132412347800000FC238B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323A23477FB600FC238B /* AppKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B501FDDD1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
 		B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */; };
@@ -640,6 +646,10 @@
 		B5E2222C1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
 		B5E2222D1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
 		B5E2222E1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
+		B5E294DD2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
+		B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
+		B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
+		B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
 		B5E41EC01EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC11EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC21EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
@@ -736,6 +746,22 @@
 		B5ECDC331CA81CDC00C7F112 /* CSCoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDC2E1CA81CDC00C7F112 /* CSCoreStore+Transaction.swift */; };
 		B5F1DA8D1B9AA97D007C5CBB /* ImportableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */; };
 		B5F1DA901B9AA991007C5CBB /* ImportableUniqueObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */; };
+		B5F335582348D75D00FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
+		B5F335592348D76300FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
+		B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
+		B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
+		B5F3355C2348D93700FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
+		B5F3355D2348D93800FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
+		B5F3355E2348D93900FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
+		B5F3355F2348D93900FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
+		B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
+		B5F8496D234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
+		B5F8496E234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
+		B5F8496F234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
+		B5F849712348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B5F849722348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B5F849732348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B5F849742348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
 		B5FAD6A91B50A4B400714891 /* Progress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */; };
 		B5FAD6AC1B51285300714891 /* Internals.MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */; };
 		B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; };
@@ -796,6 +822,11 @@
 		B500810F2290CDF800F4CEA5 /* bitrise.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = bitrise.yml; sourceTree = SOURCE_ROOT; };
 		B50132292344ECB500FC238B /* LiveList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveList.swift; sourceTree = "<group>"; };
 		B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FetchedDiffableDataSourceSnapshotDelegate.swift; sourceTree = "<group>"; };
+		B501323623477F9300FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
+		B501323823477FAC00FC238B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		B501323A23477FB600FC238B /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
+		B501323C23477FD500FC238B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
+		B501323E23477FE800FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS13.0.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
 		B501FDDC1CA8D05000BE22EF /* CSSectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSectionBy.swift; sourceTree = "<group>"; };
 		B501FDE11CA8D1F500BE22EF /* CSListMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListMonitor.swift; sourceTree = "<group>"; };
 		B501FDE61CA8D20500BE22EF /* CSListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListObserver.swift; sourceTree = "<group>"; };
@@ -949,6 +980,7 @@
 		B5E1B5A71CAA49E2007FD580 /* CSDataStack+Migrating.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSDataStack+Migrating.swift"; sourceTree = "<group>"; };
 		B5E222221CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSynchronousDataTransaction.swift; sourceTree = "<group>"; };
 		B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSUnsafeDataTransaction.swift; sourceTree = "<group>"; };
+		B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotResult.swift; sourceTree = "<group>"; };
 		B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DynamicSchema+Convenience.swift"; sourceTree = "<group>"; };
 		B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
 		B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
@@ -1002,6 +1034,10 @@
 		B5ECDC2E1CA81CDC00C7F112 /* CSCoreStore+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSCoreStore+Transaction.swift"; sourceTree = "<group>"; };
 		B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableObject.swift; sourceTree = "<group>"; };
 		B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableUniqueObject.swift; sourceTree = "<group>"; };
+		B5F335572348D75D00FD649F /* LiveResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveResult.swift; sourceTree = "<group>"; };
+		B5F84966234887EB0029D57B /* LiveQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveQuery.swift; sourceTree = "<group>"; };
+		B5F8496B234898240029D57B /* ListSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListSnapshot.swift; sourceTree = "<group>"; };
+		B5F849702348A6690029D57B /* EnvironmentKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentKeys.swift; sourceTree = "<group>"; };
 		B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Progress+Convenience.swift"; sourceTree = "<group>"; };
 		B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.MigrationManager.swift; sourceTree = "<group>"; };
 		B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "CoreStore+Migration.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -1016,6 +1052,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B501323923477FAC00FC238B /* UIKit.framework in Frameworks */,
+				B501323723477F9300FC238B /* SwiftUI.framework in Frameworks */,
 				B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */,
 				2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */,
 			);
@@ -1033,6 +1071,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B501323F23477FE800FC238B /* SwiftUI.framework in Frameworks */,
+				B501323D23477FD500FC238B /* UIKit.framework in Frameworks */,
 				B56507961D3930C1000596DA /* Foundation.framework in Frameworks */,
 				B56507941D3930BC000596DA /* CoreData.framework in Frameworks */,
 			);
@@ -1050,6 +1090,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B50132412347800000FC238B /* AppKit.framework in Frameworks */,
+				B501324023477FF800FC238B /* SwiftUI.framework in Frameworks */,
 				B56507A01D3930F5000596DA /* Foundation.framework in Frameworks */,
 				B565079E1D3930ED000596DA /* CoreData.framework in Frameworks */,
 			);
@@ -1175,6 +1217,11 @@
 		2F291E3119C6D4D3007AF63F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B501323E23477FE800FC238B /* SwiftUI.framework */,
+				B501323C23477FD500FC238B /* UIKit.framework */,
+				B501323A23477FB600FC238B /* AppKit.framework */,
+				B501323823477FAC00FC238B /* UIKit.framework */,
+				B501323623477F9300FC238B /* SwiftUI.framework */,
 				B565079F1D3930F5000596DA /* Foundation.framework */,
 				B565079D1D3930ED000596DA /* CoreData.framework */,
 				B56507991D3930D1000596DA /* Foundation.framework */,
@@ -1457,10 +1504,15 @@
 		B5E5FA4C22D15D3C00330931 /* DataSources */ = {
 			isa = PBXGroup;
 			children = (
+				B5F849702348A6690029D57B /* EnvironmentKeys.swift */,
+				B5F84966234887EB0029D57B /* LiveQuery.swift */,
 				B50132292344ECB500FC238B /* LiveList.swift */,
+				B5F8496B234898240029D57B /* ListSnapshot.swift */,
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
+				B5F335572348D75D00FD649F /* LiveResult.swift */,
+				B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -1950,7 +2002,6 @@
 				B5ECDBFF1CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B5ECDC051CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B5981CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
-				B501322A2344ECB500FC238B /* LiveList.swift in Sources */,
 				B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */,
 				B5519A5F1CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
 				B52FD3AA1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
@@ -1961,6 +2012,7 @@
 				B5D339E21E948C3600C880DE /* Value.swift in Sources */,
 				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B53FBA0B1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
+				B5E294DD2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
 				B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
@@ -1977,6 +2029,7 @@
 				B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
+				B5F849712348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B5E1B59D1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
 				B5ECDC231CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
 				B549F6731E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
@@ -1985,6 +2038,7 @@
 				B5E1B5931CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				B5ECDC291CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
+				B5F335582348D75D00FD649F /* LiveResult.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
@@ -2094,6 +2148,9 @@
 				B5ECDC0B1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */,
 				B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */,
+				B501322A2344ECB500FC238B /* LiveList.swift in Sources */,
+				B5F3355C2348D93700FD649F /* LiveQuery.swift in Sources */,
+				B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2168,6 +2225,7 @@
 				82BA18A51C4BBD2200A0916E /* CoreStore+Setup.swift in Sources */,
 				82BA18BD1C4BBD4A00A0916E /* GroupBy.swift in Sources */,
 				B5ECDC1F1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
+				B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B53FBA141CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B761F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
@@ -2195,6 +2253,7 @@
 				B5831F432212700400D8604C /* Where.Expression.swift in Sources */,
 				B51260941E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B5FE4DA81C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
+				B5F8496D234898240029D57B /* ListSnapshot.swift in Sources */,
 				B53FBA001CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D31C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
 				82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2212,6 +2271,7 @@
 				B5E41EC11EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
 				B501FDE41CA8D1F500BE22EF /* CSListMonitor.swift in Sources */,
 				B5A1DAC91F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
+				B5F3355D2348D93800FD649F /* LiveQuery.swift in Sources */,
 				B5FE4DA31C8481E100FA6A91 /* StorageInterface.swift in Sources */,
 				B5ECDC131CA816E500C7F112 /* CSTweak.swift in Sources */,
 				B56923C51EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
@@ -2255,6 +2315,7 @@
 				B5D33A021E96012400C880DE /* Relationship.swift in Sources */,
 				B559CD4B1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
 				B56923CA1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
+				B5F849722348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B56923E51EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C641EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
 				B533C4DC1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift in Sources */,
@@ -2263,6 +2324,7 @@
 				82BA18AF1C4BBD3100A0916E /* CoreStore+Transaction.swift in Sources */,
 				82BA18CB1C4BBD6400A0916E /* NSManagedObject+Convenience.swift in Sources */,
 				82BA18B51C4BBD3F00A0916E /* BaseDataTransaction+Querying.swift in Sources */,
+				B5F335592348D76300FD649F /* LiveResult.swift in Sources */,
 				B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
 				B538BA781D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B51260801E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
@@ -2371,6 +2433,7 @@
 				B546F95B1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
 				B52DD1A11BE1F92C00949AFE /* DataStack+Transaction.swift in Sources */,
 				B5220E1C1D130801009BC71E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
+				B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B52DD19E1BE1F92C00949AFE /* AsynchronousDataTransaction.swift in Sources */,
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B52DD1981BE1F92500949AFE /* CoreStore+Setup.swift in Sources */,
@@ -2398,6 +2461,7 @@
 				B53CA9A51EF1EF1600E0F440 /* PartialObject.swift in Sources */,
 				B52DD1AD1BE1F93900949AFE /* Where.swift in Sources */,
 				B53FBA1C1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
+				B5F8496F234898240029D57B /* ListSnapshot.swift in Sources */,
 				B5831F452212700500D8604C /* Where.Expression.swift in Sources */,
 				B51260961E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B5ECDBE31CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
@@ -2415,6 +2479,7 @@
 				B5220E131D1305ED009BC71E /* SectionBy.swift in Sources */,
 				B559CD4D1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
 				B5E41EC31EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
+				B5F3355F2348D93900FD649F /* LiveQuery.swift in Sources */,
 				B5ECDBE91CA6BEA300C7F112 /* CSClauseTypes.swift in Sources */,
 				B5A1DACB1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B52DD1B81BE1F94000949AFE /* DataStack+Migration.swift in Sources */,
@@ -2458,6 +2523,7 @@
 				B56923CC1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
 				B56923E71EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C661EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
+				B5F849742348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B533C4DE1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift in Sources */,
 				B5220E141D130614009BC71E /* DataStack+Observing.swift in Sources */,
 				B52DD1A21BE1F92C00949AFE /* CoreStore+Transaction.swift in Sources */,
@@ -2466,6 +2532,7 @@
 				B5220E191D130761009BC71E /* ListMonitor.swift in Sources */,
 				B5220E181D130711009BC71E /* ObjectObserver.swift in Sources */,
 				B5220E251D13088E009BC71E /* ListObserver.swift in Sources */,
+				B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */,
 				B538BA7A1D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B51260821E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
 				B52DD1A01BE1F92C00949AFE /* UnsafeDataTransaction.swift in Sources */,
@@ -2574,6 +2641,7 @@
 				B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */,
 				B5ECDC201CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
+				B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B53FBA151CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5E1B5AB1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5831B771F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
@@ -2601,6 +2669,7 @@
 				B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B5FE4DA91C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B5831F442212700500D8604C /* Where.Expression.swift in Sources */,
+				B5F8496E234898240029D57B /* ListSnapshot.swift in Sources */,
 				B51260951E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B53FBA011CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D41C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
@@ -2618,6 +2687,7 @@
 				B501FDEA1CA8D20500BE22EF /* CSListObserver.swift in Sources */,
 				B501FDE51CA8D1F500BE22EF /* CSListMonitor.swift in Sources */,
 				B5E41EC21EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
+				B5F3355E2348D93900FD649F /* LiveQuery.swift in Sources */,
 				B5ECDC141CA816E500C7F112 /* CSTweak.swift in Sources */,
 				B5A1DACA1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B56321AE1BD6521C006C9394 /* Internals.NotificationObserver.swift in Sources */,
@@ -2661,6 +2731,7 @@
 				B5215CA61FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A031E96012400C880DE /* Relationship.swift in Sources */,
 				B559CD4C1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
+				B5F849732348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B56923CB1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
 				B56923E61EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C651EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
@@ -2669,6 +2740,7 @@
 				B5DE522D230BD7D600A22534 /* Internals.swift in Sources */,
 				B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */,
 				B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */,
+				B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */,
 				B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
 				B538BA791D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B51260811E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
@@ -2786,6 +2858,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = singlefile;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
 				SWIFT_VERSION = 5.0;
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
index ac94d63..7c77eea 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		B50132242344E24300FC238B /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132232344E24300FC238B /* SwiftUIView.swift */; };
-		B50132262344E44B00FC238B /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132252344E44B00FC238B /* MenuViewController.swift */; };
-		B50132282344E5E900FC238B /* SwiftUIHostingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132272344E5E900FC238B /* SwiftUIHostingController.swift */; };
+		B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */; };
+		B501323523477D2300FC238B /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B501323423477D2300FC238B /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */; };
 		B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */; };
 		B503FAE11AFDC71700F90881 /* Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADD1AFDC71700F90881 /* Palette.swift */; };
@@ -63,8 +63,8 @@
 
 /* Begin PBXFileReference section */
 		B50132232344E24300FC238B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
-		B50132252344E44B00FC238B /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
-		B50132272344E5E900FC238B /* SwiftUIHostingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIHostingController.swift; sourceTree = "<group>"; };
+		B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIContainerViewController.swift; sourceTree = "<group>"; };
+		B501323423477D2300FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
 		B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADD1AFDC71700F90881 /* Palette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Palette.swift; sourceTree = "<group>"; };
@@ -111,6 +111,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B501323523477D2300FC238B /* SwiftUI.framework in Frameworks */,
 				B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */,
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
@@ -124,7 +125,7 @@
 			isa = PBXGroup;
 			children = (
 				B50132232344E24300FC238B /* SwiftUIView.swift */,
-				B50132272344E5E900FC238B /* SwiftUIHostingController.swift */,
+				B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */,
 			);
 			path = "SwiftUI Demo";
 			sourceTree = "<group>";
@@ -153,6 +154,7 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B501323423477D2300FC238B /* SwiftUI.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
 				B5BDC9211C202429008147CD /* CoreStore.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
@@ -181,7 +183,6 @@
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
-				B50132252344E44B00FC238B /* MenuViewController.swift */,
 				B50132222344E20B00FC238B /* SwiftUI Demo */,
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
@@ -328,7 +329,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */,
-				B50132262344E44B00FC238B /* MenuViewController.swift in Sources */,
 				B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */,
 				B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */,
 				B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */,
@@ -350,7 +350,7 @@
 				B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */,
 				B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */,
 				B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */,
-				B50132282344E5E900FC238B /* SwiftUIHostingController.swift in Sources */,
+				B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */,
 				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
 				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
 				B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index 3a6c376..9779183 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -452,7 +452,7 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="ulu-lC-FPB" kind="show" id="dvI-Dt-IDZ"/>
+                                            <segue destination="rhi-tx-cSW" kind="show" id="kb3-NX-Aao"/>
                                         </connections>
                                     </tableViewCell>
                                 </cells>
@@ -470,14 +470,36 @@
             <point key="canvasLocation" x="2634" y="2013"/>
         </scene>
         <!--SwiftUI-->
-        <scene sceneID="ZD4-62-HWp">
+        <scene sceneID="Uiz-5a-tKq">
             <objects>
-                <hostingController id="ulu-lC-FPB" customClass="SwiftUIHostingController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
-                    <navigationItem key="navigationItem" title="SwiftUI" id="0mY-rn-HTS"/>
-                </hostingController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="TNz-sK-Pj4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                <viewController id="rhi-tx-cSW" customClass="SwiftUIContainerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="0Nq-lg-kDJ"/>
+                        <viewControllerLayoutGuide type="bottom" id="72Q-TT-uXH"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="JvO-3D-U2t">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="Not supported on this device/OS version" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Z0H-X0-3xA">
+                                <rect key="frame" x="36" y="274.5" width="303" height="118.5"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="33"/>
+                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="Z0H-X0-3xA" firstAttribute="centerY" secondItem="JvO-3D-U2t" secondAttribute="centerY" id="8Hp-yB-ciV"/>
+                            <constraint firstItem="Z0H-X0-3xA" firstAttribute="leading" secondItem="JvO-3D-U2t" secondAttribute="leadingMargin" constant="20" id="l7i-J0-oG5"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="Z0H-X0-3xA" secondAttribute="trailing" constant="20" id="mrq-pp-Q06"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="SwiftUI" id="gFf-uX-EUI"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="HSp-lA-NAM" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2292" y="2849"/>
+            <point key="canvasLocation" x="3694" y="4816"/>
         </scene>
         <!--Object Observer-->
         <scene sceneID="Y7v-tc-8cX">
@@ -488,18 +510,18 @@
                         <viewControllerLayoutGuide type="bottom" id="aI4-O3-OCi"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="w8K-eN-RvU">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NhC-oM-bkd">
-                                <rect key="frame" x="16" y="69.5" width="343" height="80"/>
+                                <rect key="frame" x="16" y="69.5" width="343" height="77.5"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="TIX-qi-B34"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vfe-Yq-3Xa">
-                                <rect key="frame" x="16" y="159.5" width="343" height="18"/>
+                                <rect key="frame" x="16" y="157" width="343" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="4h9-ha-EzR"/>
                                 </constraints>
@@ -508,37 +530,37 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hue" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sgg-Md-Nf3">
-                                <rect key="frame" x="16" y="197.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="195" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Saturation" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rry-vh-bRK">
-                                <rect key="frame" x="16" y="235.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="233" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Brightness" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTa-ly-eyO">
-                                <rect key="frame" x="16" y="273.5" width="74" height="18"/>
+                                <rect key="frame" x="16" y="271" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="359" translatesAutoresizingMaskIntoConstraints="NO" id="YQ6-fq-3Wb">
-                                <rect key="frame" x="98" y="191.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="189" width="263" height="31"/>
                                 <connections>
                                     <action selector="hueSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="9Hy-3h-llE"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="xXz-78-tAd">
-                                <rect key="frame" x="98" y="229.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="227" width="263" height="31"/>
                                 <connections>
                                     <action selector="saturationSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="qtU-ua-ZTc"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="hpy-2d-eOP">
-                                <rect key="frame" x="98" y="267.5" width="263" height="31"/>
+                                <rect key="frame" x="98" y="265" width="263" height="31"/>
                                 <connections>
                                     <action selector="brightnessSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="F09-EP-2iD"/>
                                 </connections>
@@ -624,19 +646,19 @@
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
                                 <rect key="frame" x="0.0" y="355.5" width="375" height="311.5"/>
                                 <connections>
-                                    <segue destination="sll-yo-mBc" kind="embed" id="AAl-HS-dq2"/>
+                                    <segue destination="bLr-DM-i2t" kind="embed" id="OdS-gZ-CUA"/>
                                 </connections>
                             </containerView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="6So-f3-4Gp" firstAttribute="top" secondItem="L5f-tW-lXf" secondAttribute="bottom" id="3m8-tj-Nd4"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="6So-f3-4Gp" secondAttribute="trailing" constant="-16" id="4L8-wZ-F59"/>
+                            <constraint firstAttribute="trailing" secondItem="6So-f3-4Gp" secondAttribute="trailing" id="4L8-wZ-F59"/>
                             <constraint firstItem="L5f-tW-lXf" firstAttribute="height" secondItem="6So-f3-4Gp" secondAttribute="height" id="8XS-L3-hvN"/>
-                            <constraint firstItem="LNL-mj-D7l" firstAttribute="top" secondItem="6So-f3-4Gp" secondAttribute="bottom" id="8wL-zm-wnt"/>
-                            <constraint firstItem="L5f-tW-lXf" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leadingMargin" constant="-16" id="CbE-2f-7wk"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="L5f-tW-lXf" secondAttribute="trailing" constant="-16" id="dso-2g-fgA"/>
-                            <constraint firstItem="6So-f3-4Gp" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leadingMargin" constant="-16" id="eXM-D3-NLv"/>
+                            <constraint firstAttribute="bottom" secondItem="6So-f3-4Gp" secondAttribute="bottom" id="8wL-zm-wnt"/>
+                            <constraint firstItem="L5f-tW-lXf" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leading" id="CbE-2f-7wk"/>
+                            <constraint firstAttribute="trailing" secondItem="L5f-tW-lXf" secondAttribute="trailing" id="dso-2g-fgA"/>
+                            <constraint firstItem="6So-f3-4Gp" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leading" id="eXM-D3-NLv"/>
                             <constraint firstItem="L5f-tW-lXf" firstAttribute="top" secondItem="IML-3o-caw" secondAttribute="bottom" id="zJ5-sE-iJA"/>
                         </constraints>
                     </view>
@@ -678,7 +700,7 @@
             <objects>
                 <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="DAz-BE-6Ca">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
@@ -733,92 +755,6 @@
             </objects>
             <point key="canvasLocation" x="5085" y="1144.5"/>
         </scene>
-        <!--List Observer-->
-        <scene sceneID="iDB-TD-It9">
-            <objects>
-                <tableViewController id="lCE-i6-UCT" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Zba-8M-Zd7">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="zSO-3e-OVq" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zSO-3e-OVq" id="cHA-by-n4b">
-                                    <rect key="frame" x="0.0" y="0.0" width="348" height="44"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5uq-Yi-XwH">
-                                            <rect key="frame" x="16" y="11" width="22" height="22"/>
-                                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <constraints>
-                                                <constraint firstAttribute="width" secondItem="5uq-Yi-XwH" secondAttribute="height" multiplier="1:1" id="oOe-HC-VyN"/>
-                                            </constraints>
-                                        </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zyu-PC-WmO">
-                                            <rect key="frame" x="48" y="11" width="34.5" height="22"/>
-                                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
-                                            <color key="textColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <constraints>
-                                        <constraint firstAttribute="bottomMargin" secondItem="5uq-Yi-XwH" secondAttribute="bottom" id="2Bf-dJ-VmS"/>
-                                        <constraint firstItem="Zyu-PC-WmO" firstAttribute="leading" secondItem="5uq-Yi-XwH" secondAttribute="trailing" constant="10" id="6uD-S1-gkb"/>
-                                        <constraint firstAttribute="centerY" secondItem="Zyu-PC-WmO" secondAttribute="centerY" id="KQ6-bN-Og6"/>
-                                        <constraint firstItem="5uq-Yi-XwH" firstAttribute="top" secondItem="cHA-by-n4b" secondAttribute="topMargin" id="NqW-uA-mqj"/>
-                                        <constraint firstItem="Zyu-PC-WmO" firstAttribute="height" secondItem="5uq-Yi-XwH" secondAttribute="height" id="Yd5-bt-R8q"/>
-                                        <constraint firstItem="5uq-Yi-XwH" firstAttribute="leading" secondItem="cHA-by-n4b" secondAttribute="leadingMargin" id="a2a-Ol-0HV"/>
-                                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Zyu-PC-WmO" secondAttribute="trailing" id="oip-jd-KsV"/>
-                                    </constraints>
-                                </tableViewCellContentView>
-                                <connections>
-                                    <outlet property="colorView" destination="5uq-Yi-XwH" id="tgl-W1-A55"/>
-                                    <outlet property="label" destination="Zyu-PC-WmO" id="Oda-gD-ElI"/>
-                                </connections>
-                            </tableViewCell>
-                        </prototypes>
-                        <connections>
-                            <outlet property="dataSource" destination="lCE-i6-UCT" id="vTv-9f-P8U"/>
-                            <outlet property="delegate" destination="lCE-i6-UCT" id="Ken-sI-O2f"/>
-                        </connections>
-                    </tableView>
-                    <extendedEdge key="edgesForExtendedLayout" top="YES"/>
-                    <navigationItem key="navigationItem" title="List Observer" id="koc-aK-cgD"/>
-                    <connections>
-                        <segue destination="dX3-kR-CYC" kind="show" identifier="ObjectObserverDemoViewController" id="fIB-GS-Ppk"/>
-                    </connections>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="QAS-su-ZdM" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="5085" y="1546"/>
-        </scene>
-        <!--Navigation Controller-->
-        <scene sceneID="DTD-lH-nr5">
-            <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="sll-yo-mBc" sceneMemberID="viewController">
-                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
-                    <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="6XA-6M-yvZ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <color key="tintColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <color key="barTintColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <textAttributes key="titleTextAttributes">
-                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="20"/>
-                            <color key="textColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </textAttributes>
-                    </navigationBar>
-                    <nil name="viewControllers"/>
-                    <connections>
-                        <segue destination="lCE-i6-UCT" kind="relationship" relationship="rootViewController" id="4Vz-ah-FHX"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="wJg-s1-Dpr" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="4404" y="1546"/>
-        </scene>
         <!--Placemarks-->
         <scene sceneID="LRD-q1-hw1">
             <objects>
@@ -940,6 +876,37 @@
             </objects>
             <point key="canvasLocation" x="4404" y="1144.5"/>
         </scene>
+        <!--SwiftUI Container View Controller-->
+        <scene sceneID="nAz-oS-mGy">
+            <objects>
+                <viewController id="bLr-DM-i2t" customClass="SwiftUIContainerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="3nJ-WH-imr"/>
+                        <viewControllerLayoutGuide type="bottom" id="Q1w-Zn-fPm"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="kof-sr-Xm1">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="SwiftUI is not supported on this device/OS version" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M6C-fv-74B">
+                                <rect key="frame" x="16" y="124.5" width="343" height="60"/>
+                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="25"/>
+                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstAttribute="trailingMargin" secondItem="M6C-fv-74B" secondAttribute="trailing" id="68e-4i-uHt"/>
+                            <constraint firstItem="M6C-fv-74B" firstAttribute="centerY" secondItem="kof-sr-Xm1" secondAttribute="centerY" id="W80-DR-xpp"/>
+                            <constraint firstItem="M6C-fv-74B" firstAttribute="leading" secondItem="kof-sr-Xm1" secondAttribute="leadingMargin" id="nQs-sh-4BY"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="m7Z-UU-Jc8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4404" y="1483.3583208395803"/>
+        </scene>
         <!--Time Zones-->
         <scene sceneID="nFT-bo-7y9">
             <objects>
@@ -1120,7 +1087,4 @@
     <resources>
         <image name="second" width="30" height="30"/>
     </resources>
-    <inferredMetricsTieBreakers>
-        <segue reference="fIB-GS-Ppk"/>
-    </inferredMetricsTieBreakers>
 </document>
diff --git a/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift b/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
deleted file mode 100644
index 1d07f24..0000000
--- a/CoreStoreDemo/CoreStoreDemo/MenuViewController.swift
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  MenuViewController.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2019/10/02.
-//  Copyright © 2019 John Rommel Estropia. All rights reserved.
-//
-
-import UIKit
-
-// MARK: - MenuViewController
-
-final class MenuViewController: UITableViewController {
-
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
-        // Uncomment the following line to preserve selection between presentations
-        // self.clearsSelectionOnViewWillAppear = false
-
-        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-        // self.navigationItem.rightBarButtonItem = self.editButtonItem
-    }
-
-    // MARK: - Table view data source
-
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        // #warning Incomplete implementation, return the number of sections
-        return 0
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        // #warning Incomplete implementation, return the number of rows
-        return 0
-    }
-
-    /*
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifier", for: indexPath)
-
-        // Configure the cell...
-
-        return cell
-    }
-    */
-
-    /*
-    // Override to support conditional editing of the table view.
-    override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
-        // Return false if you do not want the specified item to be editable.
-        return true
-    }
-    */
-
-    /*
-    // Override to support editing the table view.
-    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
-        if editingStyle == .delete {
-            // Delete the row from the data source
-            tableView.deleteRows(at: [indexPath], with: .fade)
-        } else if editingStyle == .insert {
-            // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
-        }    
-    }
-    */
-
-    /*
-    // Override to support rearranging the table view.
-    override func tableView(_ tableView: UITableView, moveRowAt fromIndexPath: IndexPath, to: IndexPath) {
-
-    }
-    */
-
-    /*
-    // Override to support conditional rearranging of the table view.
-    override func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
-        // Return false if you do not want the item to be re-orderable.
-        return true
-    }
-    */
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
-    }
-    */
-
-}
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
new file mode 100644
index 0000000..449fdf6
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -0,0 +1,47 @@
+//
+//  SwiftUIContainerViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/02.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+
+#if canImport(SwiftUI)
+import SwiftUI
+
+#endif
+
+final class SwiftUIContainerViewController: UIViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        #if canImport(SwiftUI)
+        
+        if #available(iOS 13, *) {
+            
+            let hostingController = UIHostingController(
+                rootView: SwiftUIView(
+                    palettes: ColorsDemo.stack.liveList(
+                        From<Palette>()
+                            .sectionBy(\.colorName)
+                            .orderBy(.ascending(\.hue))
+                    )
+                )
+                .environment(\.dataStack, ColorsDemo.stack)
+            )
+            self.addChild(hostingController)
+            
+            hostingController.view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+            hostingController.view.frame = self.view.bounds.inset(by: self.view.safeAreaInsets)
+            self.view.addSubview(hostingController.view)
+            
+            hostingController.didMove(toParent: self)
+        }
+
+        #endif
+    }
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift
deleted file mode 100644
index 57a83e5..0000000
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIHostingController.swift	
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  SwiftUIHostingController.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2019/10/02.
-//  Copyright © 2019 John Rommel Estropia. All rights reserved.
-//
-
-#if canImport(SwiftUI)
-
-import SwiftUI
-import UIKit
-import CoreStore
-
-@available(iOS 13.0.0, *)
-class SwiftUIHostingController: UIHostingController<SwiftUIView> {
-
-    @objc required dynamic init?(coder aDecoder: NSCoder) {
-        super.init(
-            coder: aDecoder,
-            rootView: SwiftUIView(
-                palettes: DataStackEnvironment.defaultValue.liveList(
-                    From<Palette>()
-                        .orderBy(.ascending(\.hue))
-                )
-            )
-        )
-    }
-}
-
-#endif
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 68178ff..bd12f94 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -11,58 +11,45 @@
 import SwiftUI
 import CoreStore
 
-@available(iOS 13.0, *)
-struct DataStackEnvironment: EnvironmentKey {
-
-    static let defaultValue = ColorsDemo.stack
-}
-
-
-@available(iOS 13.0.0, *)
-extension EnvironmentValues {
-
-    var dataStack: DataStack {
-        get {
-            return self[DataStackEnvironment.self]
-        }
-        set {
-            self[DataStackEnvironment.self] = newValue
-        }
-    }
-}
-
 @available(iOS 13.0.0, *)
 struct SwiftUIView: View {
     
-    @Environment(\.dataStack) var dataStack: DataStack
+    @Environment(\.dataStack)
+    var dataStack: DataStack
 
-    @ObservedObject var palettes: LiveList<Palette>
+    @ObservedObject
+    var palettes: LiveList<Palette>
+    
+    @State
+    private var needsShowAlert = false
 
     var body: some View {
         NavigationView {
             List {
                 ForEach(palettes.snapshot, id: \.self) { palette in
                     NavigationLink(
-                        destination: DetailView(palette: palette)
-                    ) {
-                        HStack {
-                            Color(palette.color)
-                                .frame(width: 30, height: 30, alignment: .leading)
-                            Text(palette.colorText)
+                        destination: DetailView(palette: palette),
+                        label: {
+                            HStack {
+                                Color(palette.color)
+                                    .frame(width: 30, height: 30, alignment: .leading)
+                                Text(palette.colorText)
+                            }
                         }
-                    }
-                }.onDelete { indices in
+                    )
+                }
+                .onDelete { indices in
                     let palettes = self.palettes.snapshot[indices]
                     self.dataStack.perform(
                         asynchronous: { transaction in
 
-                            palettes.forEach(transaction.delete(_:))
+                            transaction.delete(palettes)
                         },
                         completion: { _ in }
                     )
                 }
             }
-            .navigationBarTitle(Text("Master"))
+            .navigationBarTitle(Text("SwiftUI"))
             .navigationBarItems(
                 leading: EditButton(),
                 trailing: Button(
@@ -76,38 +63,59 @@ struct SwiftUIView: View {
                             },
                             completion: { _ in }
                         )
-                }
-                ) {
-                    Image(systemName: "plus")
+                    },
+                    label: {
+                        Image(systemName: "plus")
+                    }
+                )
+            )
+            .alert(
+                isPresented: $needsShowAlert,
+                content: {
+                    Alert(
+                        title: Text("SwiftUI Binding Demo"),
+                        message: Text("This demo shows how to bind to LiveList and to CoreStoreObject when using SwiftUI"),
+                        dismissButton: .cancel(Text("OK"))
+                    )
                 }
             )
+            .onAppear {
+                
+                self.needsShowAlert = true
+            }
         }
+        .colorScheme(.dark)
     }
 }
 
 @available(iOS 13.0.0, *)
 struct DetailView: View {
+    
     @ObservedObject var palette: Palette
 
     var body: some View {
-        HStack {
-            EmptyView()
-                .foregroundColor(.init(palette.color))
+        ZStack {
+            Color(palette.color)
+                .cornerRadius(20)
+                .padding(20)
             Text(palette.colorText)
-                .navigationBarTitle(Text("Detail"))
+                .navigationBarTitle(Text("Color"))
         }
     }
 }
 
 @available(iOS 13.0.0, *)
 struct SwiftUIView_Previews: PreviewProvider {
+    
     static var previews: some View {
         SwiftUIView(
-            palettes: DataStackEnvironment.defaultValue.liveList(
+            palettes: ColorsDemo.stack.liveList(
                 From<Palette>()
+                    .sectionBy(\.colorName)
                     .orderBy(.ascending(\.hue))
             )
         )
+        .environment(\.dataStack, ColorsDemo.stack)
     }
 }
 
diff --git a/Sources/EnvironmentKeys.swift b/Sources/EnvironmentKeys.swift
new file mode 100644
index 0000000..8370585
--- /dev/null
+++ b/Sources/EnvironmentKeys.swift
@@ -0,0 +1,45 @@
+//
+//  EnvironmentKeys.swift
+//  CoreStore
+//
+//  Created by John Rommel Estropia on 2019/10/05.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+#if canImport(SwiftUI)
+
+import SwiftUI
+
+
+// MARK: - DataStackEnvironmentKey
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+public struct DataStackEnvironmentKey: EnvironmentKey {
+
+    // MARK: Public
+    
+    public static var defaultValue: DataStack {
+        
+        return Shared.defaultStack
+    }
+}
+
+
+// MARK: - EnvironmentValues
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension EnvironmentValues {
+    
+    // MARK: Public
+    
+    public var dataStack: DataStack {
+        get {
+            return self[DataStackEnvironmentKey.self]
+        }
+        set {
+            self[DataStackEnvironmentKey.self] = newValue
+        }
+    }
+}
+
+#endif
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
new file mode 100644
index 0000000..4ce0717
--- /dev/null
+++ b/Sources/ListSnapshot.swift
@@ -0,0 +1,131 @@
+//
+//  ListSnapshot.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import CoreData
+
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
+
+
+// MARK: - LiveList
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollection, Hashable {
+
+    // MARK: Public
+    
+    public subscript<S: Sequence>(indices: S) -> [ObjectType] where S.Element == Index {
+        
+        let context = self.context!
+        let objectIDs = self.snapshotStruct.itemIdentifiers
+        return indices.map { position in
+            
+            let objectID = objectIDs[position]
+            return context.fetchExisting(objectID)!
+        }
+    }
+    
+    
+    // MARK: SnapshotResult
+    
+    public typealias ObjectType = D
+    
+    
+    // MARK: RandomAccessCollection
+    
+    public var startIndex: Index {
+        
+        return 0
+    }
+    
+    public var endIndex: Index {
+        
+        return self.snapshotStruct.numberOfItems
+    }
+    
+    public subscript(position: Index) -> ObjectType {
+        
+        let context = self.context!
+        let objectID = self.snapshotStruct.itemIdentifiers[position]
+        return context.fetchExisting(objectID)!
+    }
+    
+    
+    // MARK: Sequence
+    
+    public typealias Element = ObjectType
+    
+    public typealias Index = Int
+    
+    
+    // MARK: Equatable
+    
+    public static func == (_ lhs: Self, _ rhs: Self) -> Bool {
+        
+        return lhs.id == rhs.id
+    }
+    
+    
+    // MARK: Hashable
+    
+    public func hash(into hasher: inout Hasher) {
+        
+        hasher.combine(self.id)
+    }
+    
+    
+    // MARK: Internal
+    
+    internal init() {
+        
+        self.snapshotReference = .init()
+        self.snapshotStruct = self.snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+        self.context = nil
+    }
+    
+    internal init(snapshotReference: NSDiffableDataSourceSnapshotReference, context: NSManagedObjectContext) {
+        
+        self.snapshotReference = snapshotReference
+        self.snapshotStruct = snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+        self.context = context
+    }
+    
+    
+    // MARK: Private
+    
+    private let id: UUID = .init()
+    private let snapshotReference: NSDiffableDataSourceSnapshotReference
+    private let snapshotStruct: NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+    private let context: NSManagedObjectContext?
+}
+
+#endif
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 05818dd..b87765e 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -35,6 +35,11 @@ import AppKit
 
 #endif
 
+#if canImport(Combine)
+import Combine
+
+#endif
+
 #if canImport(SwiftUI)
 import SwiftUI
 
@@ -44,58 +49,41 @@ import SwiftUI
 // MARK: - LiveList
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-public final class LiveList<D: DynamicObject>: Hashable {
+public final class LiveList<D: DynamicObject> {
     
-    // MARK: Public (Accessors)
-    
-    /**
-     The type for the objects contained bye the `ListMonitor`
-     */
-    public typealias ObjectType = D
-    
-    public fileprivate(set) var snapshot: Snapshot = .empty {
-
-        didSet {
+    // MARK: Public
 
+    public fileprivate(set) var snapshot: ListSnapshot<ObjectType> = .init() {
 
+        willSet {
+            
             #if canImport(Combine)
-
-            let newValue = self.snapshot
+            
+            let oldValue = self.snapshot
             guard newValue != oldValue else {
 
                 return
             }
-
             #if canImport(SwiftUI)
             withAnimation {
-
                 self.objectWillChange.send()
             }
-
+            
             #else
             self.objectWillChange.send()
-
+            
             #endif
-
+            
             #endif
         }
     }
-
-
-    // MARK: Equatable
-
-    public static func == (_ lhs: LiveList<D>, _ rhs: LiveList<D>) -> Bool {
-
-        return lhs === rhs
-    }
-
-
-    // MARK: Hashable
-
-    public func hash(into hasher: inout Hasher) {
-
-        hasher.combine(ObjectIdentifier(self))
-    }
+    
+    
+    // MARK: LiveResult
+    
+    public typealias ObjectType = D
+    
+    public typealias SnapshotType = ListSnapshot<D>
 
 
     // MARK: Internal
@@ -273,7 +261,7 @@ public final class LiveList<D: DynamicObject>: Hashable {
 
 //            transactionQueue.async {
 //
-//                try! self.fetchedResultsController.performFetchFromSpecifiedStores()
+//                try!internal self.fetchedResultsController.performFetchFromSpecifiedStores()
 //                self.taskGroup.notify(queue: .main) {
 //
 //                    createAsynchronously(self)
@@ -285,108 +273,6 @@ public final class LiveList<D: DynamicObject>: Hashable {
             try! self.fetchedResultsController.performFetchFromSpecifiedStores()
         }
     }
-    
-    
-    // MARK: - Snapshot
-    
-    public struct Snapshot: RandomAccessCollection, Hashable {
-
-        public subscript(indices: IndexSet) -> [ObjectType] {
-
-            let context = self.context!
-            let objectIDs = self.snapshotStruct.itemIdentifiers
-            return indices.map { position in
-
-                let objectID = objectIDs[position]
-                return context.fetchExisting(objectID)!
-            }
-        }
-
-        // MARK: RandomAccessCollection
-        
-        public var startIndex: Index {
-
-            return 0
-        }
-
-        public var endIndex: Index {
-
-            return self.snapshotStruct.numberOfItems
-        }
-
-        public subscript(position: Index) -> ObjectType {
-
-            let context = self.context!
-            let objectID = self.snapshotStruct.itemIdentifiers[position]
-            return context.fetchExisting(objectID)!
-        }
-        
-        
-        // MARK: Sequence
-
-        public typealias Element = ObjectType
-
-        public typealias Index = Int
-
-//        public typealias SubSequence = Slice<Snapshot<ObjectType>>
-//
-//        /// A type that represents the indices that are valid for subscripting the
-//        /// collection, in ascending order.
-//        public typealias Indices = Range<Int>
-//
-//        /// A type that provides the collection's iteration interface and
-//        /// encapsulates its iteration state.
-//        ///
-//        /// By default, a collection conforms to the `Sequence` protocol by
-//        /// supplying `IndexingIterator` as its associated `Iterator`
-//        /// type.
-//        public typealias Iterator = IndexingIterator<FetchedResults<Result>>
-
-
-        // MARK: Equatable
-
-        public static func == (_ lhs: Snapshot, _ rhs: Snapshot) -> Bool {
-
-            return lhs.snapshotReference == rhs.snapshotReference
-        }
-
-
-        // MARK: Hashable
-
-        public func hash(into hasher: inout Hasher) {
-
-            hasher.combine(self.snapshotReference)
-        }
-
-
-        // MARK: Internal
-
-        internal static var empty: Snapshot {
-
-            return .init()
-        }
-
-        internal init(snapshotReference: NSDiffableDataSourceSnapshotReference, context: NSManagedObjectContext) {
-
-            self.snapshotReference = snapshotReference
-            self.snapshotStruct = snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-            self.context = context
-        }
-
-
-        // MARK: Private
-        
-        private let snapshotReference: NSDiffableDataSourceSnapshotReference
-        private let snapshotStruct: NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-        private let context: NSManagedObjectContext?
-
-        private init() {
-
-            self.snapshotReference = .init()
-            self.snapshotStruct = self.snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-            self.context = nil
-        }
-    }
 }
 
 
@@ -407,10 +293,10 @@ extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 #if canImport(Combine)
 import Combine
 
-// MARK: - LiveList: ObservableObject
+// MARK: - LiveList: LiveResult
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-extension LiveList: ObservableObject {
+extension LiveList: LiveResult {
 
     // MARK: ObservableObject
 
diff --git a/Sources/LiveQuery.swift b/Sources/LiveQuery.swift
new file mode 100644
index 0000000..5ecdd67
--- /dev/null
+++ b/Sources/LiveQuery.swift
@@ -0,0 +1,165 @@
+//
+//  LiveQuery.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(SwiftUI) && canImport(Combine)
+
+import CoreData
+import Combine
+import SwiftUI
+
+
+#warning("TODO: autoupdating doesn't work yet")
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@propertyWrapper
+public struct LiveQuery<Result: LiveResult>: DynamicProperty {
+    
+    // MARK: Public
+    
+    @Environment(\.dataStack)
+    public var dataStack: DataStack
+    
+    public typealias ObjectType = Result.ObjectType
+    
+    
+    // MARK: @propertyWrapper
+    
+    public fileprivate(set) var wrappedValue: Result {
+        
+        get {
+
+            return self.nonMutatingWrappedValue.wrappedValue
+        }
+        set {
+            
+            self.nonMutatingWrappedValue = LazyNonmutating { newValue }
+        }
+    }
+    
+    public var projectedValue: Result {
+        
+        return self.wrappedValue
+    }
+    
+
+    // MARK: DynamicProperty
+
+    public mutating func update() {
+
+        SwiftUI.withAnimation {
+
+            let dataStack = self.dataStack
+            if self.set(dataStack: dataStack) {
+                
+                return
+            }
+            self.wrappedValue = self.newWrappedValue(dataStack)
+        }
+    }
+    
+    
+    // MARK: FilePrivate
+    
+    fileprivate let newWrappedValue: (DataStack) -> Result
+    
+    fileprivate init(newWrappedValue: @escaping (DataStack) -> Result) {
+        
+        self.newWrappedValue = newWrappedValue
+    }
+    
+    
+    // MARK: Private
+    
+    private var nonMutatingWrappedValue: LazyNonmutating<Result> = .init { fatalError() }
+    
+    private var currentDataStack: DataStack?
+    
+    private mutating func set(dataStack: DataStack) -> Bool {
+
+        guard self.currentDataStack != dataStack else {
+            
+            return false
+        }
+        self.currentDataStack = dataStack
+        
+        let newWrappedValue = self.newWrappedValue
+        self.nonMutatingWrappedValue = LazyNonmutating<Result> {
+            
+            newWrappedValue(dataStack)
+        }
+        return true
+    }
+    
+    
+    // MARK: - LazyNonmutating
+    
+    fileprivate final class LazyNonmutating<Value> {
+        
+        // MARK: FilePrivate
+        
+        lazy var wrappedValue: Value = self.initializer()
+
+        init(_ initializer: @escaping () -> Value) {
+            
+            self.initializer = initializer
+        }
+        
+
+        // MARK: Private
+        
+        private var initializer: () -> Value
+    }
+}
+
+
+#if canImport(UIKit) || canImport(AppKit)
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension LiveQuery {
+
+    public init<D: DynamicObject>(liveList: LiveList<D>) where Result == LiveList<D> {
+
+        self.init(
+            newWrappedValue: { _ in liveList }
+        )
+    }
+
+    public init<D: DynamicObject>(_ clauseChain: FetchChainBuilder<D>) where Result == LiveList<D> {
+        
+        self.init(
+            newWrappedValue: { $0.liveList(clauseChain) }
+        )
+    }
+
+    public init<D: DynamicObject>(_ clauseChain: SectionMonitorChainBuilder<D>) where Result == LiveList<D> {
+        
+        self.init(
+            newWrappedValue: { $0.liveList(clauseChain) }
+        )
+    }
+}
+
+#endif
+
+#endif
diff --git a/Sources/LiveResult.swift b/Sources/LiveResult.swift
new file mode 100644
index 0000000..407eb25
--- /dev/null
+++ b/Sources/LiveResult.swift
@@ -0,0 +1,46 @@
+//
+//  File.swift
+//  CoreStore iOS
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
+
+
+// MARK: - LiveResult
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+public protocol LiveResult: ObservableObject {
+    
+    associatedtype ObjectType
+    associatedtype SnapshotType: SnapshotResult where SnapshotType.ObjectType == Self.ObjectType
+}
+
+#endif
diff --git a/Sources/Shared.swift b/Sources/Shared.swift
index 604a5ec..8810826 100644
--- a/Sources/Shared.swift
+++ b/Sources/Shared.swift
@@ -38,7 +38,6 @@ public enum Shared {
     */
     public static var logger: CoreStoreLogger = DefaultLogger()
 
-    @available(*, deprecated, message: "Call methods directly from the DataStack instead")
     public static var defaultStack: DataStack {
 
         get {
diff --git a/Sources/SnapshotResult.swift b/Sources/SnapshotResult.swift
new file mode 100644
index 0000000..e22bfb6
--- /dev/null
+++ b/Sources/SnapshotResult.swift
@@ -0,0 +1,45 @@
+//
+//  SnapshotResult.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
+
+
+// MARK: - SnapshotResult
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+public protocol SnapshotResult {
+    
+    associatedtype ObjectType: DynamicObject
+}
+
+#endif

From d5114fc4bcc19316b3316f86f4caec0eaf7ec1ee Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 8 Oct 2019 21:09:34 +0900
Subject: [PATCH 09/58] WIP

---
 CoreStore.xcodeproj/project.pbxproj           |  40 ++
 .../SwiftUI Demo/SwiftUIView.swift            |  67 +-
 Sources/DiffableDataSource.TableView.swift    | 107 ++++
 Sources/DiffableDataSource.swift              |  29 +
 Sources/DynamicObject.swift                   |  13 +-
 Sources/EnvironmentKeys.swift                 |   4 +-
 ...ls.CoreStoreFetchedResultsController.swift |   5 +
 ...Internals.DiffableDataSourceSnapshot.swift | 606 ++++++++++++++++++
 ...als.FallbackDiffableDataUIDispatcher.swift | 157 +++++
 ...edDiffableDataSourceSnapshotDelegate.swift |  65 +-
 Sources/ListSnapshot.swift                    | 186 +++++-
 Sources/LiveList.swift                        |  51 +-
 Sources/LiveQuery.swift                       | 288 +++++----
 13 files changed, 1393 insertions(+), 225 deletions(-)
 create mode 100644 Sources/DiffableDataSource.TableView.swift
 create mode 100644 Sources/DiffableDataSource.swift
 create mode 100644 Sources/Internals.DiffableDataSourceSnapshot.swift
 create mode 100644 Sources/Internals.FallbackDiffableDataUIDispatcher.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index de467fc..c96128e 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -536,6 +536,22 @@
 		B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB71C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB81C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
+		B5BF7FAD234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */; };
+		B5BF7FAE234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */; };
+		B5BF7FAF234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */; };
+		B5BF7FB0234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */; };
+		B5BF7FB2234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
+		B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
+		B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
+		B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
+		B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
+		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
+		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
+		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
+		B5BF7FBC234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
+		B5BF7FBD234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
+		B5BF7FBE234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
+		B5BF7FBF234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
 		B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
 		B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
 		B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
@@ -942,6 +958,10 @@
 		B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
 		B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreBridge.swift; sourceTree = "<group>"; };
 		B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
+		B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataSourceSnapshot.swift; sourceTree = "<group>"; };
+		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
+		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.TableView.swift; sourceTree = "<group>"; };
+		B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FallbackDiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
 		B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UnsafeDataTransaction+Observing.swift"; sourceTree = "<group>"; };
 		B5C976E61C6E3A5900B1AF90 /* Internals.CoreStoreFetchedResultsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.CoreStoreFetchedResultsController.swift; sourceTree = "<group>"; };
 		B5CA2B071F7E5ACA004B1936 /* WhereClauseType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhereClauseType.swift; sourceTree = "<group>"; };
@@ -1513,6 +1533,8 @@
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 				B5F335572348D75D00FD649F /* LiveResult.swift */,
 				B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */,
+				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
+				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -1643,6 +1665,8 @@
 				B5C976E61C6E3A5900B1AF90 /* Internals.CoreStoreFetchedResultsController.swift */,
 				B5474D142227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift */,
 				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
+				B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */,
+				B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */,
 				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
 				B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */,
 				B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */,
@@ -2018,6 +2042,7 @@
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5DE522B230BD7CC00A22534 /* Internals.swift in Sources */,
 				B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */,
+				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				B5ECDC1D1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B53FBA121CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
@@ -2051,6 +2076,7 @@
 				B51260931E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B5DAFB482203D9F8003FCCD0 /* Where.Expression.swift in Sources */,
 				B5FE4DA21C8481E100FA6A91 /* StorageInterface.swift in Sources */,
+				B5BF7FAD234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B53FB9FE1CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D21C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
 				B50392F91C478FF3009900CA /* NSManagedObject+Transaction.swift in Sources */,
@@ -2104,6 +2130,7 @@
 				B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */,
 				B56923E81EB827F5007C4DC9 /* InferredSchemaMappingProvider.swift in Sources */,
 				B53B275F1EE3B92E00E9B352 /* CoreStoreManagedObject.swift in Sources */,
+				B5BF7FBC234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
 				B5215CA41FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A011E96012400C880DE /* Relationship.swift in Sources */,
 				B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */,
@@ -2123,6 +2150,7 @@
 				B5E84EF81AFF846E0064E85B /* CoreStore+Transaction.swift in Sources */,
 				B5E84F301AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift in Sources */,
 				B5831B7A1F34ACBA00A9F647 /* Transformable.swift in Sources */,
+				B5BF7FB2234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B546F9691C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
 				B549F65E1E569C7400FBAB2D /* QueryableAttributeType.swift in Sources */,
 				B5E84F211AFF84860064E85B /* CoreStore+Observing.swift in Sources */,
@@ -2203,6 +2231,7 @@
 				82BA18B21C4BBD3900A0916E /* ImportableObject.swift in Sources */,
 				82BA18AE1C4BBD3100A0916E /* DataStack+Transaction.swift in Sources */,
 				82BA18AB1C4BBD3100A0916E /* AsynchronousDataTransaction.swift in Sources */,
+				B5BF7FBD234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
 				B5D339D91E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				82BA18CE1C4BBD7100A0916E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B56923FB1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2230,6 +2259,7 @@
 				B53FBA141CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B761F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B5E5FA4F22D162F400330931 /* ObjectSnapshot.swift in Sources */,
+				B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5E1B5AA1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5D339F21E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5E1B59F1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
@@ -2326,6 +2356,7 @@
 				82BA18B51C4BBD3F00A0916E /* BaseDataTransaction+Querying.swift in Sources */,
 				B5F335592348D76300FD649F /* LiveResult.swift in Sources */,
 				B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
+				B5BF7FAE234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B538BA781D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B51260801E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
 				82BA18D31C4BBD7100A0916E /* NSManagedObjectContext+CoreStore.swift in Sources */,
@@ -2357,6 +2388,7 @@
 				B5ECDC0D1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5D339E81E9493A500C880DE /* Entity.swift in Sources */,
 				82BA18CC1C4BBD6400A0916E /* Progress+Convenience.swift in Sources */,
+				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */,
 				82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */,
 			);
@@ -2411,6 +2443,7 @@
 				B546F9761C9C553300D5AC55 /* SetupResult.swift in Sources */,
 				B53FBA161CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5ECDC271CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
+				B5BF7FBF234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
 				B5D339DB1E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				B52DD1951BE1F92500949AFE /* CoreStoreError.swift in Sources */,
 				B56923FD1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2438,6 +2471,7 @@
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B52DD1981BE1F92500949AFE /* CoreStore+Setup.swift in Sources */,
 				B5E5FA5122D162F400330931 /* ObjectSnapshot.swift in Sources */,
+				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5D339F41E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5220E241D13085E009BC71E /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B559CD471CAA8B6300E4D58B /* CSSetupResult.swift in Sources */,
@@ -2534,6 +2568,7 @@
 				B5220E251D13088E009BC71E /* ListObserver.swift in Sources */,
 				B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */,
 				B538BA7A1D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
+				B5BF7FB0234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B51260821E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
 				B52DD1A01BE1F92C00949AFE /* UnsafeDataTransaction.swift in Sources */,
 				B5ECDC331CA81CDC00C7F112 /* CSCoreStore+Transaction.swift in Sources */,
@@ -2565,6 +2600,7 @@
 				B598514B1C90289F00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
 				B5D339EA1E9493A500C880DE /* Entity.swift in Sources */,
 				B52DD1AA1BE1F93500949AFE /* TypeErasedClauses.swift in Sources */,
+				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				B53FBA021CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B51FE5AF1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
 			);
@@ -2619,6 +2655,7 @@
 				B56321AD1BD6521C006C9394 /* Internals.MigrationManager.swift in Sources */,
 				B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */,
 				B56321961BD65216006C9394 /* From.swift in Sources */,
+				B5BF7FBE234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
 				B5D339DA1E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				B5ECDC021CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B56923FC1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2646,6 +2683,7 @@
 				B5E1B5AB1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5831B771F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B5E5FA5022D162F400330931 /* ObjectSnapshot.swift in Sources */,
+				B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5D339F31E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5E1B5A01CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
 				B5ECDC261CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
@@ -2742,6 +2780,7 @@
 				B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */,
 				B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */,
 				B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
+				B5BF7FAF234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B538BA791D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B51260811E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
 				B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */,
@@ -2773,6 +2812,7 @@
 				B5ECDC0E1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5D339E91E9493A500C880DE /* Entity.swift in Sources */,
 				B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */,
+				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */,
 				B56321951BD65216006C9394 /* TypeErasedClauses.swift in Sources */,
 			);
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index bd12f94..107ead4 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -26,27 +26,32 @@ struct SwiftUIView: View {
     var body: some View {
         NavigationView {
             List {
-                ForEach(palettes.snapshot, id: \.self) { palette in
-                    NavigationLink(
-                        destination: DetailView(palette: palette),
-                        label: {
-                            HStack {
-                                Color(palette.color)
-                                    .frame(width: 30, height: 30, alignment: .leading)
-                                Text(palette.colorText)
-                            }
+                ForEach(palettes.snapshot.sectionIdentifiers, id: \.self) { (sectionID: String) in
+                    Section(header: Text(sectionID)) {
+                        ForEach(self.palettes.snapshot[section: sectionID], id: \.self) { palette in
+                            NavigationLink(
+                                destination: DetailView(palette: palette),
+                                label: {
+                                    HStack {
+                                        Color(palette.color)
+                                            .cornerRadius(5)
+                                            .frame(width: 30, height: 30, alignment: .leading)
+                                        Text(palette.colorText)
+                                    }
+                                }
+                            )
                         }
-                    )
-                }
-                .onDelete { indices in
-                    let palettes = self.palettes.snapshot[indices]
-                    self.dataStack.perform(
-                        asynchronous: { transaction in
+                        .onDelete { itemIndices in
+                            let objectsToDelete = self.palettes.snapshot[section: sectionID, itemIndices: itemIndices]
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
 
-                            transaction.delete(palettes)
-                        },
-                        completion: { _ in }
-                    )
+                                    transaction.delete(objectsToDelete)
+                                },
+                                completion: { _ in }
+                            )
+                        }
+                    }
                 }
             }
             .navigationBarTitle(Text("SwiftUI"))
@@ -90,16 +95,36 @@ struct SwiftUIView: View {
 
 @available(iOS 13.0.0, *)
 struct DetailView: View {
+
+    @Environment(\.dataStack)
+    var dataStack: DataStack
     
     @ObservedObject var palette: Palette
 
+    @State var hue: Float = 0
+    @State var saturation: Float = 0
+    @State var brightness: Float = 0
+
+    init(palette: Palette) {
+
+        self.palette = palette
+        self.hue = Float(palette.hue.value)
+        self.saturation = palette.saturation.value
+        self.brightness = palette.brightness.value
+    }
+
     var body: some View {
         ZStack {
             Color(palette.color)
                 .cornerRadius(20)
                 .padding(20)
-            Text(palette.colorText)
-                .navigationBarTitle(Text("Color"))
+            VStack {
+                Text(palette.colorText)
+                    .navigationBarTitle(Text("Color"))
+                Slider(value: $hue, in: 0.0 ... 359.0 as ClosedRange<Float>)
+                Slider(value: $saturation, in: 0.0 ... 1.0 as ClosedRange<Float>)
+                Slider(value: $brightness, in: 0.0 ... 0.1 as ClosedRange<Float>)
+            }
         }
     }
 }
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
new file mode 100644
index 0000000..2ff6cd9
--- /dev/null
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -0,0 +1,107 @@
+//
+//  DiffableDataSource.TableView.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit)
+
+import UIKit
+import CoreData
+
+
+//// MARK: - DiffableDataSource
+//
+//extension DiffableDataSource {
+//
+//    // MARK: - TableView
+//
+//    public open class TableView<D: DynamicObject>: NSObject, UITableViewDataSource {
+//
+//        // MARK: Public
+//
+//        public typealias ObjectType = D
+//
+//        public var defaultRowAnimation: UITableView.RowAnimation = .automatic
+//
+//        public init(tableView: UITableView, cellProvider: @escaping (UITableView, IndexPath, ObjectType) -> UITableViewCell?) {
+//
+//            self.tableView = tableView
+//            self.cellProvider = cellProvider
+//
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//
+//                self.rawDataSource = UITableViewDiffableDataSource<String, D.ObjectID>(
+//                    tableView: tableView,
+//                    cellProvider: { (tableView, indexPath, managedObjectID) -> UITableViewCell? in
+//
+//                        cellProvider(
+//                    }
+//                )
+//            }
+//            else {
+//
+//                self.rawDataSource = nil
+//            }
+//
+//            super.init()
+//
+//            tableView.dataSource = self
+//        }
+//
+//        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
+//
+//            let dataSource = UITableViewDiffableDataSource<String, D>.
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//
+//                self.rawDataSource! as! UITableViewDiffableDataSource<String, D>
+//
+//            }
+//            else {
+//
+//            }
+//            core.apply(
+//                snapshot,
+//                view: tableView,
+//                animatingDifferences: animatingDifferences,
+//                performUpdates: { tableView, changeset, setSections in
+//                    tableView.reload(using: changeset, with: self.defaultRowAnimation, setData: setSections)
+//            })
+//        }
+//
+//
+//        // MARK: Private
+//
+//        private weak var tableView: UITableView?
+//        private let cellProvider: (UITableView, IndexPath, ObjectType) -> UITableViewCell?
+//        private let rawDataSource: Any?
+//
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//        private var diffableDataSource: UITableViewDiffableDataSource<String, D.ObjectID> {
+//
+//            return self.rawDataSource! as! UITableViewDiffableDataSource<String, D.ObjectID>
+//        }
+//    }
+//}
+
+
+#endif
diff --git a/Sources/DiffableDataSource.swift b/Sources/DiffableDataSource.swift
new file mode 100644
index 0000000..f4bcc45
--- /dev/null
+++ b/Sources/DiffableDataSource.swift
@@ -0,0 +1,29 @@
+//
+//  File.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+
+// MARK: - DiffableDataSource
+
+public enum DiffableDataSource {}
diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift
index 6e84757..0cf760d 100644
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -33,7 +33,12 @@ import CoreData
  All CoreStore's utilities are designed around `DynamicObject` instances. `NSManagedObject` and `CoreStoreObject` instances all conform to `DynamicObject`.
  */
 public protocol DynamicObject: AnyObject {
-    
+
+    /**
+     The object ID for this instance
+     */
+    typealias ObjectID = NSManagedObjectID
+
     /**
      Used internally by CoreStore. Do not call directly.
      */
@@ -52,7 +57,7 @@ public protocol DynamicObject: AnyObject {
     /**
      Used internally by CoreStore. Do not call directly.
      */
-    func cs_id() -> NSManagedObjectID
+    func cs_id() -> ObjectID
     
     /**
      Used internally by CoreStore. Do not call directly.
@@ -103,7 +108,7 @@ extension NSManagedObject: DynamicObject {
         return object.isKind(of: self)
     }
     
-    public func cs_id() -> NSManagedObjectID {
+    public func cs_id() -> ObjectID {
         
         return self.objectID
     }
@@ -166,7 +171,7 @@ extension CoreStoreObject {
         return (self as AnyClass).isSubclass(of: type as AnyClass)
     }
     
-    public func cs_id() -> NSManagedObjectID {
+    public func cs_id() -> ObjectID {
         
         return self.rawObject!.objectID
     }
diff --git a/Sources/EnvironmentKeys.swift b/Sources/EnvironmentKeys.swift
index 8370585..2472e96 100644
--- a/Sources/EnvironmentKeys.swift
+++ b/Sources/EnvironmentKeys.swift
@@ -29,9 +29,9 @@ public struct DataStackEnvironmentKey: EnvironmentKey {
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 extension EnvironmentValues {
-    
+
     // MARK: Public
-    
+
     public var dataStack: DataStack {
         get {
             return self[DataStackEnvironmentKey.self]
diff --git a/Sources/Internals.CoreStoreFetchedResultsController.swift b/Sources/Internals.CoreStoreFetchedResultsController.swift
index 4db2239..e27bf45 100644
--- a/Sources/Internals.CoreStoreFetchedResultsController.swift
+++ b/Sources/Internals.CoreStoreFetchedResultsController.swift
@@ -82,6 +82,11 @@ extension Internals {
             
             try self.reapplyAffectedStores(self.typedFetchRequest, self.managedObjectContext)
             try self.performFetch()
+
+            if case let delegate as FetchedDiffableDataSourceSnapshotDelegate = self.delegate {
+
+                delegate.initialFetch()
+            }
         }
         
         @nonobjc
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
new file mode 100644
index 0000000..65f8057
--- /dev/null
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -0,0 +1,606 @@
+//
+//  Internals.DiffableDataSourceSnapshot.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import CoreData
+
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
+
+
+// MARK: - Internals
+
+extension Internals {
+
+    // MARK: Internal
+
+    internal typealias DiffableDataSourceSnapshot = _Internal_DiffableDataSourceSnapshot
+
+
+    // MARK: - FallbackDiffableDataSourceSnapshot
+
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
+    internal struct FallbackDiffableDataSourceSnapshot: DiffableDataSourceSnapshot {
+
+        // MARK: Internal
+
+        init(sections: [NSFetchedResultsSectionInfo]) {
+
+            self.structure = .init(sections: sections)
+        }
+
+        // MARK: DiffableDataSourceSnapshot
+
+        init() {
+
+            self.structure = .init()
+        }
+
+        var numberOfItems: Int {
+
+            return self.itemIdentifiers.count
+        }
+
+        var numberOfSections: Int {
+
+            return self.sectionIdentifiers.count
+        }
+
+        var sectionIdentifiers: [NSString] {
+
+            return self.structure.allSectionIDs
+        }
+
+        var itemIdentifiers: [NSManagedObjectID] {
+
+            self.structure.allItemIDs
+        }
+
+        func numberOfItems(inSection identifier: NSString) -> Int {
+
+            return self.itemIdentifiers(inSection: identifier).count
+        }
+
+        func itemIdentifiers(inSection identifier: NSString) -> [NSManagedObjectID] {
+
+            return self.structure.items(in: identifier)
+        }
+
+        func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> NSString? {
+
+            return self.structure.section(containing: identifier)
+        }
+
+        func indexOfItem(_ identifier: NSManagedObjectID) -> Int? {
+
+            return self.itemIdentifiers.firstIndex(of: identifier)
+        }
+
+        func indexOfSection(_ identifier: NSString) -> Int? {
+
+            return self.sectionIdentifiers.firstIndex(of: identifier)
+        }
+
+        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: NSString?) {
+
+            self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
+        }
+
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID) {
+
+            self.structure.insert(itemIDs: identifiers, before: beforeIdentifier)
+        }
+
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID) {
+
+            self.structure.insert(itemIDs: identifiers, after: afterIdentifier)
+        }
+
+        mutating func deleteItems(_ identifiers: [NSManagedObjectID]) {
+
+            self.structure.remove(itemIDs: identifiers)
+        }
+
+        mutating func deleteAllItems() {
+
+            self.structure.removeAllItems()
+        }
+
+        mutating func moveItem(_ identifier: NSManagedObjectID, beforeItem toIdentifier: NSManagedObjectID) {
+
+            self.structure.move(itemID: identifier, before: toIdentifier)
+        }
+
+        mutating func moveItem(_ identifier: NSManagedObjectID, afterItem toIdentifier: NSManagedObjectID) {
+
+            self.structure.move(itemID: identifier, after: toIdentifier)
+        }
+
+        mutating func reloadItems(_ identifiers: [NSManagedObjectID]) {
+
+            self.structure.update(itemIDs: identifiers)
+        }
+
+        mutating func appendSections(_ identifiers: [NSString]) {
+
+            self.structure.append(sectionIDs: identifiers)
+        }
+
+        mutating func insertSections(_ identifiers: [NSString], beforeSection toIdentifier: NSString) {
+
+            self.structure.insert(sectionIDs: identifiers, before: toIdentifier)
+        }
+
+        mutating func insertSections(_ identifiers: [NSString], afterSection toIdentifier: NSString) {
+
+            self.structure.insert(sectionIDs: identifiers, after: toIdentifier)
+        }
+
+        mutating func deleteSections(_ identifiers: [NSString]) {
+
+            self.structure.remove(sectionIDs: identifiers)
+        }
+
+        mutating func moveSection(_ identifier: NSString, beforeSection toIdentifier: NSString) {
+
+            self.structure.move(sectionID: identifier, before: toIdentifier)
+        }
+
+        mutating func moveSection(_ identifier: NSString, afterSection toIdentifier: NSString) {
+
+            self.structure.move(sectionID: identifier, after: toIdentifier)
+        }
+
+        mutating func reloadSections(_ identifiers: [NSString]) {
+
+            self.structure.update(sectionIDs: identifiers)
+        }
+
+
+        // MARK: Private
+
+        private var structure: BackingStructure
+
+
+        // MARK: - BackingStructure
+
+        internal struct BackingStructure {
+
+            // MARK: Internal
+
+            var sections: [Section]
+
+            init() {
+
+                self.sections = []
+            }
+
+            init(sections: [NSFetchedResultsSectionInfo]) {
+
+                self.sections = sections.map {
+
+                    Section(
+                        id: $0.name as NSString,
+                        items: $0.objects?
+                            .compactMap({ ($0 as? NSManagedObject)?.objectID })
+                            .map(Item.init(id:)) ?? [],
+                        isReloaded: false
+                    )
+                }
+            }
+
+            var allSectionIDs: [NSString] {
+
+                return self.sections.map({ $0.id })
+            }
+
+            var allItemIDs: [NSManagedObjectID] {
+
+                return self.sections.lazy.flatMap({ $0.elements }).map({ $0.id })
+            }
+
+            func items(in sectionID: NSString) -> [NSManagedObjectID] {
+
+                guard let sectionIndex = self.sectionIndex(of: sectionID) else {
+
+                    Internals.abort("Section \"\(sectionID)\" does not exist")
+                }
+                return self.sections[sectionIndex].elements.map({ $0.id })
+            }
+
+            func section(containing itemID: NSManagedObjectID) -> NSString? {
+
+                return self.itemPositionMap()[itemID]?.section.id
+            }
+
+            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: NSString?) {
+
+                let index: Array<Section>.Index
+                if let sectionID = sectionID {
+
+                    guard let sectionIndex = self.sectionIndex(of: sectionID) else {
+
+                        Internals.abort("Section \"\(sectionID)\" does not exist")
+                    }
+                    index = sectionIndex
+                }
+                else {
+
+                    let section = self.sections
+                    guard !section.isEmpty else {
+
+                        Internals.abort("No sections exist")
+                    }
+                    index = section.index(before: section.endIndex)
+                }
+
+                let items = itemIDs.lazy.map(Item.init)
+                self.sections[index].elements.append(contentsOf: items)
+            }
+
+            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID) {
+
+                guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
+
+                    Internals.abort("Item \(beforeItemID) does not exist")
+                }
+                let items = itemIDs.lazy.map(Item.init)
+                self.sections[itemPosition.sectionIndex].elements
+                    .insert(contentsOf: items, at: itemPosition.itemRelativeIndex)
+            }
+
+            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID) {
+
+                guard let itemPosition = self.itemPositionMap()[afterItemID] else {
+
+                    Internals.abort("Item \(afterItemID) does not exist")
+                }
+                let itemIndex = self.sections[itemPosition.sectionIndex].elements
+                    .index(after: itemPosition.itemRelativeIndex)
+                let items = itemIDs.lazy.map(Item.init)
+                self.sections[itemPosition.sectionIndex].elements
+                    .insert(contentsOf: items, at: itemIndex)
+            }
+
+            mutating func remove(itemIDs: [NSManagedObjectID]) {
+
+                let itemPositionMap = self.itemPositionMap()
+                var removeIndexSetMap: [Int: IndexSet] = [:]
+
+                for itemID in itemIDs {
+
+                    guard let itemPosition = itemPositionMap[itemID] else {
+
+                        continue
+                    }
+                    removeIndexSetMap[itemPosition.sectionIndex, default: []]
+                        .insert(itemPosition.itemRelativeIndex)
+                }
+                for (sectionIndex, removeIndexSet) in removeIndexSetMap {
+
+                    for range in removeIndexSet.rangeView.reversed() {
+
+                        self.sections[sectionIndex].elements.removeSubrange(range)
+                    }
+                }
+            }
+
+            mutating func removeAllItems() {
+
+                for sectionIndex in self.sections.indices {
+
+                    self.sections[sectionIndex].elements.removeAll()
+                }
+            }
+
+            mutating func move(itemID: NSManagedObjectID, before beforeItemID: NSManagedObjectID) {
+
+                guard let removed = self.remove(itemID: itemID) else {
+
+                    Internals.abort("Item \(itemID) does not exist")
+                }
+                guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
+
+                    Internals.abort("Item \(beforeItemID) does not exist")
+                }
+                self.sections[itemPosition.sectionIndex].elements
+                    .insert(removed, at: itemPosition.itemRelativeIndex)
+            }
+
+            mutating func move(itemID: NSManagedObjectID, after afterItemID: NSManagedObjectID) {
+
+                guard let removed = self.remove(itemID: itemID) else {
+
+                    Internals.abort("Item \(itemID) does not exist")
+                }
+                guard let itemPosition = self.itemPositionMap()[afterItemID] else {
+
+                    Internals.abort("Item \(afterItemID) does not exist")
+                }
+                let itemIndex = self.sections[itemPosition.sectionIndex].elements
+                    .index(after: itemPosition.itemRelativeIndex)
+                self.sections[itemPosition.sectionIndex].elements
+                    .insert(removed, at: itemIndex)
+            }
+
+            mutating func update(itemIDs: [NSManagedObjectID]) {
+
+                let itemPositionMap = self.itemPositionMap()
+                for itemID in itemIDs {
+
+                    guard let itemPosition = itemPositionMap[itemID] else {
+
+                        Internals.abort("Item \(itemID) does not exist")
+                    }
+                    self.sections[itemPosition.sectionIndex].elements[itemPosition.itemRelativeIndex].isReloaded = true
+                }
+            }
+
+            mutating func append(sectionIDs: [NSString]) {
+
+                let newSections = sectionIDs.lazy.map(Section.init)
+                self.sections.append(contentsOf: newSections)
+            }
+
+            mutating func insert(sectionIDs: [NSString], before beforeSectionID: NSString) {
+
+                guard let sectionIndex = self.sectionIndex(of: beforeSectionID) else {
+
+                    Internals.abort("Section \"\(beforeSectionID)\" does not exist")
+                }
+                let newSections = sectionIDs.lazy.map(Section.init)
+                self.sections.insert(contentsOf: newSections, at: sectionIndex)
+            }
+
+            mutating func insert(sectionIDs: [NSString], after afterSectionID: NSString) {
+
+                guard let beforeIndex = self.sectionIndex(of: afterSectionID) else {
+
+                    Internals.abort("Section \"\(afterSectionID)\" does not exist")
+                }
+                let sectionIndex = self.sections.index(after: beforeIndex)
+                let newSections = sectionIDs.lazy.map(Section.init)
+                self.sections.insert(contentsOf: newSections, at: sectionIndex)
+            }
+
+            mutating func remove(sectionIDs: [NSString]) {
+
+                for sectionID in sectionIDs {
+
+                    self.remove(sectionID: sectionID)
+                }
+            }
+
+            mutating func move(sectionID: NSString, before beforeSectionID: NSString) {
+
+                guard let removed = self.remove(sectionID: sectionID) else {
+
+                    Internals.abort("Section \"\(sectionID)\" does not exist")
+                }
+                guard let sectionIndex = self.sectionIndex(of: beforeSectionID) else {
+
+                    Internals.abort("Section \"\(beforeSectionID)\" does not exist")
+                }
+                self.sections.insert(removed, at: sectionIndex)
+            }
+
+            mutating func move(sectionID: NSString, after afterSectionID: NSString) {
+
+                guard let removed = self.remove(sectionID: sectionID) else {
+
+                    Internals.abort("Section \"\(sectionID)\" does not exist")
+                }
+                guard let beforeIndex = self.sectionIndex(of: afterSectionID) else {
+
+                    Internals.abort("Section \"\(afterSectionID)\" does not exist")
+                }
+                let sectionIndex = self.sections.index(after: beforeIndex)
+                self.sections.insert(removed, at: sectionIndex)
+            }
+
+            mutating func update(sectionIDs: [NSString]) {
+
+                for sectionID in sectionIDs {
+
+                    guard let sectionIndex = self.sectionIndex(of: sectionID) else {
+
+                        continue
+                    }
+                    self.sections[sectionIndex].isReloaded = true
+                }
+            }
+
+
+            // MARK: Private
+
+            private func sectionIndex(of sectionID: NSString) -> Array<Section>.Index? {
+
+                return self.sections.firstIndex(where: { $0.id == sectionID })
+            }
+
+            @discardableResult
+            private mutating func remove(itemID: NSManagedObjectID) -> Item? {
+
+                guard let itemPosition = self.itemPositionMap()[itemID] else {
+
+                    return nil
+                }
+                return self.sections[itemPosition.sectionIndex].elements
+                    .remove(at: itemPosition.itemRelativeIndex)
+            }
+
+            @discardableResult
+            private mutating func remove(sectionID: NSString) -> Section? {
+
+                guard let sectionIndex = self.sectionIndex(of: sectionID) else {
+
+                    return nil
+                }
+                return self.sections.remove(at: sectionIndex)
+            }
+
+            private func itemPositionMap() -> [NSManagedObjectID: ItemPosition] {
+
+                return self.sections.enumerated().reduce(into: [:]) { result, section in
+
+                    for (itemRelativeIndex, item) in section.element.elements.enumerated() {
+
+                        result[item.id] = ItemPosition(
+                            item: item,
+                            itemRelativeIndex: itemRelativeIndex,
+                            section: section.element,
+                            sectionIndex: section.offset
+                        )
+                    }
+                }
+            }
+
+
+            // MARK: - Item
+
+            internal struct Item: Identifiable, Equatable {
+
+                var isReloaded: Bool
+
+                init(id: NSManagedObjectID, isReloaded: Bool) {
+
+                    self.id = id
+                    self.isReloaded = isReloaded
+                }
+
+                init(id: NSManagedObjectID) {
+
+                    self.init(id: id, isReloaded: false)
+                }
+
+                func isContentEqual(to source: Item) -> Bool {
+
+                    return !self.isReloaded && self.id == source.id
+                }
+
+                // MARK: Identifiable
+
+                var id: NSManagedObjectID
+            }
+
+
+            // MARK: - Section
+
+            internal struct Section: Identifiable, Equatable {
+
+                var elements: [Item] = []
+                var isReloaded: Bool
+
+                init(id: NSString, items: [Item], isReloaded: Bool) {
+                    self.id = id
+                    self.elements = items
+                    self.isReloaded = isReloaded
+                }
+
+                init(id: NSString) {
+
+                    self.init(id: id, items: [], isReloaded: false)
+                }
+
+                init<S: Sequence>(source: Section, elements: S) where S.Element == Item {
+
+                    self.init(id: source.id, items: Array(elements), isReloaded: source.isReloaded)
+                }
+
+                func isContentEqual(to source: Section) -> Bool {
+
+                    return !self.isReloaded && self.id == source.id
+                }
+
+                // MARK: Identifiable
+
+                var id: NSString
+            }
+
+
+            // MARK: - ItemPosition
+
+            fileprivate struct ItemPosition {
+
+                var item: Item
+                var itemRelativeIndex: Int
+                var section: Section
+                var sectionIndex: Int
+            }
+        }
+    }
+}
+
+
+// MARK: - NSDiffableDataSourceSnapshot: Internals.DiffableDataSourceSnapshot
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension NSDiffableDataSourceSnapshot: Internals.DiffableDataSourceSnapshot where SectionIdentifierType == NSString, ItemIdentifierType == NSManagedObjectID {}
+
+
+// MARK: - Internals.DiffableDataSourceSnapshot
+
+internal protocol _Internal_DiffableDataSourceSnapshot {
+
+    init()
+
+    var numberOfItems: Int { get }
+    var numberOfSections: Int { get }
+    var sectionIdentifiers: [NSString] { get }
+    var itemIdentifiers: [NSManagedObjectID] { get }
+
+    func numberOfItems(inSection identifier: NSString) -> Int
+    func itemIdentifiers(inSection identifier: NSString) -> [NSManagedObjectID]
+    func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> NSString?
+    func indexOfItem(_ identifier: NSManagedObjectID) -> Int?
+    func indexOfSection(_ identifier: NSString) -> Int?
+
+    mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: NSString?)
+    mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID)
+    mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID)
+    mutating func deleteItems(_ identifiers: [NSManagedObjectID])
+    mutating func deleteAllItems()
+    mutating func moveItem(_ identifier: NSManagedObjectID, beforeItem toIdentifier: NSManagedObjectID)
+    mutating func moveItem(_ identifier: NSManagedObjectID, afterItem toIdentifier: NSManagedObjectID)
+    mutating func reloadItems(_ identifiers: [NSManagedObjectID])
+    mutating func appendSections(_ identifiers: [NSString])
+    mutating func insertSections(_ identifiers: [NSString], beforeSection toIdentifier: NSString)
+    mutating func insertSections(_ identifiers: [NSString], afterSection toIdentifier: NSString)
+    mutating func deleteSections(_ identifiers: [NSString])
+    mutating func moveSection(_ identifier: NSString, beforeSection toIdentifier: NSString)
+    mutating func moveSection(_ identifier: NSString, afterSection toIdentifier: NSString)
+    mutating func reloadSections(_ identifiers: [NSString])
+}
+
+
+
+
+#endif
diff --git a/Sources/Internals.FallbackDiffableDataUIDispatcher.swift b/Sources/Internals.FallbackDiffableDataUIDispatcher.swift
new file mode 100644
index 0000000..f091916
--- /dev/null
+++ b/Sources/Internals.FallbackDiffableDataUIDispatcher.swift
@@ -0,0 +1,157 @@
+//
+//  Internals.FallbackDiffableDataUIDispatcher.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import CoreData
+
+#if canImport(QuartzCore)
+import QuartzCore
+
+#endif
+
+
+// MARK: - Internals
+
+extension Internals {
+
+    // MARK: Internal
+
+//    // Implementation based on https://github.com/ra1028/DiffableDataSources
+//    internal final class FallbackDiffableDataUIDispatcher {
+//
+//        // MARK: Internal
+//
+//        internal func apply() {
+//
+//        }
+//
+//        func snapshot() -> DiffableDataSourceSnapshot<SectionIdentifierType, ItemIdentifierType> {
+//            var snapshot = DiffableDataSourceSnapshot<SectionIdentifierType, ItemIdentifierType>()
+//            snapshot.structure.sections = currentSnapshot.structure.sections
+//            return snapshot
+//        }
+//
+//        func itemIdentifier(for indexPath: IndexPath) -> ItemIdentifierType? {
+//            guard 0..<sections.endIndex ~= indexPath.section else {
+//                return nil
+//            }
+//
+//            let items = sections[indexPath.section].elements
+//
+//            guard 0..<items.endIndex ~= indexPath.item else {
+//                return nil
+//            }
+//
+//            return items[indexPath.item].differenceIdentifier
+//        }
+//
+//        func unsafeItemIdentifier(for indexPath: IndexPath, file: StaticString = #file, line: UInt = #line) -> ItemIdentifierType {
+//            guard let itemIdentifier = itemIdentifier(for: indexPath) else {
+//                universalError("Item not found at the specified index path(\(indexPath)).")
+//            }
+//
+//            return itemIdentifier
+//        }
+//
+//        func indexPath(for itemIdentifier: ItemIdentifierType) -> IndexPath? {
+//            let indexPathMap: [ItemIdentifierType: IndexPath] = sections.enumerated()
+//                .reduce(into: [:]) { result, section in
+//                    for (itemIndex, item) in section.element.elements.enumerated() {
+//                        result[item.differenceIdentifier] = IndexPath(
+//                            item: itemIndex,
+//                            section: section.offset
+//                        )
+//                    }
+//            }
+//            return indexPathMap[itemIdentifier]
+//        }
+//
+//        func numberOfSections() -> Int {
+//            return sections.count
+//        }
+//
+//        func numberOfItems(inSection section: Int) -> Int {
+//            return sections[section].elements.count
+//        }
+//
+//
+//
+//        // MARK: Private
+//
+//        private let dispatcher: MainThreadSerialDispatcher = .init()
+//
+//        private var currentSnapshot: Internals.DiffableDataSourceSnapshot = FallbackDiffableDataSourceSnapshot()
+//        private var sections: [FallbackDiffableDataSourceSnapshot.BackingStructure.Section] = []
+//
+//
+//        // MARK: - MainThreadSerialDispatcher
+//
+//        fileprivate final class MainThreadSerialDispatcher {
+//
+//            // MARK: FilePrivate
+//
+//            fileprivate init() {
+//
+//                self.executingCount.initialize(to: 0)
+//            }
+//
+//            deinit {
+//
+//                self.executingCount.deinitialize(count: 1)
+//                self.executingCount.deallocate()
+//            }
+//
+//            fileprivate func dispatch(_ action: @escaping () -> Void) {
+//
+//                let count = OSAtomicIncrement32(self.executingCount)
+//                if Thread.isMainThread && count == 1 {
+//
+//                    action()
+//                    OSAtomicDecrement32(executingCount)
+//                }
+//                else {
+//
+//                    DispatchQueue.main.async { [weak self] in
+//
+//                        guard let self = self else {
+//
+//                            return
+//                        }
+//                        action()
+//                        OSAtomicDecrement32(self.executingCount)
+//                    }
+//                }
+//            }
+//
+//
+//            // MARK: Private
+//
+//            private let executingCount: UnsafeMutablePointer<Int32> = .allocate(capacity: 1)
+//        }
+//    }
+}
+
+#endif
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 4489085..92f8f92 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -23,8 +23,6 @@
 //  SOFTWARE.
 //
 
-#if canImport(UIKit) || canImport(AppKit)
-
 import Foundation
 import CoreData
 
@@ -41,10 +39,9 @@ import AppKit
 
 // MARK: - FetchedDiffableDataSourceSnapshot
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject {
 
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: NSDiffableDataSourceSnapshotReference)
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: Internals.DiffableDataSourceSnapshot)
 }
 
 
@@ -54,7 +51,6 @@ extension Internals {
 
     // MARK: - FetchedDiffableDataSourceSnapshotDelegate
 
-    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
     internal final class FetchedDiffableDataSourceSnapshotDelegate: NSObject, NSFetchedResultsControllerDelegate {
 
         // MARK: Internal
@@ -77,18 +73,71 @@ extension Internals {
             self.fetchedResultsController?.delegate = nil
         }
 
+        internal func initialFetch() {
+
+            #if canImport(UIKit) || canImport(AppKit)
+
+            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+
+                return
+            }
+
+            #endif
+
+            guard let fetchedResultsController = self.fetchedResultsController else {
+
+                return
+            }
+            self.controllerDidChangeContent(fetchedResultsController.dynamicCast())
+        }
+
 
         // MARK: NSFetchedResultsControllerDelegate
 
+        #if canImport(UIKit) || canImport(AppKit)
+
+        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
         @objc
         dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
 
             self.handler?.controller(
                 controller,
-                didChangContentWith: snapshot
+                didChangContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
             )
         }
+
+        #endif
+
+        @objc
+        dynamic func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+
+            self.reloadedIDs = []
+        }
+        
+        @objc
+        dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+
+            self.handler?.controller(
+                controller,
+                didChangContentWith: FallbackDiffableDataSourceSnapshot(
+                    sections: controller.sections ?? []
+                )
+            )
+            self.reloadedIDs = []
+        }
+
+//        @objc
+//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+//
+//
+////            [1].difference(from: <#T##BidirectionalCollection#>)
+//            let managedObject = anObject as! NSManagedObject
+//            self.reloadedIDs.insert(managedObject.objectID)
+//        }
+
+
+        // MARK: Private
+
+        private var reloadedIDs: Set<NSManagedObjectID> = []
     }
 }
-
-#endif
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 4ce0717..dba82f5 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -23,8 +23,6 @@
 //  SOFTWARE.
 //
 
-#if canImport(UIKit) || canImport(AppKit)
-
 import CoreData
 
 #if canImport(UIKit)
@@ -38,21 +36,170 @@ import AppKit
 
 // MARK: - LiveList
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollection, Hashable {
 
     // MARK: Public
-    
-    public subscript<S: Sequence>(indices: S) -> [ObjectType] where S.Element == Index {
-        
+
+    public typealias SectionID = String
+    public typealias ItemID = D.ObjectID
+
+    public subscript<S: Sequence>(indices indices: S) -> [ObjectType] where S.Element == Index {
+
         let context = self.context!
-        let objectIDs = self.snapshotStruct.itemIdentifiers
+        let objectIDs = self.diffableSnapshot.itemIdentifiers
         return indices.map { position in
-            
+
             let objectID = objectIDs[position]
             return context.fetchExisting(objectID)!
         }
     }
+
+    public subscript(section sectionID: SectionID) -> [ObjectType] {
+
+        let context = self.context!
+        let objectIDs = self.itemIdentifiers(inSection: sectionID)
+        return objectIDs.map {
+            
+            return context.fetchExisting($0)!
+        }
+    }
+
+    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [ObjectType] where S.Element == Int {
+
+        let context = self.context!
+        let objectIDs = self.itemIdentifiers(inSection: sectionID)
+        return itemIndices.map { position in
+
+            let objectID = objectIDs[position]
+            return context.fetchExisting(objectID)!
+        }
+    }
+
+    public var numberOfItems: Int {
+
+        return self.diffableSnapshot.numberOfItems
+    }
+
+    public var numberOfSections: Int {
+
+        return self.diffableSnapshot.numberOfSections
+    }
+
+    public var sectionIdentifiers: [String] {
+
+        return self.diffableSnapshot.sectionIdentifiers as [String]
+    }
+
+    public var itemIdentifiers: [ItemID] {
+
+        return self.diffableSnapshot.itemIdentifiers as [ItemID]
+    }
+
+    public func numberOfItems(inSection identifier: SectionID) -> Int {
+
+        return self.diffableSnapshot.numberOfItems(inSection: identifier as NSString)
+    }
+
+    public func itemIdentifiers(inSection identifier: SectionID) -> [ItemID] {
+
+        return self.diffableSnapshot.itemIdentifiers(inSection: identifier as NSString)
+    }
+
+    public func itemIdentifiers(inSection identifier: SectionID, atIndices indices: IndexSet) -> [ItemID] {
+
+        let itemIDs = self.itemIdentifiers(inSection: identifier)
+        return indices.map({ itemIDs[$0] })
+    }
+
+    public func sectionIdentifier(containingItem identifier: ItemID) -> SectionID? {
+
+        return self.diffableSnapshot.sectionIdentifier(containingItem: identifier) as SectionID?
+    }
+
+    public func indexOfItem(_ identifier: ItemID) -> Index? {
+
+        return self.diffableSnapshot.indexOfItem(identifier)
+    }
+
+    public func indexOfSection(_ identifier: SectionID) -> Int? {
+
+        return self.diffableSnapshot.indexOfSection(identifier as NSString)
+    }
+
+    public mutating func appendItems(_ identifiers: [ItemID], toSection sectionIdentifier: SectionID? = nil) {
+
+        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier as NSString?)
+    }
+
+    public mutating func insertItems(_ identifiers: [ItemID], beforeItem beforeIdentifier: ItemID) {
+
+        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier)
+    }
+
+    public mutating func insertItems(_ identifiers: [ItemID], afterItem afterIdentifier: ItemID) {
+
+        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier)
+    }
+
+    public mutating func deleteItems(_ identifiers: [ItemID]) {
+
+        self.diffableSnapshot.deleteItems(identifiers)
+    }
+
+    public mutating func deleteAllItems() {
+
+        self.diffableSnapshot.deleteAllItems()
+    }
+
+    public mutating func moveItem(_ identifier: ItemID, beforeItem toIdentifier: ItemID) {
+
+        self.diffableSnapshot.moveItem(identifier, beforeItem: toIdentifier)
+    }
+
+    public mutating func moveItem(_ identifier: ItemID, afterItem toIdentifier: ItemID) {
+
+        self.diffableSnapshot.moveItem(identifier, afterItem: toIdentifier)
+    }
+
+    public mutating func reloadItems(_ identifiers: [ItemID]) {
+
+        self.diffableSnapshot.reloadItems(identifiers)
+    }
+
+    public mutating func appendSections(_ identifiers: [SectionID]) {
+
+        self.diffableSnapshot.appendSections(identifiers as [NSString])
+    }
+
+    public mutating func insertSections(_ identifiers: [SectionID], beforeSection toIdentifier: SectionID) {
+
+        self.diffableSnapshot.insertSections(identifiers as [NSString], beforeSection: toIdentifier as NSString)
+    }
+
+    public mutating func insertSections(_ identifiers: [SectionID], afterSection toIdentifier: SectionID) {
+
+        self.diffableSnapshot.insertSections(identifiers as [NSString], afterSection: toIdentifier as NSString)
+    }
+
+    public mutating func deleteSections(_ identifiers: [SectionID]) {
+
+        self.diffableSnapshot.deleteSections(identifiers as [NSString])
+    }
+
+    public mutating func moveSection(_ identifier: SectionID, beforeSection toIdentifier: SectionID) {
+
+        self.diffableSnapshot.moveSection(identifier as NSString, beforeSection: toIdentifier as NSString)
+    }
+
+    public mutating func moveSection(_ identifier: SectionID, afterSection toIdentifier: SectionID) {
+
+        self.diffableSnapshot.moveSection(identifier as NSString, afterSection: toIdentifier as NSString)
+    }
+
+    public mutating func reloadSections(_ identifiers: [SectionID]) {
+
+        self.diffableSnapshot.reloadSections(identifiers as [NSString])
+    }
     
     
     // MARK: SnapshotResult
@@ -64,18 +211,18 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
     
     public var startIndex: Index {
         
-        return 0
+        return self.diffableSnapshot.itemIdentifiers.startIndex
     }
     
     public var endIndex: Index {
         
-        return self.snapshotStruct.numberOfItems
+        return self.diffableSnapshot.itemIdentifiers.endIndex
     }
     
     public subscript(position: Index) -> ObjectType {
         
         let context = self.context!
-        let objectID = self.snapshotStruct.itemIdentifiers[position]
+        let objectID = self.diffableSnapshot.itemIdentifiers[position]
         return context.fetchExisting(objectID)!
     }
     
@@ -106,16 +253,14 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
     // MARK: Internal
     
     internal init() {
-        
-        self.snapshotReference = .init()
-        self.snapshotStruct = self.snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+
+        self.diffableSnapshot = Internals.FallbackDiffableDataSourceSnapshot()
         self.context = nil
     }
     
-    internal init(snapshotReference: NSDiffableDataSourceSnapshotReference, context: NSManagedObjectContext) {
-        
-        self.snapshotReference = snapshotReference
-        self.snapshotStruct = snapshotReference as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+    internal init(diffableSnapshot: Internals.DiffableDataSourceSnapshot, context: NSManagedObjectContext) {
+
+        self.diffableSnapshot = diffableSnapshot
         self.context = context
     }
     
@@ -123,9 +268,6 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
     // MARK: Private
     
     private let id: UUID = .init()
-    private let snapshotReference: NSDiffableDataSourceSnapshotReference
-    private let snapshotStruct: NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
     private let context: NSManagedObjectContext?
+    private var diffableSnapshot: Internals.DiffableDataSourceSnapshot
 }
-
-#endif
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index b87765e..e6a0cf8 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -23,18 +23,8 @@
 //  SOFTWARE.
 //
 
-#if canImport(UIKit) || canImport(AppKit)
-
 import CoreData
 
-#if canImport(UIKit)
-import UIKit
-
-#elseif canImport(AppKit)
-import AppKit
-
-#endif
-
 #if canImport(Combine)
 import Combine
 
@@ -48,7 +38,6 @@ import SwiftUI
 
 // MARK: - LiveList
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 public final class LiveList<D: DynamicObject> {
     
     // MARK: Public
@@ -57,23 +46,22 @@ public final class LiveList<D: DynamicObject> {
 
         willSet {
             
-            #if canImport(Combine)
-            
-            let oldValue = self.snapshot
-            guard newValue != oldValue else {
+            guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) else {
 
                 return
             }
+            #if canImport(Combine)
+
             #if canImport(SwiftUI)
             withAnimation {
                 self.objectWillChange.send()
             }
-            
+
             #else
             self.objectWillChange.send()
-            
+
             #endif
-            
+
             #endif
         }
     }
@@ -182,13 +170,20 @@ public final class LiveList<D: DynamicObject> {
             applyFetchClauses: applyFetchClauses
         )
 
-        #if canImport(Combine)
-        self.rawObjectWillChange = ObservableObjectPublisher()
+        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
 
-        #else
-        self.rawObjectWillChange = nil
+            #if canImport(Combine)
+            self.rawObjectWillChange = ObservableObjectPublisher()
 
-        #endif
+            #else
+            self.rawObjectWillChange = nil
+
+            #endif
+        }
+        else {
+
+            self.rawObjectWillChange = nil
+        }
 
 
 //        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
@@ -278,14 +273,16 @@ public final class LiveList<D: DynamicObject> {
 
 // MARK: - LiveList: FetchedDiffableDataSourceSnapshotHandler
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 
     // MARK: FetchedDiffableDataSourceSnapshotHandler
 
-    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: Internals.DiffableDataSourceSnapshot) {
 
-        self.snapshot = .init(snapshotReference: snapshot, context: controller.managedObjectContext)
+        self.snapshot = .init(
+            diffableSnapshot: snapshot,
+            context: controller.managedObjectContext
+        )
     }
 }
 
@@ -307,5 +304,3 @@ extension LiveList: LiveResult {
 }
 
 #endif
-
-#endif
diff --git a/Sources/LiveQuery.swift b/Sources/LiveQuery.swift
index 5ecdd67..c270229 100644
--- a/Sources/LiveQuery.swift
+++ b/Sources/LiveQuery.swift
@@ -23,143 +23,151 @@
 //  SOFTWARE.
 //
 
-#if canImport(SwiftUI) && canImport(Combine)
-
-import CoreData
-import Combine
-import SwiftUI
-
-
-#warning("TODO: autoupdating doesn't work yet")
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-@propertyWrapper
-public struct LiveQuery<Result: LiveResult>: DynamicProperty {
-    
-    // MARK: Public
-    
-    @Environment(\.dataStack)
-    public var dataStack: DataStack
-    
-    public typealias ObjectType = Result.ObjectType
-    
-    
-    // MARK: @propertyWrapper
-    
-    public fileprivate(set) var wrappedValue: Result {
-        
-        get {
-
-            return self.nonMutatingWrappedValue.wrappedValue
-        }
-        set {
-            
-            self.nonMutatingWrappedValue = LazyNonmutating { newValue }
-        }
-    }
-    
-    public var projectedValue: Result {
-        
-        return self.wrappedValue
-    }
-    
-
-    // MARK: DynamicProperty
-
-    public mutating func update() {
-
-        SwiftUI.withAnimation {
-
-            let dataStack = self.dataStack
-            if self.set(dataStack: dataStack) {
-                
-                return
-            }
-            self.wrappedValue = self.newWrappedValue(dataStack)
-        }
-    }
-    
-    
-    // MARK: FilePrivate
-    
-    fileprivate let newWrappedValue: (DataStack) -> Result
-    
-    fileprivate init(newWrappedValue: @escaping (DataStack) -> Result) {
-        
-        self.newWrappedValue = newWrappedValue
-    }
-    
-    
-    // MARK: Private
-    
-    private var nonMutatingWrappedValue: LazyNonmutating<Result> = .init { fatalError() }
-    
-    private var currentDataStack: DataStack?
-    
-    private mutating func set(dataStack: DataStack) -> Bool {
-
-        guard self.currentDataStack != dataStack else {
-            
-            return false
-        }
-        self.currentDataStack = dataStack
-        
-        let newWrappedValue = self.newWrappedValue
-        self.nonMutatingWrappedValue = LazyNonmutating<Result> {
-            
-            newWrappedValue(dataStack)
-        }
-        return true
-    }
-    
-    
-    // MARK: - LazyNonmutating
-    
-    fileprivate final class LazyNonmutating<Value> {
-        
-        // MARK: FilePrivate
-        
-        lazy var wrappedValue: Value = self.initializer()
-
-        init(_ initializer: @escaping () -> Value) {
-            
-            self.initializer = initializer
-        }
-        
-
-        // MARK: Private
-        
-        private var initializer: () -> Value
-    }
-}
-
-
-#if canImport(UIKit) || canImport(AppKit)
-
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-extension LiveQuery {
-
-    public init<D: DynamicObject>(liveList: LiveList<D>) where Result == LiveList<D> {
-
-        self.init(
-            newWrappedValue: { _ in liveList }
-        )
-    }
-
-    public init<D: DynamicObject>(_ clauseChain: FetchChainBuilder<D>) where Result == LiveList<D> {
-        
-        self.init(
-            newWrappedValue: { $0.liveList(clauseChain) }
-        )
-    }
-
-    public init<D: DynamicObject>(_ clauseChain: SectionMonitorChainBuilder<D>) where Result == LiveList<D> {
-        
-        self.init(
-            newWrappedValue: { $0.liveList(clauseChain) }
-        )
-    }
-}
-
-#endif
-
-#endif
+//#if canImport(SwiftUI) && canImport(Combine)
+//
+//import CoreData
+//import Combine
+//import SwiftUI
+//
+//
+//#warning("TODO: autoupdating doesn't work yet")
+//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//@propertyWrapper
+//public struct LiveQuery<Result: LiveResult>: DynamicProperty {
+//    
+//    // MARK: Public
+//    
+//    @Environment(\.dataStack)
+//    public var dataStack: DataStack
+//    
+//    public typealias ObjectType = Result.ObjectType
+//    
+//    
+//    // MARK: @propertyWrapper
+//    
+//    public var wrappedValue: Result {
+//        
+//        get {
+//
+//            return self.backingWrapper!.wrappedValue
+//        }
+//        set {
+//
+//            self.backingWrapper!.wrappedValue = newValue
+//        }
+//    }
+//    
+//    public var projectedValue: ObservedObject<Result>.Wrapper {
+//
+//        return self.backingWrapper!.projectedValue
+//    }
+//    
+//
+//    // MARK: DynamicProperty
+//
+//    public mutating func update() {
+//
+//        SwiftUI.withAnimation {
+//
+//            let dataStack = self.dataStack
+//
+//            if self.backingWrapper == nil {
+//
+//                self.backingWrapper = ObservedObject(wrappedValue: self.newLiveResult(dataStack))
+//            }
+//            else {
+//
+//                self.backingWrapper!.wrappedValue = self.newLiveResult(dataStack)
+//            }
+//            self.backingWrapper!.update()
+//        }
+//    }
+//    
+//    
+//    // MARK: FilePrivate
+//    
+//    fileprivate let newLiveResult: (DataStack) -> Result
+//    
+//    fileprivate init(newLiveResult: @escaping (DataStack) -> Result) {
+//
+//        self.newLiveResult = newLiveResult
+//    }
+//    
+//    
+//    // MARK: Private
+//    
+////    private var nonMutatingWrappedValue: LazyNonmutating<Result> = .init { fatalError() }
+//    
+//    private var currentDataStack: DataStack?
+//    private var backingWrapper: ObservedObject<Result>?
+//    
+//    private mutating func set(dataStack: DataStack) -> Bool {
+//
+//        guard self.currentDataStack != dataStack else {
+//            
+//            return false
+//        }
+//        self.currentDataStack = dataStack
+//        if self.backingWrapper == nil {
+//
+//            self.backingWrapper = ObservedObject(wrappedValue: self.newLiveResult(dataStack))
+//        }
+//        else {
+//
+//            self.backingWrapper?.wrappedValue = self.newLiveResult(dataStack)
+//        }
+//        return true
+//    }
+//    
+//    
+//    // MARK: - LazyNonmutating
+//    
+//    fileprivate final class LazyNonmutating<Value> {
+//        
+//        // MARK: FilePrivate
+//        
+//        lazy var wrappedValue: Value = self.initializer()
+//
+//        init(_ initializer: @escaping () -> Value) {
+//            
+//            self.initializer = initializer
+//        }
+//        
+//
+//        // MARK: Private
+//        
+//        private var initializer: () -> Value
+//    }
+//}
+//
+//
+//#if canImport(UIKit) || canImport(AppKit)
+//
+//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//extension LiveQuery {
+//
+//    public init<D: DynamicObject>(liveList: LiveList<D>) where Result == LiveList<D> {
+//
+//        self.init(
+//            newLiveResult: { _ in liveList }
+//        )
+//    }
+//
+//    public init<D: DynamicObject>(_ clauseChain: FetchChainBuilder<D>) where Result == LiveList<D> {
+//        
+//        self.init(
+//            newLiveResult: { $0.liveList(clauseChain) }
+//        )
+//    }
+//
+//    public init<D: DynamicObject>(_ clauseChain: SectionMonitorChainBuilder<D>) where Result == LiveList<D> {
+//        
+//        self.init(
+//            newLiveResult: { $0.liveList(clauseChain) }
+//        )
+//    }
+//}
+//
+//#endif
+//
+//#endif

From 81dfb8e3e574830f05b3d66bd9740ebfa1233d2d Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 11 Oct 2019 07:47:49 +0900
Subject: [PATCH 10/58] WIP: editable datasources

---
 CoreStore.xcodeproj/project.pbxproj           |  64 +++-
 CoreStoreDemo/CoreStoreDemo/Info.plist        |   2 +
 .../SwiftUI Demo/SwiftUIView.swift            |  50 ++-
 Sources/DynamicObject.swift                   |  71 ++--
 ...Internals.DiffableDataSourceSnapshot.swift | 342 ++++++++++--------
 ...edDiffableDataSourceSnapshotDelegate.swift |  95 +++--
 Sources/Internals.LazyNonmutating.swift       |  94 +++++
 Sources/Internals.NotificationObserver.swift  |   2 +-
 ...Internals.SharedNotificationObserver.swift |  56 +++
 Sources/ListSnapshot.swift                    |  99 ++---
 Sources/LiveList.swift                        | 231 +++++++-----
 Sources/LiveObject.swift                      | 285 +++++++++++++++
 Sources/LiveResult.swift                      |   3 +
 Sources/NSManagedObject+Logging.swift         |  20 +-
 .../NSManagedObjectContext+CoreStore.swift    |  29 ++
 Sources/NSManagedObjectContext+Logging.swift  |  61 ++++
 Sources/ObjectSnapshot.swift                  | 204 ++++++-----
 Sources/Relationship.swift                    |  15 +
 Sources/RelationshipProtocol.swift            |   1 +
 Sources/Transformable.swift                   |   4 +-
 Sources/Value.swift                           |   4 +-
 21 files changed, 1253 insertions(+), 479 deletions(-)
 create mode 100644 Sources/Internals.LazyNonmutating.swift
 create mode 100644 Sources/Internals.SharedNotificationObserver.swift
 create mode 100644 Sources/LiveObject.swift
 create mode 100644 Sources/NSManagedObjectContext+Logging.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index c96128e..7a4a8d6 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -188,6 +188,14 @@
 		B52557881D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
 		B52557891D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
 		B525578A1D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
+		B5277672234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */; };
+		B5277673234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */; };
+		B5277674234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */; };
+		B5277675234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */; };
+		B5277677234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */; };
+		B5277678234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */; };
+		B5277679234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */; };
+		B527767A234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */; };
 		B52DD17E1BE1F8CD00949AFE /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52DD1741BE1F8CC00949AFE /* CoreStore.framework */; };
 		B52DD1931BE1F8FD00949AFE /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B52DD1941BE1F92500949AFE /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
@@ -552,6 +560,18 @@
 		B5BF7FBD234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
 		B5BF7FBE234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
 		B5BF7FBF234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
+		B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
+		B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
+		B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
+		B5BF7FC4234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
+		B5BF7FC6234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
+		B5BF7FC7234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
+		B5BF7FC8234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
+		B5BF7FC9234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
+		B5BF7FCB234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */; };
+		B5BF7FCC234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */; };
+		B5BF7FCD234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */; };
+		B5BF7FCE234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */; };
 		B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
 		B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
 		B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
@@ -670,10 +690,6 @@
 		B5E41EC11EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC21EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC31EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
-		B5E5FA4E22D162F400330931 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */; };
-		B5E5FA4F22D162F400330931 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */; };
-		B5E5FA5022D162F400330931 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */; };
-		B5E5FA5122D162F400330931 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */; };
 		B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; };
 		B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; };
 		B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; };
@@ -872,6 +888,8 @@
 		B525577F1D029D2500E51965 /* TweakTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TweakTests.swift; sourceTree = "<group>"; };
 		B52557831D02A07400E51965 /* SectionByTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionByTests.swift; sourceTree = "<group>"; };
 		B52557871D02DE8100E51965 /* FetchTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchTests.swift; sourceTree = "<group>"; };
+		B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Logging.swift"; sourceTree = "<group>"; };
+		B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.SharedNotificationObserver.swift; sourceTree = "<group>"; };
 		B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		B52F742E1E9B50D0005F3DAC /* SchemaHistory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchemaHistory.swift; sourceTree = "<group>"; };
@@ -962,6 +980,9 @@
 		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
 		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.TableView.swift; sourceTree = "<group>"; };
 		B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FallbackDiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
+		B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveObject.swift; sourceTree = "<group>"; };
+		B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
+		B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.LazyNonmutating.swift; sourceTree = "<group>"; };
 		B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UnsafeDataTransaction+Observing.swift"; sourceTree = "<group>"; };
 		B5C976E61C6E3A5900B1AF90 /* Internals.CoreStoreFetchedResultsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.CoreStoreFetchedResultsController.swift; sourceTree = "<group>"; };
 		B5CA2B071F7E5ACA004B1936 /* WhereClauseType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhereClauseType.swift; sourceTree = "<group>"; };
@@ -1002,7 +1023,6 @@
 		B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSUnsafeDataTransaction.swift; sourceTree = "<group>"; };
 		B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotResult.swift; sourceTree = "<group>"; };
 		B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DynamicSchema+Convenience.swift"; sourceTree = "<group>"; };
-		B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
 		B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
 		B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		B5E84ED91AFF82360064E85B /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
@@ -1527,9 +1547,10 @@
 				B5F849702348A6690029D57B /* EnvironmentKeys.swift */,
 				B5F84966234887EB0029D57B /* LiveQuery.swift */,
 				B50132292344ECB500FC238B /* LiveList.swift */,
+				B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */,
 				B5F8496B234898240029D57B /* ListSnapshot.swift */,
+				B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */,
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
-				B5E5FA4D22D162F400330931 /* ObjectSnapshot.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 				B5F335572348D75D00FD649F /* LiveResult.swift */,
 				B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */,
@@ -1664,13 +1685,15 @@
 				B533C4DA1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift */,
 				B5C976E61C6E3A5900B1AF90 /* Internals.CoreStoreFetchedResultsController.swift */,
 				B5474D142227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift */,
-				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
 				B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */,
+				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
 				B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */,
-				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
 				B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */,
+				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
+				B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */,
 				B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */,
 				B5E84F2B1AFF849C0064E85B /* Internals.NotificationObserver.swift */,
+				B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */,
 				B5DE522A230BD7CC00A22534 /* Internals.swift */,
 				B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */,
 				B51260881E9B252B00402229 /* NSEntityDescription+DynamicModel.swift */,
@@ -1678,6 +1701,7 @@
 				B58D0C621EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift */,
 				B52FD3A91E3B3EF10001D919 /* NSManagedObject+Logging.swift */,
 				B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */,
+				B5277671234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift */,
 				B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */,
 				B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */,
 				B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */,
@@ -2049,7 +2073,7 @@
 				B5831B751F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */,
 				B5D8CA762346E7590055D7D1 /* DataStack+DataSources.swift in Sources */,
-				B5E5FA4E22D162F400330931 /* ObjectSnapshot.swift in Sources */,
+				B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B5E1B5A81CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
@@ -2061,6 +2085,7 @@
 				B509C7F41E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */,
 				B5E1B5931CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
+				B5277677234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */,
 				B5ECDC291CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B5F335582348D75D00FD649F /* LiveResult.swift in Sources */,
@@ -2103,12 +2128,14 @@
 				B50EE14223473C92009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
 				B5E84EF61AFF846E0064E85B /* DataStack+Transaction.swift in Sources */,
 				B5FEC18E1C9166E200532541 /* NSPersistentStore+Setup.swift in Sources */,
+				B5BF7FCB234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B596BBB61DD5BC67001DCDD9 /* FetchableSource.swift in Sources */,
 				B5E1B5A21CAA4365007FD580 /* CSCoreStore+Observing.swift in Sources */,
 				B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */,
 				B53304AA230BA4F7007C2BD8 /* DynamicObjectMeta.swift in Sources */,
 				B59AFF411C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
 				B5E84F231AFF84860064E85B /* ListMonitor.swift in Sources */,
+				B5BF7FC6234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B5E84EF71AFF846E0064E85B /* UnsafeDataTransaction.swift in Sources */,
 				B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */,
 				B5D339DD1E9489C700C880DE /* DynamicObject.swift in Sources */,
@@ -2170,6 +2197,7 @@
 				B53FBA041CAB300C00F0D40A /* CSMigrationType.swift in Sources */,
 				B5E84EF41AFF846E0064E85B /* AsynchronousDataTransaction.swift in Sources */,
 				B5831B701F34AC3400A9F647 /* AttributeProtocol.swift in Sources */,
+				B5277672234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */,
 				B5DBE2CD1C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
 				B546F95D1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
 				B5D339E71E9493A500C880DE /* Entity.swift in Sources */,
@@ -2236,11 +2264,13 @@
 				82BA18CE1C4BBD7100A0916E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B56923FB1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514EB1EED8BF900BAB888 /* From+Querying.swift in Sources */,
+				B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBC1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC011CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B5ECDC071CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B59A1CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
 				B5519A601CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
+				B5277678234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */,
 				B52FD3AB1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
 				B52F74421E9B8724005F3DAC /* UnsafeDataModelSchema.swift in Sources */,
 				B51FE5AD1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
@@ -2254,11 +2284,11 @@
 				82BA18A51C4BBD2200A0916E /* CoreStore+Setup.swift in Sources */,
 				82BA18BD1C4BBD4A00A0916E /* GroupBy.swift in Sources */,
 				B5ECDC1F1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
+				B5BF7FCC234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B53FBA141CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B761F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
-				B5E5FA4F22D162F400330931 /* ObjectSnapshot.swift in Sources */,
 				B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5E1B5AA1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5D339F21E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
@@ -2362,6 +2392,7 @@
 				82BA18D31C4BBD7100A0916E /* NSManagedObjectContext+CoreStore.swift in Sources */,
 				82BA18AD1C4BBD3100A0916E /* UnsafeDataTransaction.swift in Sources */,
 				B546F96A1C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
+				B5277673234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */,
 				B5831B7B1F34ACBA00A9F647 /* Transformable.swift in Sources */,
 				82BA18A81C4BBD2900A0916E /* CoreStoreLogger.swift in Sources */,
 				B549F65F1E569C7400FBAB2D /* QueryableAttributeType.swift in Sources */,
@@ -2387,6 +2418,7 @@
 				B546F95E1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
 				B5ECDC0D1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5D339E81E9493A500C880DE /* Entity.swift in Sources */,
+				B5BF7FC7234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				82BA18CC1C4BBD6400A0916E /* Progress+Convenience.swift in Sources */,
 				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */,
@@ -2448,11 +2480,13 @@
 				B52DD1951BE1F92500949AFE /* CoreStoreError.swift in Sources */,
 				B56923FD1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514ED1EED8BF900BAB888 /* From+Querying.swift in Sources */,
+				B5BF7FC4234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBE1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B546F9601C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
 				B5ECDC0F1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5ECDC211CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B52DD1C21BE1F94600949AFE /* Internals.MigrationManager.swift in Sources */,
+				B527767A234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */,
 				B52FD3AD1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
 				B52F74441E9B8724005F3DAC /* UnsafeDataModelSchema.swift in Sources */,
 				B5ECDC2D1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
@@ -2466,11 +2500,11 @@
 				B546F95B1C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
 				B52DD1A11BE1F92C00949AFE /* DataStack+Transaction.swift in Sources */,
 				B5220E1C1D130801009BC71E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
+				B5BF7FCE234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B52DD19E1BE1F92C00949AFE /* AsynchronousDataTransaction.swift in Sources */,
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B52DD1981BE1F92500949AFE /* CoreStore+Setup.swift in Sources */,
-				B5E5FA5122D162F400330931 /* ObjectSnapshot.swift in Sources */,
 				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5D339F41E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5220E241D13085E009BC71E /* NSFetchedResultsController+Convenience.swift in Sources */,
@@ -2574,6 +2608,7 @@
 				B5ECDC331CA81CDC00C7F112 /* CSCoreStore+Transaction.swift in Sources */,
 				B52DD1BB1BE1F94000949AFE /* MigrationType.swift in Sources */,
 				B5831B7D1F34ACBA00A9F647 /* Transformable.swift in Sources */,
+				B5277675234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */,
 				B52DD1C91BE1F94600949AFE /* NSManagedObjectContext+Transaction.swift in Sources */,
 				B5220E151D130663009BC71E /* CoreStore+Observing.swift in Sources */,
 				B549F6611E569C7400FBAB2D /* QueryableAttributeType.swift in Sources */,
@@ -2599,6 +2634,7 @@
 				B5AEFAB81C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
 				B598514B1C90289F00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
 				B5D339EA1E9493A500C880DE /* Entity.swift in Sources */,
+				B5BF7FC9234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B52DD1AA1BE1F93500949AFE /* TypeErasedClauses.swift in Sources */,
 				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				B53FBA021CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
@@ -2660,11 +2696,13 @@
 				B5ECDC021CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B56923FC1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514EC1EED8BF900BAB888 /* From+Querying.swift in Sources */,
+				B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBD1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC081CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B59B1CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
 				B5519A611CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
 				B5FE4DAE1C85D44E00FA6A91 /* SQLiteStore.swift in Sources */,
+				B5277679234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */,
 				B52FD3AC1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
 				B52F74431E9B8724005F3DAC /* UnsafeDataModelSchema.swift in Sources */,
 				B51FE5AE1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
@@ -2678,11 +2716,11 @@
 				B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */,
 				B5ECDC201CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
+				B5BF7FCD234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B53FBA151CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5E1B5AB1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5831B771F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
-				B5E5FA5022D162F400330931 /* ObjectSnapshot.swift in Sources */,
 				B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5D339F31E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5E1B5A01CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
@@ -2786,6 +2824,7 @@
 				B56321B11BD6521C006C9394 /* NSManagedObjectContext+CoreStore.swift in Sources */,
 				B563218D1BD65216006C9394 /* CoreStore+Transaction.swift in Sources */,
 				B546F96B1C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
+				B5277674234F1AEB0056BE9F /* NSManagedObjectContext+Logging.swift in Sources */,
 				B5831B7C1F34ACBA00A9F647 /* Transformable.swift in Sources */,
 				B563218B1BD65216006C9394 /* UnsafeDataTransaction.swift in Sources */,
 				B549F6601E569C7400FBAB2D /* QueryableAttributeType.swift in Sources */,
@@ -2811,6 +2850,7 @@
 				B546F95F1C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
 				B5ECDC0E1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5D339E91E9493A500C880DE /* Entity.swift in Sources */,
+				B5BF7FC8234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */,
 				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
 				B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/Info.plist b/CoreStoreDemo/CoreStoreDemo/Info.plist
index 15874fa..c99470e 100644
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/CoreStoreDemo/CoreStoreDemo/Info.plist
@@ -50,5 +50,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIUserInterfaceStyle</key>
+	<string>light</string>
 </dict>
 </plist>
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 107ead4..a2d73ac 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -19,30 +19,36 @@ struct SwiftUIView: View {
 
     @ObservedObject
     var palettes: LiveList<Palette>
-    
-    @State
-    private var needsShowAlert = false
+
+    @available(iOS 13.0.0, *)
+    struct ColorCell: View {
+
+        @ObservedObject
+        var palette: LiveObject<Palette>
+
+        var body: some View {
+            HStack {
+                Color(palette.color)
+                    .cornerRadius(5)
+                    .frame(width: 30, height: 30, alignment: .leading)
+                Text(palette.colorText)
+            }
+        }
+    }
 
     var body: some View {
         NavigationView {
             List {
-                ForEach(palettes.snapshot.sectionIdentifiers, id: \.self) { (sectionID: String) in
+                ForEach(palettes.sections, id: \.self) { (sectionID) in
                     Section(header: Text(sectionID)) {
-                        ForEach(self.palettes.snapshot[section: sectionID], id: \.self) { palette in
+                        ForEach(self.palettes[section: sectionID], id: \.self) { palette in
                             NavigationLink(
                                 destination: DetailView(palette: palette),
-                                label: {
-                                    HStack {
-                                        Color(palette.color)
-                                            .cornerRadius(5)
-                                            .frame(width: 30, height: 30, alignment: .leading)
-                                        Text(palette.colorText)
-                                    }
-                                }
+                                label: { ColorCell(palette: palette) }
                             )
                         }
                         .onDelete { itemIndices in
-                            let objectsToDelete = self.palettes.snapshot[section: sectionID, itemIndices: itemIndices]
+                            let objectsToDelete = self.palettes[section: sectionID, itemIndices: itemIndices].map({ $0.object })
                             self.dataStack.perform(
                                 asynchronous: { transaction in
 
@@ -91,6 +97,9 @@ struct SwiftUIView: View {
         }
         .colorScheme(.dark)
     }
+
+    @State
+    private var needsShowAlert = false
 }
 
 @available(iOS 13.0.0, *)
@@ -98,19 +107,20 @@ struct DetailView: View {
 
     @Environment(\.dataStack)
     var dataStack: DataStack
-    
-    @ObservedObject var palette: Palette
+
+    @ObservedObject
+    var palette: LiveObject<Palette>
 
     @State var hue: Float = 0
     @State var saturation: Float = 0
     @State var brightness: Float = 0
 
-    init(palette: Palette) {
+    init(palette: LiveObject<Palette>) {
 
         self.palette = palette
-        self.hue = Float(palette.hue.value)
-        self.saturation = palette.saturation.value
-        self.brightness = palette.brightness.value
+        self.hue = Float(palette.hue)
+        self.saturation = palette.saturation
+        self.brightness = palette.brightness
     }
 
     var body: some View {
diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift
index 0cf760d..d5054aa 100644
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -43,7 +43,12 @@ 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
-    
+
+    /**
+     Used internally by CoreStore. Do not call directly.
+     */
+    static func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any]
+
     /**
      Used internally by CoreStore. Do not call directly.
      */
@@ -97,6 +102,13 @@ extension NSManagedObject: DynamicObject {
         }
         return object
     }
+
+    public class func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any] {
+
+        let object = context.fetchExisting(id)! as Self
+        let rawObject = object.cs_toRaw()
+        return rawObject.dictionaryWithValues(forKeys: rawObject.entity.properties.map({ $0.name }))
+    }
     
     public class func cs_fromRaw(object: NSManagedObject) -> Self {
         
@@ -119,16 +131,6 @@ extension NSManagedObject: DynamicObject {
     }
 }
 
-extension DynamicObject where Self: NSManagedObject {
-    
-    // MARK: Public
-    
-    public func createSnapshot() -> ObjectSnapshot<Self> {
-        
-        return ObjectSnapshot(from: self)
-    }
-}
-
 
 // MARK: - CoreStoreObject
 
@@ -146,6 +148,43 @@ extension CoreStoreObject {
         }
         return self.cs_fromRaw(object: object)
     }
+
+    public class func cs_snapshotDictionary(id: ObjectID, context: NSManagedObjectContext) -> [String: Any] {
+
+        func initializeAttributes(mirror: Mirror, object: Self, into attributes: inout [KeyPathString: Any]) {
+
+            if let superClassMirror = mirror.superclassMirror {
+
+                initializeAttributes(
+                    mirror: superClassMirror,
+                    object: object,
+                    into: &attributes
+                )
+            }
+            for child in mirror.children {
+
+                switch child.value {
+
+                case let property as AttributeProtocol:
+                    attributes[property.keyPath] = property.valueForSnapshot
+
+                case let property as RelationshipProtocol:
+                    attributes[property.keyPath] = property.valueForSnapshot
+
+                default:
+                    continue
+                }
+            }
+        }
+        let object = context.fetchExisting(id)! as Self
+        var values: [KeyPathString: Any] = [:]
+        initializeAttributes(
+            mirror: Mirror(reflecting: object),
+            object: object,
+            into: &values
+        )
+        return values
+    }
     
     public class func cs_fromRaw(object: NSManagedObject) -> Self {
         
@@ -181,13 +220,3 @@ extension CoreStoreObject {
         return self.rawObject!
     }
 }
-
-extension DynamicObject where Self: CoreStoreObject {
-    
-    // MARK: Public
-    
-    public func createSnapshot() -> ObjectSnapshot<Self> {
-        
-        return ObjectSnapshot(from: self)
-    }
-}
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index 65f8057..f5afcf9 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -40,88 +40,111 @@ import AppKit
 
 extension Internals {
 
-    // MARK: Internal
 
-    internal typealias DiffableDataSourceSnapshot = _Internal_DiffableDataSourceSnapshot
-
-
-    // MARK: - FallbackDiffableDataSourceSnapshot
+    // MARK: - DiffableDataSourceSnapshot
 
     // Implementation based on https://github.com/ra1028/DiffableDataSources
-    internal struct FallbackDiffableDataSourceSnapshot: DiffableDataSourceSnapshot {
+    internal struct DiffableDataSourceSnapshot {
 
         // MARK: Internal
 
-        init(sections: [NSFetchedResultsSectionInfo]) {
-
-            self.structure = .init(sections: sections)
-        }
-
-        // MARK: DiffableDataSourceSnapshot
+        internal let nextStateTag: UUID
 
         init() {
 
             self.structure = .init()
+            self.nextStateTag = .init()
+        }
+
+        init(sections: [NSFetchedResultsSectionInfo], previousStateTag: UUID, nextStateTag: UUID) {
+
+            self.structure = .init(sections: sections, previousStateTag: previousStateTag)
+            self.nextStateTag = nextStateTag
         }
 
         var numberOfItems: Int {
 
-            return self.itemIdentifiers.count
+            return self.structure.allItemIDs.count
         }
 
         var numberOfSections: Int {
 
-            return self.sectionIdentifiers.count
+            return self.structure.allSectionIDs.count
         }
 
-        var sectionIdentifiers: [NSString] {
+        var allSectionIDs: [String] {
 
             return self.structure.allSectionIDs
         }
 
-        var itemIdentifiers: [NSManagedObjectID] {
+        var allSectionStateIDs: [SectionStateID] {
 
-            self.structure.allItemIDs
+            return self.structure.allSectionStateIDs
         }
 
-        func numberOfItems(inSection identifier: NSString) -> Int {
+        var allItemIDs: [NSManagedObjectID] {
 
-            return self.itemIdentifiers(inSection: identifier).count
+            return self.structure.allItemIDs
         }
 
-        func itemIdentifiers(inSection identifier: NSString) -> [NSManagedObjectID] {
+        var allItemStateIDs: [ItemStateID] {
+
+            return self.structure.allItemStateIDs
+        }
+
+        func numberOfItems(inSection identifier: String) -> Int {
+
+            return self.itemIDs(inSection: identifier).count
+        }
+
+        func itemIDs(inSection identifier: String) -> [NSManagedObjectID] {
 
             return self.structure.items(in: identifier)
         }
 
-        func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> NSString? {
+        func itemStateIDs(inSection identifier: String) -> [ItemStateID] {
+
+            return self.structure.itemStateIDs(in: identifier)
+        }
+
+        func sectionIDs(containingItem identifier: NSManagedObjectID) -> String? {
 
             return self.structure.section(containing: identifier)
         }
 
-        func indexOfItem(_ identifier: NSManagedObjectID) -> Int? {
+        func sectionStateIDs(containingItem identifier: NSManagedObjectID) -> SectionStateID? {
 
-            return self.itemIdentifiers.firstIndex(of: identifier)
+            return self.structure.sectionStateID(containing: identifier)
         }
 
-        func indexOfSection(_ identifier: NSString) -> Int? {
+        func indexOfItemID(_ identifier: NSManagedObjectID) -> Int? {
 
-            return self.sectionIdentifiers.firstIndex(of: identifier)
+            return self.structure.allItemIDs.firstIndex(of: identifier)
         }
 
-        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: NSString?) {
+        func indexOfSectionID(_ identifier: String) -> Int? {
 
-            self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
+            return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
 
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID) {
+        func itemIDs(where stateCondition: @escaping (UUID) -> Bool) -> [NSManagedObjectID] {
 
-            self.structure.insert(itemIDs: identifiers, before: beforeIdentifier)
+            return self.structure.itemsIDs(where: stateCondition)
         }
 
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID) {
+        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?, nextStateTag: UUID) {
 
-            self.structure.insert(itemIDs: identifiers, after: afterIdentifier)
+            self.structure.append(itemIDs: identifiers, to: sectionIdentifier, nextStateTag: nextStateTag)
+        }
+
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID, nextStateTag: UUID) {
+
+            self.structure.insert(itemIDs: identifiers, before: beforeIdentifier, nextStateTag: nextStateTag)
+        }
+
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID, nextStateTag: UUID) {
+
+            self.structure.insert(itemIDs: identifiers, after: afterIdentifier, nextStateTag: nextStateTag)
         }
 
         mutating func deleteItems(_ identifiers: [NSManagedObjectID]) {
@@ -144,44 +167,44 @@ extension Internals {
             self.structure.move(itemID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadItems(_ identifiers: [NSManagedObjectID]) {
+        mutating func reloadItems<S: Sequence>(_ identifiers: S, nextStateTag: UUID) where S.Element == NSManagedObjectID {
 
-            self.structure.update(itemIDs: identifiers)
+            self.structure.update(itemIDs: identifiers, nextStateTag: nextStateTag)
         }
 
-        mutating func appendSections(_ identifiers: [NSString]) {
+        mutating func appendSections(_ identifiers: [String], nextStateTag: UUID) {
 
-            self.structure.append(sectionIDs: identifiers)
+            self.structure.append(sectionIDs: identifiers, nextStateTag: nextStateTag)
         }
 
-        mutating func insertSections(_ identifiers: [NSString], beforeSection toIdentifier: NSString) {
+        mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String, nextStateTag: UUID) {
 
-            self.structure.insert(sectionIDs: identifiers, before: toIdentifier)
+            self.structure.insert(sectionIDs: identifiers, before: toIdentifier, nextStateTag: nextStateTag)
         }
 
-        mutating func insertSections(_ identifiers: [NSString], afterSection toIdentifier: NSString) {
+        mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String, nextStateTag: UUID) {
 
-            self.structure.insert(sectionIDs: identifiers, after: toIdentifier)
+            self.structure.insert(sectionIDs: identifiers, after: toIdentifier, nextStateTag: nextStateTag)
         }
 
-        mutating func deleteSections(_ identifiers: [NSString]) {
+        mutating func deleteSections(_ identifiers: [String]) {
 
             self.structure.remove(sectionIDs: identifiers)
         }
 
-        mutating func moveSection(_ identifier: NSString, beforeSection toIdentifier: NSString) {
+        mutating func moveSection(_ identifier: String, beforeSection toIdentifier: String) {
 
             self.structure.move(sectionID: identifier, before: toIdentifier)
         }
 
-        mutating func moveSection(_ identifier: NSString, afterSection toIdentifier: NSString) {
+        mutating func moveSection(_ identifier: String, afterSection toIdentifier: String) {
 
             self.structure.move(sectionID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadSections(_ identifiers: [NSString]) {
+        mutating func reloadSections<S: Sequence>(_ identifiers: S, nextStateTag: UUID) where S.Element == String {
 
-            self.structure.update(sectionIDs: identifiers)
+            self.structure.update(sectionIDs: identifiers, nextStateTag: nextStateTag)
         }
 
 
@@ -190,9 +213,54 @@ extension Internals {
         private var structure: BackingStructure
 
 
+        // MARK: - ItemStateID
+
+        internal struct ItemStateID: Identifiable, Equatable {
+
+            let stateTag: UUID
+
+            init(id: NSManagedObjectID, stateTag: UUID) {
+
+                self.id = id
+                self.stateTag = stateTag
+            }
+
+            func isContentEqual(to source: ItemStateID) -> Bool {
+
+                return self.id == source.id && self.stateTag == source.stateTag
+            }
+
+            // MARK: Identifiable
+
+            let id: NSManagedObjectID
+        }
+
+
+        // MARK: - SectionStateID
+
+        internal struct SectionStateID: Identifiable, Equatable {
+
+            let stateTag: UUID
+
+            init(id: String, stateTag: UUID) {
+                self.id = id
+                self.stateTag = stateTag
+            }
+
+            func isContentEqual(to source: SectionStateID) -> Bool {
+
+                return self.id == source.id && self.stateTag == source.stateTag
+            }
+
+            // MARK: Identifiable
+
+            let id: String
+        }
+
+
         // MARK: - BackingStructure
 
-        internal struct BackingStructure {
+        fileprivate struct BackingStructure {
 
             // MARK: Internal
 
@@ -203,31 +271,41 @@ extension Internals {
                 self.sections = []
             }
 
-            init(sections: [NSFetchedResultsSectionInfo]) {
+            init(sections: [NSFetchedResultsSectionInfo], previousStateTag: UUID) {
 
                 self.sections = sections.map {
 
                     Section(
-                        id: $0.name as NSString,
+                        id: $0.name,
                         items: $0.objects?
                             .compactMap({ ($0 as? NSManagedObject)?.objectID })
-                            .map(Item.init(id:)) ?? [],
-                        isReloaded: false
+                            .map({ Item(id: $0, stateTag: previousStateTag) }) ?? [],
+                        stateTag: previousStateTag
                     )
                 }
             }
 
-            var allSectionIDs: [NSString] {
+            var allSectionIDs: [String] {
 
                 return self.sections.map({ $0.id })
             }
 
+            var allSectionStateIDs: [SectionStateID] {
+
+                return self.sections.map({ $0.stateID })
+            }
+
             var allItemIDs: [NSManagedObjectID] {
 
                 return self.sections.lazy.flatMap({ $0.elements }).map({ $0.id })
             }
 
-            func items(in sectionID: NSString) -> [NSManagedObjectID] {
+            var allItemStateIDs: [ItemStateID] {
+
+                return self.sections.lazy.flatMap({ $0.elements }).map({ $0.stateID })
+            }
+
+            func items(in sectionID: String) -> [NSManagedObjectID] {
 
                 guard let sectionIndex = self.sectionIndex(of: sectionID) else {
 
@@ -236,12 +314,33 @@ extension Internals {
                 return self.sections[sectionIndex].elements.map({ $0.id })
             }
 
-            func section(containing itemID: NSManagedObjectID) -> NSString? {
+            func itemsIDs(where stateCondition: @escaping (UUID) -> Bool) -> [NSManagedObjectID] {
+
+                return self.sections.lazy
+                    .flatMap({ $0.elements.filter({ stateCondition($0.stateTag) }) })
+                    .map({ $0.id })
+            }
+
+            func itemStateIDs(in sectionID: String) -> [ItemStateID] {
+
+                guard let sectionIndex = self.sectionIndex(of: sectionID) else {
+
+                    Internals.abort("Section \"\(sectionID)\" does not exist")
+                }
+                return self.sections[sectionIndex].elements.map({ $0.stateID })
+            }
+
+            func section(containing itemID: NSManagedObjectID) -> String? {
 
                 return self.itemPositionMap()[itemID]?.section.id
             }
 
-            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: NSString?) {
+            func sectionStateID(containing itemID: NSManagedObjectID) -> SectionStateID? {
+
+                return self.itemPositionMap()[itemID]?.section.stateID
+            }
+
+            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?, nextStateTag: UUID) {
 
                 let index: Array<Section>.Index
                 if let sectionID = sectionID {
@@ -261,23 +360,22 @@ extension Internals {
                     }
                     index = section.index(before: section.endIndex)
                 }
-
-                let items = itemIDs.lazy.map(Item.init)
+                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
                 self.sections[index].elements.append(contentsOf: items)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID) {
+            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID, nextStateTag: UUID) {
 
                 guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
 
                     Internals.abort("Item \(beforeItemID) does not exist")
                 }
-                let items = itemIDs.lazy.map(Item.init)
+                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemPosition.itemRelativeIndex)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID) {
+            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID, nextStateTag: UUID) {
 
                 guard let itemPosition = self.itemPositionMap()[afterItemID] else {
 
@@ -285,7 +383,7 @@ extension Internals {
                 }
                 let itemIndex = self.sections[itemPosition.sectionIndex].elements
                     .index(after: itemPosition.itemRelativeIndex)
-                let items = itemIDs.lazy.map(Item.init)
+                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemIndex)
             }
@@ -351,47 +449,48 @@ extension Internals {
                     .insert(removed, at: itemIndex)
             }
 
-            mutating func update(itemIDs: [NSManagedObjectID]) {
+            mutating func update<S: Sequence>(itemIDs: S, nextStateTag: UUID) where S.Element == NSManagedObjectID {
 
                 let itemPositionMap = self.itemPositionMap()
                 for itemID in itemIDs {
 
                     guard let itemPosition = itemPositionMap[itemID] else {
 
-                        Internals.abort("Item \(itemID) does not exist")
+                        continue
                     }
-                    self.sections[itemPosition.sectionIndex].elements[itemPosition.itemRelativeIndex].isReloaded = true
+                    self.sections[itemPosition.sectionIndex]
+                        .elements[itemPosition.itemRelativeIndex].stateTag = nextStateTag
                 }
             }
 
-            mutating func append(sectionIDs: [NSString]) {
+            mutating func append(sectionIDs: [String], nextStateTag: UUID) {
 
-                let newSections = sectionIDs.lazy.map(Section.init)
+                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
                 self.sections.append(contentsOf: newSections)
             }
 
-            mutating func insert(sectionIDs: [NSString], before beforeSectionID: NSString) {
+            mutating func insert(sectionIDs: [String], before beforeSectionID: String, nextStateTag: UUID) {
 
                 guard let sectionIndex = self.sectionIndex(of: beforeSectionID) else {
 
                     Internals.abort("Section \"\(beforeSectionID)\" does not exist")
                 }
-                let newSections = sectionIDs.lazy.map(Section.init)
+                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
-            mutating func insert(sectionIDs: [NSString], after afterSectionID: NSString) {
+            mutating func insert(sectionIDs: [String], after afterSectionID: String, nextStateTag: UUID) {
 
                 guard let beforeIndex = self.sectionIndex(of: afterSectionID) else {
 
                     Internals.abort("Section \"\(afterSectionID)\" does not exist")
                 }
                 let sectionIndex = self.sections.index(after: beforeIndex)
-                let newSections = sectionIDs.lazy.map(Section.init)
+                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
-            mutating func remove(sectionIDs: [NSString]) {
+            mutating func remove(sectionIDs: [String]) {
 
                 for sectionID in sectionIDs {
 
@@ -399,7 +498,7 @@ extension Internals {
                 }
             }
 
-            mutating func move(sectionID: NSString, before beforeSectionID: NSString) {
+            mutating func move(sectionID: String, before beforeSectionID: String) {
 
                 guard let removed = self.remove(sectionID: sectionID) else {
 
@@ -412,7 +511,7 @@ extension Internals {
                 self.sections.insert(removed, at: sectionIndex)
             }
 
-            mutating func move(sectionID: NSString, after afterSectionID: NSString) {
+            mutating func move(sectionID: String, after afterSectionID: String) {
 
                 guard let removed = self.remove(sectionID: sectionID) else {
 
@@ -426,7 +525,7 @@ extension Internals {
                 self.sections.insert(removed, at: sectionIndex)
             }
 
-            mutating func update(sectionIDs: [NSString]) {
+            mutating func update<S: Sequence>(sectionIDs: S, nextStateTag: UUID) where S.Element == String {
 
                 for sectionID in sectionIDs {
 
@@ -434,14 +533,16 @@ extension Internals {
 
                         continue
                     }
-                    self.sections[sectionIndex].isReloaded = true
+                    self.sections[sectionIndex].stateTag = nextStateTag
                 }
             }
 
 
             // MARK: Private
 
-            private func sectionIndex(of sectionID: NSString) -> Array<Section>.Index? {
+            private static let zeroUUID: UUID = .init(uuid: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+
+            private func sectionIndex(of sectionID: String) -> Array<Section>.Index? {
 
                 return self.sections.firstIndex(where: { $0.id == sectionID })
             }
@@ -458,7 +559,7 @@ extension Internals {
             }
 
             @discardableResult
-            private mutating func remove(sectionID: NSString) -> Section? {
+            private mutating func remove(sectionID: String) -> Section? {
 
                 guard let sectionIndex = self.sectionIndex(of: sectionID) else {
 
@@ -486,63 +587,63 @@ extension Internals {
 
             // MARK: - Item
 
-            internal struct Item: Identifiable, Equatable {
+            fileprivate struct Item: Identifiable, Equatable {
 
-                var isReloaded: Bool
+                var stateTag: UUID
 
-                init(id: NSManagedObjectID, isReloaded: Bool) {
+                init(id: NSManagedObjectID, stateTag: UUID) {
 
                     self.id = id
-                    self.isReloaded = isReloaded
+                    self.stateTag = stateTag
                 }
 
-                init(id: NSManagedObjectID) {
+                var stateID: ItemStateID {
 
-                    self.init(id: id, isReloaded: false)
+                    return .init(id: self.id, stateTag: self.stateTag)
                 }
 
                 func isContentEqual(to source: Item) -> Bool {
 
-                    return !self.isReloaded && self.id == source.id
+                    return self.id == source.id && self.stateTag == source.stateTag
                 }
 
                 // MARK: Identifiable
 
-                var id: NSManagedObjectID
+                let id: NSManagedObjectID
             }
 
 
             // MARK: - Section
 
-            internal struct Section: Identifiable, Equatable {
+            fileprivate struct Section: Identifiable, Equatable {
 
                 var elements: [Item] = []
-                var isReloaded: Bool
+                var stateTag: UUID
 
-                init(id: NSString, items: [Item], isReloaded: Bool) {
+                init(id: String, items: [Item] = [], stateTag: UUID) {
                     self.id = id
                     self.elements = items
-                    self.isReloaded = isReloaded
-                }
-
-                init(id: NSString) {
-
-                    self.init(id: id, items: [], isReloaded: false)
+                    self.stateTag = stateTag
                 }
 
                 init<S: Sequence>(source: Section, elements: S) where S.Element == Item {
 
-                    self.init(id: source.id, items: Array(elements), isReloaded: source.isReloaded)
+                    self.init(id: source.id, items: Array(elements), stateTag: source.stateTag)
+                }
+
+                var stateID: SectionStateID {
+
+                    return .init(id: self.id, stateTag: self.stateTag)
                 }
 
                 func isContentEqual(to source: Section) -> Bool {
 
-                    return !self.isReloaded && self.id == source.id
+                    return self.id == source.id && self.stateTag == source.stateTag
                 }
 
                 // MARK: Identifiable
 
-                var id: NSString
+                let id: String
             }
 
 
@@ -550,57 +651,14 @@ extension Internals {
 
             fileprivate struct ItemPosition {
 
-                var item: Item
-                var itemRelativeIndex: Int
-                var section: Section
-                var sectionIndex: Int
+                let item: Item
+                let itemRelativeIndex: Int
+                let section: Section
+                let sectionIndex: Int
             }
         }
     }
 }
 
 
-// MARK: - NSDiffableDataSourceSnapshot: Internals.DiffableDataSourceSnapshot
-
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-extension NSDiffableDataSourceSnapshot: Internals.DiffableDataSourceSnapshot where SectionIdentifierType == NSString, ItemIdentifierType == NSManagedObjectID {}
-
-
-// MARK: - Internals.DiffableDataSourceSnapshot
-
-internal protocol _Internal_DiffableDataSourceSnapshot {
-
-    init()
-
-    var numberOfItems: Int { get }
-    var numberOfSections: Int { get }
-    var sectionIdentifiers: [NSString] { get }
-    var itemIdentifiers: [NSManagedObjectID] { get }
-
-    func numberOfItems(inSection identifier: NSString) -> Int
-    func itemIdentifiers(inSection identifier: NSString) -> [NSManagedObjectID]
-    func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> NSString?
-    func indexOfItem(_ identifier: NSManagedObjectID) -> Int?
-    func indexOfSection(_ identifier: NSString) -> Int?
-
-    mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: NSString?)
-    mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID)
-    mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID)
-    mutating func deleteItems(_ identifiers: [NSManagedObjectID])
-    mutating func deleteAllItems()
-    mutating func moveItem(_ identifier: NSManagedObjectID, beforeItem toIdentifier: NSManagedObjectID)
-    mutating func moveItem(_ identifier: NSManagedObjectID, afterItem toIdentifier: NSManagedObjectID)
-    mutating func reloadItems(_ identifiers: [NSManagedObjectID])
-    mutating func appendSections(_ identifiers: [NSString])
-    mutating func insertSections(_ identifiers: [NSString], beforeSection toIdentifier: NSString)
-    mutating func insertSections(_ identifiers: [NSString], afterSection toIdentifier: NSString)
-    mutating func deleteSections(_ identifiers: [NSString])
-    mutating func moveSection(_ identifier: NSString, beforeSection toIdentifier: NSString)
-    mutating func moveSection(_ identifier: NSString, afterSection toIdentifier: NSString)
-    mutating func reloadSections(_ identifiers: [NSString])
-}
-
-
-
-
 #endif
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 92f8f92..a9185f8 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -75,14 +75,14 @@ extension Internals {
 
         internal func initialFetch() {
 
-            #if canImport(UIKit) || canImport(AppKit)
-
-            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
-
-                return
-            }
-
-            #endif
+//            #if canImport(UIKit) || canImport(AppKit)
+//
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//
+//                return
+//            }
+//
+//            #endif
 
             guard let fetchedResultsController = self.fetchedResultsController else {
 
@@ -94,50 +94,65 @@ extension Internals {
 
         // MARK: NSFetchedResultsControllerDelegate
 
-        #if canImport(UIKit) || canImport(AppKit)
-
-        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
-
-            self.handler?.controller(
-                controller,
-                didChangContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-            )
-        }
-
-        #endif
-
-        @objc
-        dynamic func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
-
-            self.reloadedIDs = []
-        }
+//        #if canImport(UIKit) || canImport(AppKit)
+//
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//        @objc
+//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+//
+//            self.handler?.controller(
+//                controller,
+//                didChangContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+//            )
+//        }
+//
+//        #endif
         
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
 
+            let nextStateTag: UUID = .init()
+            var dataSourceSnapshot = Internals.DiffableDataSourceSnapshot(
+                sections: controller.sections ?? [],
+                previousStateTag: self.previousStateTag,
+                nextStateTag: nextStateTag
+            )
+            dataSourceSnapshot.reloadItems(self.reloadedItemIDs, nextStateTag: nextStateTag)
+            dataSourceSnapshot.reloadSections(self.reloadedSectionIDs, nextStateTag: nextStateTag)
+
             self.handler?.controller(
                 controller,
-                didChangContentWith: FallbackDiffableDataSourceSnapshot(
-                    sections: controller.sections ?? []
-                )
+                didChangContentWith: dataSourceSnapshot
             )
-            self.reloadedIDs = []
+            self.previousStateTag = nextStateTag
         }
 
-//        @objc
-//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
-//
-//
-////            [1].difference(from: <#T##BidirectionalCollection#>)
-//            let managedObject = anObject as! NSManagedObject
-//            self.reloadedIDs.insert(managedObject.objectID)
-//        }
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+
+            let managedObject = anObject as! NSManagedObject
+            self.reloadedItemIDs.insert(managedObject.objectID)
+        }
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
+
+            self.reloadedSectionIDs.insert(sectionInfo.name)
+        }
 
 
         // MARK: Private
 
-        private var reloadedIDs: Set<NSManagedObjectID> = []
+        private var previousStateTag: UUID = .init() {
+
+            didSet {
+
+                self.reloadedItemIDs = []
+                self.reloadedSectionIDs = []
+            }
+        }
+
+        private var reloadedItemIDs: Set<NSManagedObjectID> = []
+        private var reloadedSectionIDs: Set<String> = []
     }
 }
diff --git a/Sources/Internals.LazyNonmutating.swift b/Sources/Internals.LazyNonmutating.swift
new file mode 100644
index 0000000..4557bcd
--- /dev/null
+++ b/Sources/Internals.LazyNonmutating.swift
@@ -0,0 +1,94 @@
+//
+//  Internals.LazyNonmutating.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - Internals
+
+extension Internals {
+
+    // MARK: - LazyNonmutating
+
+    @propertyWrapper
+    internal final class LazyNonmutating<Value> {
+
+        // MARK: Internal
+
+        init(_ initializer: @escaping () -> Value) {
+
+            self.initializer = initializer
+        }
+
+        init(uninitialized: Void) {
+
+            self.initializer = { fatalError() }
+        }
+
+        func initialize(_ initializer: @escaping () -> Value) {
+
+            self.initializer = initializer
+        }
+
+        func reset(_ initializer: @escaping () -> Value) {
+
+            self.initializer = initializer
+            self.initializedValue = nil
+        }
+
+
+        // MARK: @propertyWrapper
+
+        var wrappedValue: Value {
+
+            get {
+
+                if let initializedValue = self.initializedValue {
+
+                    return initializedValue
+                }
+                let initializedValue = self.initializer()
+                self.initializedValue = initializedValue
+                return initializedValue
+            }
+            set {
+
+                self.initializer = { newValue }
+                self.initializedValue = newValue
+            }
+        }
+
+        var projectedValue: Internals.LazyNonmutating<Value> {
+
+            return self
+        }
+
+
+        // MARK: Private
+
+        private var initializer: () -> Value
+        private var initializedValue: Value? = nil
+    }
+}
diff --git a/Sources/Internals.NotificationObserver.swift b/Sources/Internals.NotificationObserver.swift
index 26faf20..014a72e 100644
--- a/Sources/Internals.NotificationObserver.swift
+++ b/Sources/Internals.NotificationObserver.swift
@@ -34,7 +34,7 @@ extension Internals {
 
     internal final class NotificationObserver {
 
-        // MARK: Public
+        // MARK: Internal
 
         let observer: NSObjectProtocol
 
diff --git a/Sources/Internals.SharedNotificationObserver.swift b/Sources/Internals.SharedNotificationObserver.swift
new file mode 100644
index 0000000..c97aa4c
--- /dev/null
+++ b/Sources/Internals.SharedNotificationObserver.swift
@@ -0,0 +1,56 @@
+//
+//  Internals.SharedNotificationObserver.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - Internal
+
+extension Internals {
+
+    // MARK: - SharedNotificationObserver
+
+    internal final class SharedNotificationObserver {
+
+        // MARK: Internal
+
+        let observer: NSObjectProtocol
+
+        init(notificationName: Notification.Name, object: Any?, queue: OperationQueue? = nil, closure: @escaping (_ note: Notification) -> Void) {
+
+            self.observer = NotificationCenter.default.addObserver(
+                forName: notificationName,
+                object: object,
+                queue: queue,
+                using: closure
+            )
+        }
+
+        deinit {
+
+            NotificationCenter.default.removeObserver(self.observer)
+        }
+    }
+}
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index dba82f5..5509a4b 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -34,44 +34,44 @@ import AppKit
 #endif
 
 
-// MARK: - LiveList
+// MARK: - ListSnapshot
 
-public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollection, Hashable {
+public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollection, Hashable {
 
     // MARK: Public
 
     public typealias SectionID = String
-    public typealias ItemID = D.ObjectID
+    public typealias ItemID = O.ObjectID
 
-    public subscript<S: Sequence>(indices indices: S) -> [ObjectType] where S.Element == Index {
+    public subscript<S: Sequence>(indices indices: S) -> [LiveObject<O>] where S.Element == Index {
 
         let context = self.context!
-        let objectIDs = self.diffableSnapshot.itemIdentifiers
+        let itemIDs = self.diffableSnapshot.allItemIDs
         return indices.map { position in
 
-            let objectID = objectIDs[position]
-            return context.fetchExisting(objectID)!
+            let itemID = itemIDs[position]
+            return LiveObject<O>(id: itemID, context: context)
         }
     }
 
-    public subscript(section sectionID: SectionID) -> [ObjectType] {
+    public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
 
         let context = self.context!
-        let objectIDs = self.itemIdentifiers(inSection: sectionID)
-        return objectIDs.map {
-            
-            return context.fetchExisting($0)!
+        let itemIDs = self.diffableSnapshot.itemIDs(inSection: sectionID)
+        return itemIDs.map {
+
+            return LiveObject<O>(id: $0, context: context)
         }
     }
 
-    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [ObjectType] where S.Element == Int {
+    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
 
         let context = self.context!
-        let objectIDs = self.itemIdentifiers(inSection: sectionID)
+        let itemIDs = self.diffableSnapshot.itemIDs(inSection: sectionID)
         return itemIndices.map { position in
 
-            let objectID = objectIDs[position]
-            return context.fetchExisting(objectID)!
+            let itemID = itemIDs[position]
+            return LiveObject<O>(id: itemID, context: context)
         }
     }
 
@@ -85,60 +85,60 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
         return self.diffableSnapshot.numberOfSections
     }
 
-    public var sectionIdentifiers: [String] {
+    public var sectionIDs: [SectionID] {
 
-        return self.diffableSnapshot.sectionIdentifiers as [String]
+        return self.diffableSnapshot.allSectionIDs
     }
 
     public var itemIdentifiers: [ItemID] {
 
-        return self.diffableSnapshot.itemIdentifiers as [ItemID]
+        return self.diffableSnapshot.allItemIDs
     }
 
     public func numberOfItems(inSection identifier: SectionID) -> Int {
 
-        return self.diffableSnapshot.numberOfItems(inSection: identifier as NSString)
+        return self.diffableSnapshot.numberOfItems(inSection: identifier)
     }
 
     public func itemIdentifiers(inSection identifier: SectionID) -> [ItemID] {
 
-        return self.diffableSnapshot.itemIdentifiers(inSection: identifier as NSString)
+        return self.diffableSnapshot.itemIDs(inSection: identifier)
     }
 
     public func itemIdentifiers(inSection identifier: SectionID, atIndices indices: IndexSet) -> [ItemID] {
 
-        let itemIDs = self.itemIdentifiers(inSection: identifier)
+        let itemIDs = self.diffableSnapshot.itemIDs(inSection: identifier)
         return indices.map({ itemIDs[$0] })
     }
 
     public func sectionIdentifier(containingItem identifier: ItemID) -> SectionID? {
 
-        return self.diffableSnapshot.sectionIdentifier(containingItem: identifier) as SectionID?
+        return self.diffableSnapshot.sectionIDs(containingItem: identifier)
     }
 
     public func indexOfItem(_ identifier: ItemID) -> Index? {
 
-        return self.diffableSnapshot.indexOfItem(identifier)
+        return self.diffableSnapshot.indexOfItemID(identifier)
     }
 
     public func indexOfSection(_ identifier: SectionID) -> Int? {
 
-        return self.diffableSnapshot.indexOfSection(identifier as NSString)
+        return self.diffableSnapshot.indexOfSectionID(identifier)
     }
 
     public mutating func appendItems(_ identifiers: [ItemID], toSection sectionIdentifier: SectionID? = nil) {
 
-        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier as NSString?)
+        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier, nextStateTag: .init())
     }
 
     public mutating func insertItems(_ identifiers: [ItemID], beforeItem beforeIdentifier: ItemID) {
 
-        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier)
+        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier, nextStateTag: .init())
     }
 
     public mutating func insertItems(_ identifiers: [ItemID], afterItem afterIdentifier: ItemID) {
 
-        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier)
+        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier, nextStateTag: .init())
     }
 
     public mutating func deleteItems(_ identifiers: [ItemID]) {
@@ -163,73 +163,73 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public mutating func reloadItems(_ identifiers: [ItemID]) {
 
-        self.diffableSnapshot.reloadItems(identifiers)
+        self.diffableSnapshot.reloadItems(identifiers, nextStateTag: .init())
     }
 
     public mutating func appendSections(_ identifiers: [SectionID]) {
 
-        self.diffableSnapshot.appendSections(identifiers as [NSString])
+        self.diffableSnapshot.appendSections(identifiers, nextStateTag: .init())
     }
 
     public mutating func insertSections(_ identifiers: [SectionID], beforeSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.insertSections(identifiers as [NSString], beforeSection: toIdentifier as NSString)
+        self.diffableSnapshot.insertSections(identifiers, beforeSection: toIdentifier, nextStateTag: .init())
     }
 
     public mutating func insertSections(_ identifiers: [SectionID], afterSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.insertSections(identifiers as [NSString], afterSection: toIdentifier as NSString)
+        self.diffableSnapshot.insertSections(identifiers, afterSection: toIdentifier, nextStateTag: .init())
     }
 
     public mutating func deleteSections(_ identifiers: [SectionID]) {
 
-        self.diffableSnapshot.deleteSections(identifiers as [NSString])
+        self.diffableSnapshot.deleteSections(identifiers)
     }
 
     public mutating func moveSection(_ identifier: SectionID, beforeSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.moveSection(identifier as NSString, beforeSection: toIdentifier as NSString)
+        self.diffableSnapshot.moveSection(identifier, beforeSection: toIdentifier)
     }
 
     public mutating func moveSection(_ identifier: SectionID, afterSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.moveSection(identifier as NSString, afterSection: toIdentifier as NSString)
+        self.diffableSnapshot.moveSection(identifier, afterSection: toIdentifier)
     }
 
     public mutating func reloadSections(_ identifiers: [SectionID]) {
 
-        self.diffableSnapshot.reloadSections(identifiers as [NSString])
+        self.diffableSnapshot.reloadSections(identifiers, nextStateTag: .init())
     }
     
     
     // MARK: SnapshotResult
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
     
     // MARK: RandomAccessCollection
     
     public var startIndex: Index {
         
-        return self.diffableSnapshot.itemIdentifiers.startIndex
+        return self.diffableSnapshot.allItemIDs.startIndex
     }
     
     public var endIndex: Index {
         
-        return self.diffableSnapshot.itemIdentifiers.endIndex
+        return self.diffableSnapshot.allItemIDs.endIndex
     }
     
-    public subscript(position: Index) -> ObjectType {
+    public subscript(position: Index) -> Element {
         
         let context = self.context!
-        let objectID = self.diffableSnapshot.itemIdentifiers[position]
-        return context.fetchExisting(objectID)!
+        let itemID = self.diffableSnapshot.allItemIDs[position]
+        return LiveObject<O>(id: itemID, context: context)
     }
     
     
     // MARK: Sequence
     
-    public typealias Element = ObjectType
+    public typealias Element = LiveObject<O>
     
     public typealias Index = Int
     
@@ -254,7 +254,7 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
     
     internal init() {
 
-        self.diffableSnapshot = Internals.FallbackDiffableDataSourceSnapshot()
+        self.diffableSnapshot = .init()
         self.context = nil
     }
     
@@ -263,11 +263,22 @@ public struct ListSnapshot<D: DynamicObject>: SnapshotResult, RandomAccessCollec
         self.diffableSnapshot = diffableSnapshot
         self.context = context
     }
+
+    internal var nextStateTag: UUID {
+
+        return self.diffableSnapshot.nextStateTag
+    }
+
+    internal func itemIDs(where stateCondition: @escaping (UUID) -> Bool) -> [ItemID] {
+
+        return self.diffableSnapshot.itemIDs(where: stateCondition)
+    }
     
     
     // MARK: Private
     
     private let id: UUID = .init()
     private let context: NSManagedObjectContext?
+
     private var diffableSnapshot: Internals.DiffableDataSourceSnapshot
 }
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index e6a0cf8..1029a64 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -38,40 +38,135 @@ import SwiftUI
 
 // MARK: - LiveList
 
-public final class LiveList<D: DynamicObject> {
+public final class LiveList<O: DynamicObject>: Hashable {
     
     // MARK: Public
 
-    public fileprivate(set) var snapshot: ListSnapshot<ObjectType> = .init() {
+    public typealias SectionID = SnapshotType.SectionID
+    public typealias ItemID = SnapshotType.ItemID
+
+    public fileprivate(set) var snapshot: SnapshotType = .init() {
 
         willSet {
-            
-            guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) else {
 
-                return
+            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+
+                self.willChange()
             }
-            #if canImport(Combine)
-
-            #if canImport(SwiftUI)
-            withAnimation {
-                self.objectWillChange.send()
-            }
-
-            #else
-            self.objectWillChange.send()
-
-            #endif
-
-            #endif
         }
     }
+
+    public var numberOfItems: Int {
+
+        return self.snapshot.numberOfItems
+    }
+
+    public var numberOfSections: Int {
+
+        return self.snapshot.numberOfSections
+    }
+
+    public var sections: [SectionID] {
+
+        return self.snapshot.sectionIDs
+    }
+
+    public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
+
+        let context = self.context
+        return self.snapshot
+            .itemIdentifiers(inSection: sectionID)
+            .map({ context.liveObject(id: $0) })
+    }
+
+    public subscript(itemID itemID: ItemID) -> LiveObject<O>? {
+
+        guard let validID = self.snapshot.itemIdentifiers.first(where: { $0 == itemID }) else {
+
+            return nil
+        }
+        return self.context.liveObject(id: validID)
+    }
+
+    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
+
+        let context = self.context
+        let itemIDs = self.snapshot.itemIdentifiers(inSection: sectionID)
+        return itemIndices.map { position in
+
+            let itemID = itemIDs[position]
+            return context.liveObject(id: itemID)
+        }
+    }
+
+    public var items: [LiveObject<O>] {
+
+        let context = self.context
+        return self.snapshot.itemIdentifiers
+            .map({ context.liveObject(id: $0) })
+    }
+
+    public func numberOfItems(inSection identifier: SectionID) -> Int {
+
+        return self.snapshot.numberOfItems(inSection: identifier)
+    }
+
+    public func items(inSection identifier: SectionID) -> [LiveObject<O>] {
+
+        let context = self.context
+        return self.snapshot
+            .itemIdentifiers(inSection: identifier)
+            .map({ context.liveObject(id: $0) })
+    }
+
+    public func items(inSection identifier: SectionID, atIndices indices: IndexSet) -> [LiveObject<O>] {
+
+        let context = self.context
+        let itemIDs = self.snapshot.itemIdentifiers(inSection: identifier)
+        return indices.map { position in
+
+            let itemID = itemIDs[position]
+            return context.liveObject(id: itemID)
+        }
+    }
+
+    public func section(containingItem item: LiveObject<O>) -> SectionID? {
+
+        return self.snapshot.sectionIdentifier(containingItem: item.id)
+    }
+
+    public func indexOfItem(_ item: LiveObject<O>) -> Int? {
+
+        return self.snapshot.indexOfItem(item.id)
+    }
+
+    public func indexOfSection(_ identifier: SectionID) -> Int? {
+
+        return self.snapshot.indexOfSection(identifier)
+    }
+
+
+    // MARK: Equatable
+
+    public static func == (_ lhs: LiveList, _ rhs: LiveList) -> Bool {
+
+        return lhs === rhs
+    }
+
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+
+        hasher.combine(ObjectIdentifier(self))
+    }
     
     
     // MARK: LiveResult
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
-    public typealias SnapshotType = ListSnapshot<D>
+    public typealias SnapshotType = ListSnapshot<O>
 
 
     // MARK: Internal
@@ -137,6 +232,8 @@ public final class LiveList<D: DynamicObject> {
     private let from: From<ObjectType>
     private let sectionBy: SectionBy<ObjectType>?
 
+    private lazy var context: NSManagedObjectContext = self.fetchedResultsController.managedObjectContext
+
     private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedDiffableDataSourceSnapshotDelegate) {
 
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
@@ -197,76 +294,7 @@ public final class LiveList<D: DynamicObject> {
         self.applyFetchClauses = applyFetchClauses
         self.fetchedResultsControllerDelegate.handler = self
 
-        guard let coordinator = context.parentStack?.coordinator else {
-
-            return
-        }
-
-        self.observerForWillChangePersistentStore = Internals.NotificationObserver(
-            notificationName: NSNotification.Name.NSPersistentStoreCoordinatorStoresWillChange,
-            object: coordinator,
-            queue: OperationQueue.main,
-            closure: { [weak self] (note) -> Void in
-
-                guard let `self` = self else {
-
-                    return
-                }
-
-//                self.isPersistentStoreChanging = true
-//
-//                guard let removedStores = (note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore]).flatMap(Set.init),
-//                    !Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? []).intersection(removedStores).isEmpty else {
-//
-//                        return
-//                }
-//                self.refetch(self.applyFetchClauses)
-            }
-        )
-
-        self.observerForDidChangePersistentStore = Internals.NotificationObserver(
-            notificationName: NSNotification.Name.NSPersistentStoreCoordinatorStoresDidChange,
-            object: coordinator,
-            queue: OperationQueue.main,
-            closure: { [weak self] (note) -> Void in
-
-                guard let `self` = self else {
-
-                    return
-                }
-
-//                if !self.isPendingRefetch {
-//
-//                    let previousStores = Set(self.fetchedResultsController.typedFetchRequest.safeAffectedStores() ?? [])
-//                    let currentStores = previousStores
-//                        .subtracting(note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore] ?? [])
-//                        .union(note.userInfo?[NSAddedPersistentStoresKey] as? [NSPersistentStore] ?? [])
-//
-//                    if previousStores != currentStores {
-//
-//                        self.refetch(self.applyFetchClauses)
-//                    }
-//                }
-//
-//                self.isPersistentStoreChanging = false
-            }
-        )
-
-        if let createAsynchronously = createAsynchronously {
-
-//            transactionQueue.async {
-//
-//                try!internal self.fetchedResultsController.performFetchFromSpecifiedStores()
-//                self.taskGroup.notify(queue: .main) {
-//
-//                    createAsynchronously(self)
-//                }
-//            }
-        }
-        else {
-
-            try! self.fetchedResultsController.performFetchFromSpecifiedStores()
-        }
+        try! self.fetchedResultsController.performFetchFromSpecifiedStores()
     }
 }
 
@@ -301,6 +329,29 @@ extension LiveList: LiveResult {
 
         return self.rawObjectWillChange! as! ObservableObjectPublisher
     }
+
+    public func willChange() {
+
+        #if canImport(Combine)
+
+        #if canImport(SwiftUI)
+        withAnimation {
+
+            self.objectWillChange.send()
+        }
+
+        #else
+        self.objectWillChange.send()
+
+        #endif
+
+        #endif
+    }
+
+    public func didChange() {
+
+        // TODO:
+    }
 }
 
 #endif
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
new file mode 100644
index 0000000..f11be0d
--- /dev/null
+++ b/Sources/LiveObject.swift
@@ -0,0 +1,285 @@
+//
+//  LiveObject.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import CoreData
+
+#if canImport(Combine)
+import Combine
+
+#endif
+
+#if canImport(SwiftUI)
+import SwiftUI
+
+#endif
+
+
+// MARK: - LiveObject
+
+@dynamicMemberLookup
+public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
+
+    // MARK: Public
+
+    public typealias SectionID = String
+    public typealias ItemID = O.ObjectID
+
+    public var snapshot: SnapshotType {
+
+        return self.lazySnapshot
+    }
+
+    public private(set) lazy var object: O = self.context.fetchExisting(self.id)!
+
+
+    // MARK: Identifiable
+
+    public let id: O.ObjectID
+
+
+    // MARK: Equatable
+
+    public static func == (_ lhs: LiveObject, _ rhs: LiveObject) -> Bool {
+
+        return lhs.id == rhs.id
+            && lhs.context == rhs.context
+    }
+
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+
+        hasher.combine(self.id)
+        hasher.combine(self.context)
+    }
+
+
+    // MARK: LiveResult
+
+    public typealias ObjectType = O
+
+    public typealias SnapshotType = ObjectSnapshot<O>
+
+
+    // MARK: Internal
+
+    internal convenience init(id: ID, context: NSManagedObjectContext) {
+
+        self.init(id: id, context: context, initializer: ObjectSnapshot<O>.init(id:context:))
+    }
+
+
+    // MARK: FilePrivate
+
+    fileprivate let rawObjectWillChange: Any?
+
+    fileprivate init(id: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>) {
+
+        self.id = id
+        self.context = context
+        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+
+            #if canImport(Combine)
+            self.rawObjectWillChange = ObservableObjectPublisher()
+
+            #else
+            self.rawObjectWillChange = nil
+
+            #endif
+        }
+        else {
+
+            self.rawObjectWillChange = nil
+        }
+        self.observer = NotificationCenter.default.addObserver(
+            forName: .NSManagedObjectContextObjectsDidChange,
+            object: context,
+            queue: .main,
+            using: { [weak self] (notification) in
+
+                guard let self = self, let userInfo = notification.userInfo else {
+
+                    return
+                }
+                let updatedObjects = (userInfo[NSUpdatedObjectsKey] as! NSSet? ?? [])
+                let mergedObjects = (userInfo[NSRefreshedObjectsKey] as! NSSet? ?? [])
+                guard mergedObjects.contains(where: { ($0 as! NSManagedObject).objectID == id })
+                    || updatedObjects.contains(where: { ($0 as! NSManagedObject).objectID == id }) else {
+
+                        return
+                }
+                self.$lazySnapshot.reset({ initializer(id, context) })
+                if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+
+                    self.willChange()
+                }
+            }
+        )
+
+        self.$lazySnapshot.initialize({ initializer(id, context) })
+    }
+
+
+    // MARK: Private
+    
+    private let context: NSManagedObjectContext
+    private var observer: NSObjectProtocol?
+
+    @Internals.LazyNonmutating(uninitialized: ())
+    private var lazySnapshot: ObjectSnapshot<O>
+}
+
+
+#if canImport(Combine)
+import Combine
+
+// MARK: - LiveObject: LiveResult
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension LiveObject: LiveResult {
+
+    // MARK: ObservableObject
+
+    public var objectWillChange: ObservableObjectPublisher {
+
+        return self.rawObjectWillChange! as! ObservableObjectPublisher
+    }
+
+    public func willChange() {
+
+        #if canImport(Combine)
+
+        #if canImport(SwiftUI)
+        withAnimation {
+
+            self.objectWillChange.send()
+        }
+
+        #else
+        self.objectWillChange.send()
+
+        #endif
+
+        #endif
+    }
+
+    public func didChange() {
+
+        // TODO:
+    }
+}
+
+#endif
+
+
+// MARK: - LiveObject where O: NSManagedObject
+
+@available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
+extension LiveObject where O: NSManagedObject {
+
+    // MARK: Public
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V: AllowedObjectiveCKeyPathValue>(dynamicMember member: KeyPath<O, V>) -> V {
+
+        fatalError()
+//        return self.snapshot[dynamicMember: member]
+    }
+}
+
+
+// MARK: - LiveObject where O: CoreStoreObject
+
+extension LiveObject where O: CoreStoreObject {
+
+    // MARK: Public
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D? {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D] {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D> {
+
+        return self.snapshot[dynamicMember: member]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<T>(dynamicMember member: KeyPath<O, T>) -> T {
+
+        return self.object[keyPath: member]
+    }
+}
diff --git a/Sources/LiveResult.swift b/Sources/LiveResult.swift
index 407eb25..e246116 100644
--- a/Sources/LiveResult.swift
+++ b/Sources/LiveResult.swift
@@ -41,6 +41,9 @@ public protocol LiveResult: ObservableObject {
     
     associatedtype ObjectType
     associatedtype SnapshotType: SnapshotResult where SnapshotType.ObjectType == Self.ObjectType
+
+    func willChange()
+    func didChange()
 }
 
 #endif
diff --git a/Sources/NSManagedObject+Logging.swift b/Sources/NSManagedObject+Logging.swift
index bad70a0..f38ee40 100644
--- a/Sources/NSManagedObject+Logging.swift
+++ b/Sources/NSManagedObject+Logging.swift
@@ -38,15 +38,7 @@ extension NSManagedObject {
             
             return nil
         }
-        if context.isTransactionContext {
-            
-            return context.parentTransaction?.isRunningInAllowedQueue()
-        }
-        if context.isDataStackContext {
-            
-            return Thread.isMainThread
-        }
-        return nil
+        return context.isRunningInAllowedQueue()
     }
     
     @nonobjc
@@ -56,14 +48,6 @@ extension NSManagedObject {
             
             return nil
         }
-        if context.isTransactionContext {
-            
-            return true
-        }
-        if context.isDataStackContext {
-            
-            return false
-        }
-        return nil
+        return context.isEditableInContext()
     }
 }
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 8efda4c..ffe0b9f 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -85,6 +85,35 @@ extension NSManagedObjectContext {
             }
         )
     }
+
+    @nonobjc
+    internal func liveObject<D: DynamicObject>(id: NSManagedObjectID) -> LiveObject<D> {
+
+        let cache = self.liveObjectsCache(D.self)
+        return Internals.with {
+
+            if let liveObject = cache.object(forKey: id) {
+
+                return liveObject
+            }
+            let liveObject = LiveObject<D>(id: id, context: self)
+            cache.setObject(liveObject, forKey: id)
+            return liveObject
+        }
+    }
+
+    @nonobjc
+    private func liveObjectsCache<D: DynamicObject>(_ objectType: D.Type) -> NSMapTable<NSManagedObjectID, LiveObject<D>> {
+
+        let key = Internals.typeName(objectType)
+        if let cache = self.userInfo[key] {
+
+            return cache as! NSMapTable<NSManagedObjectID, LiveObject<D>>
+        }
+        let cache = NSMapTable<NSManagedObjectID, LiveObject<D>>.strongToWeakObjects()
+        self.userInfo[key] = cache
+        return cache
+    }
     
     
     // MARK: Private
diff --git a/Sources/NSManagedObjectContext+Logging.swift b/Sources/NSManagedObjectContext+Logging.swift
new file mode 100644
index 0000000..965508d
--- /dev/null
+++ b/Sources/NSManagedObjectContext+Logging.swift
@@ -0,0 +1,61 @@
+//
+//  NSManagedObjectContext+Logging.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - NSManagedObjectContext
+
+extension NSManagedObjectContext {
+
+    @nonobjc
+    internal func isRunningInAllowedQueue() -> Bool? {
+
+        if self.isTransactionContext {
+
+            return self.parentTransaction?.isRunningInAllowedQueue()
+        }
+        if self.isDataStackContext {
+
+            return Thread.isMainThread
+        }
+        return nil
+    }
+
+    @nonobjc
+    internal func isEditableInContext() -> Bool? {
+
+        if self.isTransactionContext {
+
+            return true
+        }
+        if self.isDataStackContext {
+
+            return false
+        }
+        return nil
+    }
+}
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 4f60e45..11d7a66 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -24,58 +24,78 @@
 //
 
 import CoreData
-import Foundation
+
+#if canImport(UIKit)
+import UIKit
+
+#elseif canImport(AppKit)
+import AppKit
+
+#endif
 
 
 // MARK: - ObjectSnapshot
 
-/**
- An `ObjectSnapshot` contains "snapshot" values from a `DynamicObject` instance copied at a specific point in time.
- */
 @dynamicMemberLookup
-public struct ObjectSnapshot<O: DynamicObject> {
-    
-    // MARK: FilePrivate
-    
-    fileprivate var attributes: [KeyPathString: Any]
-    
-    // MARK: Private
-    
-    private init() {
-        
-        self.attributes = [:]
+public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, Identifiable, Hashable {
+
+    // MARK: SnapshotResult
+
+    public typealias ObjectType = O
+
+
+    // MARK: Identifiable
+
+    public let id: O.ObjectID
+
+
+    // MARK: Equatable
+
+    public static func == (_ lhs: Self, _ rhs: Self) -> Bool {
+
+        return lhs.id == rhs.id
+            && lhs.values == rhs.values
     }
+
+
+    // MARK: Hashable
+
+    public func hash(into hasher: inout Hasher) {
+
+        hasher.combine(self.id)
+        hasher.combine(self.values)
+    }
+
+
+    // MARK: Internal
+
+    internal init(id: ID, context: NSManagedObjectContext) {
+
+        self.id = id
+        self.context = context
+        self.values = O.cs_snapshotDictionary(id: id, context: context) as NSDictionary
+    }
+
+
+    // MARK: Private
+
+    private let context: NSManagedObjectContext
+    private let values: NSDictionary
 }
 
+
 // MARK: - ObjectSnapshot where O: NSManagedObject
 
+@available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
 extension ObjectSnapshot where O: NSManagedObject {
-    
-    /**
-     Initializes an `ObjectSnapshot` instance by copying all attribute values from the given `NSManagedObject`.
-     */
-    public init(from object: O) {
-        
-        self.attributes = object.dictionaryWithValues(
-            forKeys: Array(object.entity.attributesByName.keys)
-        )
-    }
-    
+
     /**
      Returns the value for the property identified by a given key.
      */
     public subscript<V: AllowedObjectiveCKeyPathValue>(dynamicMember member: KeyPath<O, V>) -> V {
-        
-        get {
-            
-            let key = String(keyPath: member)
-            return self.attributes[key]! as! V
-        }
-        set {
-            
-            let key = String(keyPath: member)
-            self.attributes[key] = newValue
-        }
+
+        let key = String(keyPath: member)
+        return self.values[key] as! V
     }
 }
 
@@ -83,61 +103,67 @@ extension ObjectSnapshot where O: NSManagedObject {
 // MARK: - ObjectSnapshot where O: CoreStoreObject
 
 extension ObjectSnapshot where O: CoreStoreObject {
-    
-    /**
-     Initializes an `ObjectSnapshot` instance by copying all attribute values from the given `CoreStoreObject`.
-     */
-    public init(from object: O) {
-    
-        var attributes: [KeyPathString: Any] = [:]
-        Self.initializeAttributes(
-            mirror: Mirror(reflecting: object),
-            object: object,
-            into: &attributes
-        )
-        self.attributes = attributes
-    }
-    
+
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<K: AttributeKeyPathStringConvertible>(dynamicMember member: KeyPath<O, K>) -> K.ReturnValueType {
-        
-        get {
-            
-            let key = String(keyPath: member)
-            return self.attributes[key]! as! K.ReturnValueType
-        }
-        set {
-            
-            let key = String(keyPath: member)
-            self.attributes[key] = newValue
-        }
+    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! V
     }
-    
-    
-    // MARK: Private
-    
-    private static func initializeAttributes(mirror: Mirror, object: CoreStoreObject, into attributes: inout [KeyPathString: Any]) {
-        
-        if let superClassMirror = mirror.superclassMirror {
-            
-            self.initializeAttributes(
-                mirror: superClassMirror,
-                object: object,
-                into: &attributes
-            )
-        }
-        for child in mirror.children {
-            
-            switch child.value {
-                
-            case let property as AttributeProtocol:
-                attributes[property.keyPath] = property.valueForSnapshot
-                
-            default:
-                continue
-            }
-        }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! V?
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! V
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! V?
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D? {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! D?
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D] {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! [D]
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D> {
+
+        let key = String(keyPath: member)
+        return self.values[key] as! Set<D>
     }
 }
diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift
index ae130a8..6fe5419 100644
--- a/Sources/Relationship.swift
+++ b/Sources/Relationship.swift
@@ -308,6 +308,11 @@ public enum RelationshipContainer<O: CoreStoreObject> {
                 }
             }
         }
+
+        internal var valueForSnapshot: Any {
+
+            return self.value as Any
+        }
         
         
         // MARK: Private
@@ -595,6 +600,11 @@ public enum RelationshipContainer<O: CoreStoreObject> {
                 }
             }
         }
+
+        internal var valueForSnapshot: Any {
+
+            return self.value as Any
+        }
         
         
         // MARK: Private
@@ -887,6 +897,11 @@ public enum RelationshipContainer<O: CoreStoreObject> {
                 }
             }
         }
+
+        internal var valueForSnapshot: Any {
+
+            return self.value as Any
+        }
         
         
         // MARK: Private
diff --git a/Sources/RelationshipProtocol.swift b/Sources/RelationshipProtocol.swift
index bb97636..31e4293 100644
--- a/Sources/RelationshipProtocol.swift
+++ b/Sources/RelationshipProtocol.swift
@@ -42,4 +42,5 @@ internal protocol RelationshipProtocol: AnyObject {
     var renamingIdentifier: () -> String? { get }
     var minCount: Int { get }
     var maxCount: Int { get }
+    var valueForSnapshot: Any { get }
 }
diff --git a/Sources/Transformable.swift b/Sources/Transformable.swift
index dda5bab..52ac645 100644
--- a/Sources/Transformable.swift
+++ b/Sources/Transformable.swift
@@ -269,7 +269,8 @@ public enum TransformableContainer<O: CoreStoreObject> {
         }
         
         internal var valueForSnapshot: Any {
-            return self.value
+
+            return self.value as Any
         }
 
 
@@ -486,6 +487,7 @@ public enum TransformableContainer<O: CoreStoreObject> {
         }
         
         internal var valueForSnapshot: Any {
+            
             return self.value as Any
         }
 
diff --git a/Sources/Value.swift b/Sources/Value.swift
index 73be9f6..f4c2d28 100644
--- a/Sources/Value.swift
+++ b/Sources/Value.swift
@@ -264,7 +264,8 @@ public enum ValueContainer<O: CoreStoreObject> {
         }
         
         internal var valueForSnapshot: Any {
-            return self.value
+
+            return self.value as Any
         }
         
         
@@ -481,6 +482,7 @@ public enum ValueContainer<O: CoreStoreObject> {
         }
         
         internal var valueForSnapshot: Any {
+
             return self.value as Any
         }
         

From 5af0d17de4289c0540d23b2511c35f7c1127ddd9 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sat, 12 Oct 2019 07:20:09 +0900
Subject: [PATCH 11/58] remov stateIDs

---
 .../UserInterfaceState.xcuserstate            | Bin 9251 -> 0 bytes
 CoreStore.xcodeproj/project.pbxproj           |  64 ++++++--
 .../xcschemes/CoreStore iOS.xcscheme          |  26 ++-
 .../CoreStoreDemo.xcodeproj/project.pbxproj   |   3 +
 .../SwiftUIContainerViewController.swift      |   2 +-
 .../SwiftUI Demo/SwiftUIView.swift            |  53 +++++--
 CoreStoreTests/DynamicModelTests.swift        |  90 ++++++++---
 CoreStoreTests/LiveListTests.swift            |   2 +-
 Sources/AttributeProtocol.swift               |   3 +-
 Sources/CoreStoreObject+DataSources.swift     |   2 +-
 Sources/CoreStoreObject.swift                 |  38 +++++
 Sources/CoreStoreSchema.swift                 |   9 +-
 Sources/DataStack+DataSources.swift           |   2 +-
 Sources/DiffableDataSource.TableView.swift    |   6 +-
 .../DiffableDataSourceSnapshotProtocol.swift  |  34 ++++
 Sources/DynamicObject.swift                   |   8 +-
 Sources/EnvironmentKeys.swift                 |  25 ++-
 ...Internals.DiffableDataSourceSnapshot.swift | 149 +++++-------------
 ...edDiffableDataSourceSnapshotDelegate.swift |  46 +-----
 Sources/ListSnapshot.swift                    |  22 +--
 Sources/LiveList.swift                        |  29 ++--
 Sources/LiveObject.swift                      |  29 ++--
 Sources/LiveQuery.swift                       |   4 +-
 Sources/LiveResult.swift                      |   3 +-
 Sources/ObjectRepresentation.swift            |   9 ++
 Sources/PropertyProtocol.swift                |  35 ++++
 Sources/Relationship.swift                    |  22 ++-
 Sources/RelationshipProtocol.swift            |   5 +-
 Sources/SnapshotResult.swift                  |   1 -
 Sources/Transformable.swift                   |  12 +-
 Sources/Value.swift                           |  14 +-
 31 files changed, 456 insertions(+), 291 deletions(-)
 delete mode 100644 .swiftpm/xcode/package.xcworkspace/xcuserdata/JohnEstropia.xcuserdatad/UserInterfaceState.xcuserstate
 create mode 100644 Sources/DiffableDataSourceSnapshotProtocol.swift
 create mode 100644 Sources/ObjectRepresentation.swift
 create mode 100644 Sources/PropertyProtocol.swift

diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/JohnEstropia.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/JohnEstropia.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 78e6720d2b5bf2dfee54fb95d4faa6df0117cb73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9251
zcmeHMiGNd7_CNO~P0EtwWoz=XK%oUhy3>`4&^9d;+ESXflr^T!Yx^WkN|FM#R<DZS
zhPWW^N(-_n;)2_#h&nDPB7%-OGmhJgyMl<QGcLdL@|v_2{Qc$+`1O67<h^_Ex#yns
zd(La_^o!w0R@R$9fPw;)kN_(BHT|Y3b)^sri@`usYOwiyp(PStnCcC+w2Sz-J~a~T
zGyqw<c@K9O)Q|{9Fo78+z(kk?XTfAR8>T=u<iR;G6I?I{=E8hf08OwMRzL{C5P>dO
z39Dc=bi)O35nK*y;R?7Cu7a!KM%V~9!7Xqr+zwk{E8GJ+;6B&~&%l0o7M_FW;m_~_
zya=zrA@~Qp4<EpX@DY3r|0I+sh>|1_6;YE!GJ=dGqsVBYAzGp%97!S;;vf^rBytv+
zOwJ}#NFK>21*DKnCncnu%p<j=fh;CV$a%y^1hSk2Ntmo6myk=zWn>Mxf?PxHApK-J
zxtH8W9w2+kBji<bki13?k=My#@&-9Vj*>UYJLG-xDfx^XC*P72<P`ZgRZ%rfq$B7^
znnW$sN_lFdPMSiBX(~ONX3`=$jk;(#olED_#dHa6rEPQt4bd>|p%>C#x`AFtuctTA
z8|g-R6Wv5_rgzf2=vMj^eVXp0&(Qt!S^6A(p8lD>KwqQ>=@I%4eV4vZKc=74FB(z<
zU4H*j7y%<;6pRKP7#7sHGnNb8;YIj8pxnmP7QZ(f?gtHM8D)xo;6TrmEQh6eI8&vo
zd_gd@JlyGR5nRERt_~p(@o=fRIYs%od3pKi1yc)i(sQ%(i_%M6Wu@s^Wm&HL+|u0K
zsijk68z+GiQn!HxtiXc}?BHMtOvThJk&R#@x4{?~3&}7J#zP7l#dM5gSuC5SGOdTR
zEf52~;Hr{P$Qx)Aq`h52b5~nspf%{>bTNM9NnxDs5?Z}o{z$n`j08jOh&LjHD}teh
zx+)yhxdlHOv*3$Qx7G<QNK&31BPLHam4*cG^3I?bh=fa8BH~IU<%=CC4Kg6L52dB(
zgG@G>X^%t&oCCShhfH$>@}U3<p=gmT+km%2Xp(;l;bk@M>aK{l*)K@P>fVC$ra>_(
zCVJac<DM6FI+@0FIM>4&<11Vu@)8VqL%3`@%z)x0HSWP@G8-jvHe&pi!z_v43a0Oa
z*~}mbHod7O=o2zfyK}`z#&8K_)Cz6ha97wJ><YCAWjHTJs0wN%Le<RJ2lH4G(;kI7
zv@AE&LjyEQw$<zn3ybkPB>253HGu&$Gn0p_Xchg!w9L%RhA_sK%sIjKKzTS43U-R#
z%$VfEnN8AWwV_}%=wy}!LxLOiC}h@^m$<6SGdg^-P!__Xh8j02svj0Yag4bo&<d$L
zVJR#F51a>HXoeQ>fxs-x%6MjDcIIGCHinJe32l%9B3{eE4;}a&WXWi76Y!eICb9AO
zogOv6K@rFz$_Pho2vy+W9H$Sq2Uk^#0kOl|>EXtmaacNFSr7xMw@vVHW6wCJGO$t%
zi)bHcv?-_0XbA=V{-|wd1Y29f0=nbrbRxmFHoxF2YnS{6>70R^A$0s=0J%Byfl9g}
z?ZFU|IDJ?$p^Bj2CkEPN)9ZoWKDdyLV=40e#n8JI<r}?Fs`8b>fvm=9u&!S+{Sk>N
z&m4#7Urd+Rzy>h%!+N-uoy8{i!*y^yJDW{mX^SORD+4}ZH9C@SARbi-fwoAyyyYh7
z-ON%jLsdT~?=k~!>z6zwM*0r8TOxfY+{H3j<`B{it$36(6Ws>6n<cN7!st%vjOYO@
zB}Q>KJOZiP;eOZy55R-)5IhWf*;JOx@>o7AV1=w`JDS*I`2PeBJ&93n0-J{a#W*xw
zj&oKi%tk|9y|=m48>$R9$|kTZK2Q<DAmZUB#vjNt7kFb+7l@H|H>$!f;E0DiOPUyq
z+%j!Xjk`_=qen@>Cu%`1Z^Vn{gHxkHPKYl+5@o>vI;h_-ggo52Lx~L^E6po+6_w@|
zrI!{I6{P2uRg|Td=H+Ll=jIo>a!X1JbMkWvJsdyCb};B~9&$ntXX)w5%}z_sFX&B6
z?#a&0%1TQv%FpWUJpwPGykCX`Qeg2Rr}Om6bDCqQg;0euL6w{L-=Y<RI&s9vQKL0l
zi*wA_2~*P2v!=@V(Zh|&%}&nF%1f5^PA<yHNzTG6JHHS=vT_QN8&Pi4vU3;4qmYL)
z43)=#a4{*C<d&CX>cgZswJbe1tGpt;sKQl|KDD$oJ7;Q1R(3&AnTIpu+E~aNl<`p=
zr#G0A{y0DP8ChbV8M6&{)XM8^c87<v*0|j*AwdXKdAoyMk%op!mpc+d6F>%s54pt)
z1S#3FQJA|6%CgH!3ktH*3v)^<(zCM)^3%)9%L>wqa&z*_UAbjbOAGRr^hoDVlf;tM
zdn9?>_>@0LWkVV0AD<deUq>fS(w{Z?Y}9;>TNaSar2Kopn8ywu8%irWgK3zS>HgS4
zJX}&w4|16mwVVNla|+OOlE-CaVxk?obALuEKF-b=mNNUZQ<r6}E@&09@>-@A`Gou|
z1PV3oxk9(#D;dDN?{m8Rg2JL{#pg^vcgD<;(lS?h#jM$tb1JK<Yv$F?uX8VrZ4_l1
zRah@Z{OGHCG#r@&+3kc7!Y;{eL+IT&tul=JG-4*JtaPE^D#O)Y5fckn<E{`x;Rr73
z3}UDYVL~mFAX-f{0&sDvvP8o;?2dH%g=%kjc@!+jd&Yga(j{*@E7Td?2RW$pt&U5l
zrmLe_2r<GGOqDo-(Gi%ll}yd)5T)r63UVtD<?9i+r9e95Ag-yxq#s7?z6Npnes~9Q
z_@{6JeuDqNFYp^7h{Q*d31k{Mhn!1hk~R_{-H4&rBZ9u0>>zs(Ie$%#AwvF+YUo5d
z1rhLcT1w~9I_gE-yOH+OU5ITD&^Hjven?L$Kw(sjRpcpVDk>FCibaYgie(Cq;ygvO
zqD3Jn+7zN<xuQc6RIHG52qp42f|6l>iU>PLP6@BVK~&iQ2$MqK7I+n2gJM*LbQg>3
zufty?+<F+^z=U-a-h{W<xoifT$x2u$E87NdqeR|?zvAcLnG56iR<;{IUt`*(=;1P6
zC_xm73dMUjVuKp*O0mt0@z=wp4Gkc}0;)?0i){gEp&LV8q)`-B$rR$NhZAjxh&WA@
zlDxD}Wgy&%C^s0AX2nkOFZd2pcf%*BsL$YY_yWF!ui$I=29CjT_!dsEa#q1+vDvJW
z&0%v{6{}`7Y#ys+^LJzN{vJ-j5AY+NQ$!tipq77y-$2B4UdP<b!_LD~Phib>-@*dy
zI{b|QGpAH&Md()TT`hKC@F@#+bb3Q#I2fo#(BP3!;6R3x1r>eDB@f&ngcmz8MM(mv
z4I!Qib<4JnJ{2th+JsPCI*W!;h=F|hVO)$+$WZHzv`e~?bRmzU%%qzbO<A(Z164$=
zR0W44SRvF2ogpENKM>Of1L0+{Q~9Dv6j55I%w%lSXszrUz6t|>Y<NJma(#jxi!2Rn
z8D&J~;;jEwfFi~US+YJ1_5;GH5?Ukm!8)<6Ju;wqq9;Z~?8Lz8`-q7(NSe{R8tdc2
ztBeR8;V7^nR><uqJh8DxwuEV71e|0X7`BixWGqQ$3s@6dxP@S$MpD@#RQqC<wiL-#
z`cO7vt0;t)NOv(rg3`rX$%3oBZ2>XT<r5a-S!FS#%oNXy`e$sXG?I1NPT3%mscb2l
z)H10W)kP(R1t98Ql2XddCHtc^I5<j*$TS#5is5o{4jvN2se}?GmCNuDnHln|(d+LL
zIKsTqh=74=21e2NiheQ^iibXk@mNaAAa(O*rhSW4kXg9hY*I<)kh!FaR6~b!-WVhe
zwnS}Z*`R17R-!XHFv<@;mavh;>Acq1+QBiloC&Oh`Pg_5ml?0v<UoKBPEwvLD3QyE
z2YUnnT`iHWkRU5{KJ@mJI^t%nOhm*=8p#6Wx(PbSqD6!IG(<UIZRo=7gD^)H%~G-q
zu|Eo4PKPpdlt9LSw8T(9@j&taF(<aOSK67KAKfTk-yJ2b$W$9N5)tYb$51`icMBt8
z2Le`aM<+8eKa=YQ;wLC+BU)BWU{wRc?k53>kuwd+XXzv>WMDi@go6hg?y>zOB$1PV
z^nW#9mUslqZ_>qrgD$k1TqqfKH+)WdSSLo=6<bIz%Hd)bLOF!7sF4&oR}A<N4j}uo
zf6T_v6AX1@kZ4(sv0WFN<B^Bu%`TTVTgxI?oRBL~hF6iR5f-*|g+lSZ#sD2@IqPB@
z-oZqCE!jY>!`au98_11hBe{ueA~%y;$VRA!3be<V28Nwl1|Q?3I$lbW_1&F923GKB
z2*ag@tfIyu!eCp%!`TDT%r{`Nzn`xkHY)8i)CO>MjGyw=7>uRH<e=rU_3T2{%T}^$
z@t2Y5hx+B6<SyASSr1z!yOAulEs|4gCHJt^?1Dk3*bz0&?%_Ug2D=?*t+HK8Cln%B
zqe$Xt6+=R^*YD53w6z?YSAkgYc$Dl1!%p%Td7L~!{zRT6Pm!m|KJpB^h+WJWyM$fJ
zE@Nxh<!tRv@@zEQVuOObh#6NT2iUr3mX#V5S0alO*ws=%w4L4_`2Pk40u0$lGJfBn
zAa7yuPX5BK7-&$CchA_Mh$-v?@^Q2aK|aDR#8pFD1;6V&#O8lazKXUM$d}k!xaN=N
z|31WiM^4I})?uD6d2B!VUJ5}{7xuI<Ii&qSew0hfVdK%L(NBJo7EAT!>4Pzz|3d*%
zx00X9FXUJ98@ry}z;0w4w^BkWRZu0niQUfbWOp%blY}m$T)r?0Fr;6LWZWTRH))$V
ztcc^7fo<q0%HcM2G(vtY)v-<NW_Am^bt@vu4r+{cM8>n*(83X)*c;J}q%?ytLRcli
zvv8evRWxB^9JCD|9cbygTY{Zfa3v2Lj4ls`uw@)>35lH;O>uqFuqjdMQYecC25OHs
zk77KJp~;Ay=va0~A9SG4N!SSs_HfWIREYkF5Rwian>>L|iUBQp7Q1_(CrqaxsG?~!
zoo#0Q@r*#TXzpoH=VwTv1t|Yi*2mIPX7<b+3XW(oopIWVUvNb!>MNCPkyczF_t0Vt
zRnXaShAP=TF@~xjcMGkiHFO@^#&)n>gG|-Y#@}y&RZj|Ci1kh?+b(S}P+`TkSW3O8
ztvHM;d{`%?vYpb3tCNQvqn-MHzk+t)iXgieSKKFsG^vP**EBN7>l`kN2werK{j`g&
zWcRZ@{d6VmW_#EJQT@c=znr?FrB-qrI7zMU_&`P+DaDR+5nYRYJbE!@^b&e0y^OA*
zm$L`iL+oL;mp#HBWshyA>p-MeqScD@8oHi6j&b-2{GY&HVy`l-)T|q*YVgeh_GKm5
z<Swg5Z;W(>Wt+hSQ67-28*zKotygz?5&rokZx7dFGY5OMxJrIA5d%1<FO@)vs~g`d
zh%HhN3A6pIP_U~LyMblcvh#L^1z%~mRAtGaIVKi)1F86o%b|QI19Hs~-%g%x8tk#;
z6kwySFh8%iHzu@O=xt!=qqnj@_0ikelQEPoyK71GM6s!N(>}=}z3lux+RvVn-X28X
zOwoJj1CY9lZll}j4!RSo|9k0ubT_@9?qN@}ee4;wpFPW-W6!fcvlrNlyKv~V3x`g>
zv<=N&qTjdJC4}%*ginGkO=aFtq#c{@^$04$(YsbeGz+RK%gSrq<xAt3)FpHTYnR1u
z>k)>A7s%N*9OL^XdLVxGSJ=xeEjI8PeLa5C!|cG|NsrREaDcwaUg@K|kz?&(Du}K9
zEB$+%=zHwoAkh!#hY+njVl)3qKaq(2iyi8tpR(5_`ybbZDz6O*tpXxIUm3!%HpGyF
zxXC5gdh|<>8ro<ZziV~9L66bn4U)YIj9}Y`$Cq+b@MZ2am_a_m7n|RcU+{INj+*dw
zrWIdgj-}&h3N~=OG=MKGd(n3;LBF}2uERFYCW^K}@4(lUo3W+y47PK=!B&o4k)xQQ
zC{?%=v#^~rS5dE6pjfC_tngt2XSHIT;#$Qf#odY>ihYU~6h{<)Q~X2mf#M^@F~teR
zNyQI}pA`R5PEi&ri<Q%rGnJ)EmvX*xp;Az`DMjUS<zD5}%IB3YE8kLnru;(rmGT?q
zapei+N#!Z!kIH{1XcBY@`UGQwIl+>^C)g9531bt+C7heEG~tqjEeQt_zEtT{8LDbk
zqiUgQv1+NRRTWgNP=!@ps#U6PRgY?o>PppBs;gBSReh>$svW9bsy(U)RS&BkQ9Y|V
zta?}VSJmHDAF94k9aH_RCTfK`K|NAETCG)c>Lm39b%r`qovogxp01vuE>YL0m#RH#
zuewDosN2+{db#=n^@Zw-)J%P;dX0Lm`U>?`>U-3C)$b)HCZ3(RJaJuOU*fLBhen?m
zeRA|Kno$~qhSyBgOx5IR3N%HUV$F2T3{91$MpLV))6{DkHBFjDns!Z(W|!t^&0)>Q
zn&aA0T8&nx)oYDfv(}>JwRWvjJ61bRo1&edovAI=y0jJA+1feUDs7FnR$Hg7*EVXK
zw2QP$wAX9*YG2kK)t=HRbr#(;U8OFlTc^8I_p<Ii-50vAb;ookbSHJExRIQZvvM}h
z!Hwaja5-Eqm(LY)Gq@72j4S76aSdEE*Tr4TUBTVN-ND_(ZRYy9o!q_LZf+0vAoo0X
zkUPZvjXS2NdZk{a*Xiy0WPO^xNIy+qte>v0(+m2Dew}`c{vQ2y{Z9S8`rZ2X^`Gg#
z)*sV<tN+dbhEWE+!DuiWEQWE0vkjGo8bgQS0>g!diww+gmEmT?7Q=4C9>ar%hYe2|
zju_rHd~G;o9A}(poNruYTx#?fy~cpC%eczeZR{~#YFuMnYrMjEm2s2tKI1;)OU74>
z2aSh}ZyQe-Pa02|ET*ZZ1t!t7&UCwJyXghfOQr*+S52>(UN^mAI%;~$^o8jw(>JE$
zrW2-<reDm|tTe04iDt9eV&=_u^8|B_IoF(TE;N^$XPGO_bIqc8rTI$p)#ml)4d(03
zH=1uU-)z3se7pI6^8@CG%zMp`njbg+$^4XgpLxIeIrIDGUz5fsxsuLLx+dv?q}P+a
zN%|q_-$_3w{c2HLIE%qzvLsoo7Mo>~CC!py$+F~G3M@sIV#^%M0?QK1GRt`u!O~_C
zEz2zzSk_q9TeezuTJ~EGSU$9TV)@lN%4)JES*=!^)nT1ron)PConlS5W?BoarPgYz
zU=3M&ti9HYt(RCYvtDDp)_R@w2J1%aChK178`hJ&hEL)xJkL+$C-YPI3_gp`;VXDI
z-^e%di}|Izhi~UQ_#nT65A%#)$6v``&9CP-@|*Zu_}ln9_<Q(=_$T-$`KS43_!s$?
z`B(UZ{2~5r{-6A({O9~v{5Sk@{wEvQs7+~8*%EDLo5ME7mTVhun{1n6OSfg(vTf6B
zvuriCT3em1-nQ7b)aJ2yZ7nvxt=q<Im)h3Y*4ozFHrTGW-DtbXw!`+IZJ+IV+Y7dr
zYzJ+JY=><}Y@gUi*puuN?33)1?NjXO_Dp-WeX70G?y^_dXWQr4tL!!QT6>+{YiIVG
z?N8c2vH$3p<T%$c*HPoBb+{c3js*_UvC`4)=y6=+V2(>28ys65+Z;O_yBzm9?sq)k
zc*wEW@u=f*$7_z)9d9^}I^J@;?ReMmH^+O9_Z=TPK6ZTW_}=lWQ{f!#G&#pRQ=B=@
zY0g>BInFBQJm-9;+j*X|#VI)3o##9K&Ti+0&WoIvI4^Tv?%d$K!+E!}&$-pP&AG$*
zi1ShBW6md>FFFr6Uv(aG9(Epao^t*+2FB1arZN1Ou~BRW6iWc<kA5qE$3Dl5`yYra
BJhcD-

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 7a4a8d6..322dab3 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -97,6 +97,10 @@
 		B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
 		B50392FB1C479640009900CA /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
 		B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; };
+		B50564D32350CC3100482308 /* PropertyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50564D22350CC3100482308 /* PropertyProtocol.swift */; };
+		B50564D42350CC3100482308 /* PropertyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50564D22350CC3100482308 /* PropertyProtocol.swift */; };
+		B50564D52350CC3100482308 /* PropertyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50564D22350CC3100482308 /* PropertyProtocol.swift */; };
+		B50564D62350CC3100482308 /* PropertyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50564D22350CC3100482308 /* PropertyProtocol.swift */; };
 		B509C7F41E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
@@ -280,6 +284,10 @@
 		B53CA9A31EF1EF1600E0F440 /* PartialObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53CA9A11EF1EF1600E0F440 /* PartialObject.swift */; };
 		B53CA9A41EF1EF1600E0F440 /* PartialObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53CA9A11EF1EF1600E0F440 /* PartialObject.swift */; };
 		B53CA9A51EF1EF1600E0F440 /* PartialObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53CA9A11EF1EF1600E0F440 /* PartialObject.swift */; };
+		B53D9E5923513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */; };
+		B53D9E5A23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */; };
+		B53D9E5B23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */; };
+		B53D9E5C23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */; };
 		B53FB9FE1CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53FB9FD1CAB2D2F00F0D40A /* CSMigrationResult.swift */; };
 		B53FBA001CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53FB9FD1CAB2D2F00F0D40A /* CSMigrationResult.swift */; };
 		B53FBA011CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53FB9FD1CAB2D2F00F0D40A /* CSMigrationResult.swift */; };
@@ -376,6 +384,14 @@
 		B559CD4B1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = B559CD481CAA8C6D00E4D58B /* CSStorageInterface.swift */; };
 		B559CD4C1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = B559CD481CAA8C6D00E4D58B /* CSStorageInterface.swift */; };
 		B559CD4D1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = B559CD481CAA8C6D00E4D58B /* CSStorageInterface.swift */; };
+		B55BB4D4235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
+		B55BB4D5235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
+		B55BB4D6235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
+		B55BB4D7235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
+		B55BB4D823503B9500C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B55BB4D923503B9600C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B55BB4DA23503B9600C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B55BB4DB23503B9700C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
 		B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; };
 		B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; };
 		B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; };
@@ -790,10 +806,6 @@
 		B5F8496D234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496E234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496F234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
-		B5F849712348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B5F849722348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B5F849732348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B5F849742348A6690029D57B /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
 		B5FAD6A91B50A4B400714891 /* Progress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */; };
 		B5FAD6AC1B51285300714891 /* Internals.MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */; };
 		B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; };
@@ -864,6 +876,7 @@
 		B501FDE61CA8D20500BE22EF /* CSListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSListObserver.swift; sourceTree = "<group>"; };
 		B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Transaction.swift"; sourceTree = "<group>"; };
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
+		B50564D22350CC3100482308 /* PropertyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PropertyProtocol.swift; sourceTree = "<group>"; };
 		B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableAttributeType.swift; sourceTree = "<group>"; };
 		B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+DataSources.swift"; sourceTree = "<group>"; };
 		B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Convenience.swift"; sourceTree = "<group>"; };
@@ -903,6 +916,7 @@
 		B538BA701D15B3E30003A766 /* CoreStoreBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreStoreBridge.m; sourceTree = "<group>"; };
 		B53B275E1EE3B92E00E9B352 /* CoreStoreManagedObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreManagedObject.swift; sourceTree = "<group>"; };
 		B53CA9A11EF1EF1600E0F440 /* PartialObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PartialObject.swift; sourceTree = "<group>"; };
+		B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSourceSnapshotProtocol.swift; sourceTree = "<group>"; };
 		B53FB9FD1CAB2D2F00F0D40A /* CSMigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSMigrationResult.swift; sourceTree = "<group>"; };
 		B53FBA031CAB300C00F0D40A /* CSMigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSMigrationType.swift; sourceTree = "<group>"; };
 		B53FBA0A1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSCoreStore+Migrating.swift"; sourceTree = "<group>"; };
@@ -931,6 +945,7 @@
 		B55717421D15AF9C009BDBCA /* CoreStoreBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreStoreBridge.h; sourceTree = "<group>"; };
 		B559CD421CAA8B6300E4D58B /* CSSetupResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSetupResult.swift; sourceTree = "<group>"; };
 		B559CD481CAA8C6D00E4D58B /* CSStorageInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSStorageInterface.swift; sourceTree = "<group>"; };
+		B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectRepresentation.swift; sourceTree = "<group>"; };
 		B56007101B3F6BD500A9A8F9 /* Into.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Into.swift; sourceTree = "<group>"; };
 		B56007131B3F6C2800A9A8F9 /* SectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionBy.swift; sourceTree = "<group>"; };
 		B56007151B4018AB00A9A8F9 /* MigrationChain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChain.swift; sourceTree = "<group>"; };
@@ -1294,6 +1309,17 @@
 			name = Observing;
 			sourceTree = "<group>";
 		};
+		B50564CC2350699700482308 /* Protocols */ = {
+			isa = PBXGroup;
+			children = (
+				B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */,
+				B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */,
+				B50564D22350CC3100482308 /* PropertyProtocol.swift */,
+				B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */,
+			);
+			name = Protocols;
+			sourceTree = "<group>";
+		};
 		B51B5C2922D43854009FA3BA /* KeyPaths */ = {
 			isa = PBXGroup;
 			children = (
@@ -1485,7 +1511,7 @@
 				B56964D11B22FF700075EE4A /* Migrating */,
 				B5E5FA4C22D15D3C00330931 /* DataSources */,
 				B5E84F261AFF84920064E85B /* Convenience */,
-				B5E84F291AFF849C0064E85B /* Internal */,
+				B5E84F291AFF849C0064E85B /* Internals */,
 			);
 			name = Swift;
 			sourceTree = "<group>";
@@ -1550,6 +1576,7 @@
 				B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */,
 				B5F8496B234898240029D57B /* ListSnapshot.swift */,
 				B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */,
+				B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */,
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 				B5F335572348D75D00FD649F /* LiveResult.swift */,
@@ -1677,10 +1704,10 @@
 			name = Convenience;
 			sourceTree = "<group>";
 		};
-		B5E84F291AFF849C0064E85B /* Internal */ = {
+		B5E84F291AFF849C0064E85B /* Internals */ = {
 			isa = PBXGroup;
 			children = (
-				B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */,
+				B50564CC2350699700482308 /* Protocols */,
 				B53B275E1EE3B92E00E9B352 /* CoreStoreManagedObject.swift */,
 				B533C4DA1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift */,
 				B5C976E61C6E3A5900B1AF90 /* Internals.CoreStoreFetchedResultsController.swift */,
@@ -1708,9 +1735,8 @@
 				B56923C81EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift */,
 				B5FEC18D1C9166E200532541 /* NSPersistentStore+Setup.swift */,
 				B59AFF401C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift */,
-				B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */,
 			);
-			name = Internal;
+			name = Internals;
 			sourceTree = "<group>";
 		};
 		B5ECDBEA1CA6BEAC00C7F112 /* Protocol Clauses */ = {
@@ -2033,6 +2059,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B5DE5230230BDA1300A22534 /* Shared.swift in Sources */,
+				B55BB4DB23503B9700C33E34 /* EnvironmentKeys.swift in Sources */,
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
 				B5CA2B081F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
@@ -2047,6 +2074,7 @@
 				B56923FA1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514EA1EED8BF900BAB888 /* From+Querying.swift in Sources */,
 				B596BBBB1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
+				B55BB4D4235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
 				B5ECDBFF1CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B5ECDC051CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B5981CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
@@ -2072,13 +2100,13 @@
 				B53FBA121CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B751F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */,
+				B50564D32350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5D8CA762346E7590055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B5E1B5A81CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
-				B5F849712348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B5E1B59D1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
 				B5ECDC231CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
 				B549F6731E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
@@ -2187,6 +2215,7 @@
 				B5FE4DA71C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B52F743D1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B53D9E5923513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */,
 				B5474D152227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B56923FF1EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAE1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
@@ -2267,6 +2296,7 @@
 				B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBC1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC011CA80CBA00C7F112 /* CSWhere.swift in Sources */,
+				B55BB4D5235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
 				B5ECDC071CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B59A1CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
 				B5519A601CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
@@ -2287,6 +2317,7 @@
 				B5BF7FCC234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
+				B50564D42350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B53FBA141CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5831B761F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */,
@@ -2298,6 +2329,7 @@
 				B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */,
 				B50EE14323473C96009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
+				B55BB4DA23503B9600C33E34 /* EnvironmentKeys.swift in Sources */,
 				B5E1B5951CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				18166887232B9ED60097C275 /* String+KeyPaths.swift in Sources */,
 				B5ECDC2B1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
@@ -2322,6 +2354,7 @@
 				B5519A5A1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
 				B5ECDBE11CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
 				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
+				B53D9E5A23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */,
 				82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */,
 				82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */,
 				B50132312346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
@@ -2375,7 +2408,6 @@
 				B5D33A021E96012400C880DE /* Relationship.swift in Sources */,
 				B559CD4B1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
 				B56923CA1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
-				B5F849722348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B56923E51EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C641EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
 				B533C4DC1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift in Sources */,
@@ -2483,6 +2515,7 @@
 				B5BF7FC4234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBE1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B546F9601C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
+				B55BB4D7235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
 				B5ECDC0F1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5ECDC211CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B52DD1C21BE1F94600949AFE /* Internals.MigrationManager.swift in Sources */,
@@ -2503,6 +2536,7 @@
 				B5BF7FCE234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B52DD19E1BE1F92C00949AFE /* AsynchronousDataTransaction.swift in Sources */,
+				B50564D62350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B52DD1981BE1F92500949AFE /* CoreStore+Setup.swift in Sources */,
 				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
@@ -2514,6 +2548,7 @@
 				B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5220E1F1D130810009BC71E /* CSListObserver.swift in Sources */,
 				B50EE14523473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
+				B55BB4D823503B9500C33E34 /* EnvironmentKeys.swift in Sources */,
 				B52DD1941BE1F92500949AFE /* CoreStore.swift in Sources */,
 				18166889232B9ED80097C275 /* String+KeyPaths.swift in Sources */,
 				B52DD1A61BE1F92F00949AFE /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2538,6 +2573,7 @@
 				B5FE4DAF1C85D44E00FA6A91 /* SQLiteStore.swift in Sources */,
 				B52DD1C71BE1F94600949AFE /* NSManagedObjectContext+Querying.swift in Sources */,
 				B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */,
+				B53D9E5C23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */,
 				B52DD1C31BE1F94600949AFE /* Internals.NotificationObserver.swift in Sources */,
 				B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */,
 				B50132332346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
@@ -2591,7 +2627,6 @@
 				B56923CC1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
 				B56923E71EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C661EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
-				B5F849742348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B533C4DE1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift in Sources */,
 				B5220E141D130614009BC71E /* DataStack+Observing.swift in Sources */,
 				B52DD1A21BE1F92C00949AFE /* CoreStore+Transaction.swift in Sources */,
@@ -2699,6 +2734,7 @@
 				B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */,
 				B596BBBD1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC081CA8138100C7F112 /* CSOrderBy.swift in Sources */,
+				B55BB4D6235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
 				B5E1B59B1CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
 				B5519A611CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
 				B5FE4DAE1C85D44E00FA6A91 /* SQLiteStore.swift in Sources */,
@@ -2719,6 +2755,7 @@
 				B5BF7FCD234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
 				B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B53FBA151CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
+				B50564D52350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5E1B5AB1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5831B771F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */,
@@ -2730,6 +2767,7 @@
 				B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5E1B5961CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				B50EE14423473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
+				B55BB4D923503B9600C33E34 /* EnvironmentKeys.swift in Sources */,
 				B5ECDC2C1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				18166888232B9ED70097C275 /* String+KeyPaths.swift in Sources */,
 				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2754,6 +2792,7 @@
 				B5519A5B1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
 				B5ECDBE21CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
 				B56321971BD65216006C9394 /* Select.swift in Sources */,
+				B53D9E5B23513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift in Sources */,
 				B56321AB1BD6521C006C9394 /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B563219C1BD65216006C9394 /* SectionBy.swift in Sources */,
 				B50132322346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
@@ -2807,7 +2846,6 @@
 				B5215CA61FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A031E96012400C880DE /* Relationship.swift in Sources */,
 				B559CD4C1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
-				B5F849732348A6690029D57B /* EnvironmentKeys.swift in Sources */,
 				B56923CB1EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
 				B56923E61EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
 				B58D0C651EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */,
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme
index 9a36c7d..fdef8e3 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
@@ -41,18 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
-               BuildableName = "CoreStoreTests.xctest"
-               BlueprintName = "CoreStoreTests iOS"
-               ReferencedContainer = "container:CoreStore.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -69,6 +57,18 @@
             isEnabled = "YES">
          </AdditionalOption>
       </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests iOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -95,8 +95,6 @@
             isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
index 7c77eea..ebcc953 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -288,6 +288,7 @@
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
 						CreatedOnToolsVersion = 6.3;
+						DevelopmentTeam = 2JT32EJ5BH;
 						LastSwiftMigration = 0900;
 					};
 				};
@@ -493,6 +494,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 2JT32EJ5BH;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
@@ -505,6 +507,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEVELOPMENT_TEAM = 2JT32EJ5BH;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
index 449fdf6..ea0fbad 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -13,7 +13,7 @@ import CoreStore
 import SwiftUI
 
 #endif
-
+import Compression
 final class SwiftUIContainerViewController: UIViewController {
     
     override func viewDidLoad() {
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index a2d73ac..fdf851e 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -60,25 +60,48 @@ struct SwiftUIView: View {
                     }
                 }
             }
-            .navigationBarTitle(Text("SwiftUI"))
+            .navigationBarTitle(Text("SwiftUI (\(palettes.numberOfItems) objects)"))
             .navigationBarItems(
                 leading: EditButton(),
-                trailing: Button(
-                    action: {
+                trailing: HStack {
+                    Button(
+                        action: {
 
-                        self.dataStack.perform(
-                            asynchronous: { transaction in
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
 
-                                let palette = transaction.create(Into<Palette>())
-                                palette.setInitialValues(in: transaction)
-                            },
-                            completion: { _ in }
-                        )
-                    },
-                    label: {
-                        Image(systemName: "plus")
-                    }
-                )
+                                    for palette in try transaction.fetchAll(From<Palette>()) {
+
+                                        palette.hue .= Palette.randomHue()
+                                        palette.colorName .= nil
+                                    }
+                                },
+                                completion: { _ in }
+                            )
+                        },
+                        label: {
+                            Image(systemName: "goforward")
+                        }
+                    )
+                    .frame(width: 30)
+                    Button(
+                        action: {
+
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
+
+                                    let palette = transaction.create(Into<Palette>())
+                                    palette.setInitialValues(in: transaction)
+                                },
+                                completion: { _ in }
+                            )
+                        },
+                        label: {
+                            Image(systemName: "plus")
+                        }
+                    )
+                    .frame(width: 30)
+                }
             )
             .alert(
                 isPresented: $needsShowAlert,
diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift
index 2283795..1147710 100644
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -164,24 +164,72 @@ class DynamicModelTests: BaseTestDataTestCase {
                     
                     animal.color .= .yellow
                     XCTAssertEqual(animal.color.value, Color.yellow)
+
+                    for property in Animal.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Animal.species):
+                            XCTAssertTrue(property is ValueContainer<Animal>.Required<String>)
+
+                        case String(keyPath: \Animal.master):
+                            XCTAssertTrue(property is RelationshipContainer<Animal>.ToOne<Person>)
+
+                        case String(keyPath: \Animal.color):
+                            XCTAssertTrue(property is TransformableContainer<Animal>.Optional<Color>)
+
+                        default:
+                            XCTFail("Unknown KeyPath: \"\(property.keyPath)\"")
+                        }
+                    }
                     
                     let dog = transaction.create(Into<Dog>())
                     XCTAssertEqual(dog.species.value, "Swift")
                     XCTAssertEqual(dog.nickname.value, nil)
                     XCTAssertEqual(dog.age.value, 1)
 
-                    #if swift(>=5.1)
+                    for property in Dog.metaProperties(includeSuperclasses: true) {
 
-                    let dogKeyPathBuilder = Dog.keyPathBuilder()
-                    XCTAssertEqual(dogKeyPathBuilder.species.keyPathString, "SELF.species")
-                    XCTAssertEqual(dogKeyPathBuilder.master.title.keyPathString, "SELF.master.title")
-                    let a = dogKeyPathBuilder.master
-                    let b = dogKeyPathBuilder.master.spouse
-                    let c = dogKeyPathBuilder.master.spouse.pets
-                    let d = dogKeyPathBuilder.master.spouse.pets.color
-                    XCTAssertEqual(dogKeyPathBuilder.master.spouse.pets.color.keyPathString, "SELF.master.spouse.pets.color")
+                        switch property.keyPath {
 
-                    #endif
+                        case String(keyPath: \Dog.species):
+                            XCTAssertTrue(property is ValueContainer<Animal>.Required<String>)
+
+                        case String(keyPath: \Dog.master):
+                            XCTAssertTrue(property is RelationshipContainer<Animal>.ToOne<Person>)
+
+                        case String(keyPath: \Dog.color):
+                            XCTAssertTrue(property is TransformableContainer<Animal>.Optional<Color>)
+
+                        case String(keyPath: \Dog.nickname):
+                            XCTAssertTrue(property is ValueContainer<Dog>.Optional<String>)
+
+                        case String(keyPath: \Dog.age):
+                            XCTAssertTrue(property is ValueContainer<Dog>.Required<Int>)
+
+                        case String(keyPath: \Dog.friends):
+                            XCTAssertTrue(property is RelationshipContainer<Dog>.ToManyOrdered<Dog>)
+
+                        case String(keyPath: \Dog.friendedBy):
+                            XCTAssertTrue(property is RelationshipContainer<Dog>.ToManyUnordered<Dog>)
+
+                        default:
+                            XCTFail("Unknown KeyPath: \"\(property.keyPath)\"")
+                        }
+                    }
+
+//                    #if swift(>=5.1)
+//
+//                    let dogKeyPathBuilder = Dog.keyPathBuilder()
+//                    XCTAssertEqual(dogKeyPathBuilder.species.keyPathString, "SELF.species")
+//                    XCTAssertEqual(dogKeyPathBuilder.master.title.keyPathString, "SELF.master.title")
+//                    let a = dogKeyPathBuilder.master
+//                    let b = dogKeyPathBuilder.master.spouse
+//                    let c = dogKeyPathBuilder.master.spouse.pets
+//                    let d = dogKeyPathBuilder.master.spouse.pets.color
+//                    XCTAssertEqual(dogKeyPathBuilder.master.spouse.pets.color.keyPathString, "SELF.master.spouse.pets.color")
+//
+//                    #endif
 
                     let didSetObserver = dog.species.observe(options: [.new, .old]) { (object, change) in
 
@@ -244,22 +292,22 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTAssertEqual(person.name.value, "John")
                     XCTAssertEqual(person.displayName.value, "Mr. John") // Custom getter
                     
-                    let personSnapshot1 = person.createSnapshot()
-                    XCTAssertEqual(person.name.value, personSnapshot1.name)
-                    XCTAssertEqual(person.title.value, personSnapshot1.title)
-                    XCTAssertEqual(person.displayName.value, personSnapshot1.displayName)
+//                    let personSnapshot1 = person.createSnapshot()
+//                    XCTAssertEqual(person.name.value, personSnapshot1.name)
+//                    XCTAssertEqual(person.title.value, personSnapshot1.title)
+//                    XCTAssertEqual(person.displayName.value, personSnapshot1.displayName)
                     
                     person.title .= "Sir"
                     XCTAssertEqual(person.displayName.value, "Sir John")
                     
-                    XCTAssertEqual(personSnapshot1.name, "John")
-                    XCTAssertEqual(personSnapshot1.title, "Mr.")
-                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
+//                    XCTAssertEqual(personSnapshot1.name, "John")
+//                    XCTAssertEqual(personSnapshot1.title, "Mr.")
+//                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
                     
-                    let personSnapshot2 = person.createSnapshot()
-                    XCTAssertEqual(person.name.value, personSnapshot2.name)
-                    XCTAssertEqual(person.title.value, personSnapshot2.title)
-                    XCTAssertEqual(person.displayName.value, personSnapshot2.displayName)
+//                    let personSnapshot2 = person.createSnapshot()
+//                    XCTAssertEqual(person.name.value, personSnapshot2.name)
+//                    XCTAssertEqual(person.title.value, personSnapshot2.title)
+//                    XCTAssertEqual(person.displayName.value, personSnapshot2.displayName)
                     
                     person.pets.value.insert(dog)
                     XCTAssertEqual(person.pets.count, 1)
diff --git a/CoreStoreTests/LiveListTests.swift b/CoreStoreTests/LiveListTests.swift
index e9ad339..0d8184c 100644
--- a/CoreStoreTests/LiveListTests.swift
+++ b/CoreStoreTests/LiveListTests.swift
@@ -33,7 +33,7 @@ import CoreStore
 
 // MARK: - LiveListTests
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 class LiveListTests: BaseTestDataTestCase {
 
     @objc
diff --git a/Sources/AttributeProtocol.swift b/Sources/AttributeProtocol.swift
index 0890817..37aa359 100644
--- a/Sources/AttributeProtocol.swift
+++ b/Sources/AttributeProtocol.swift
@@ -29,11 +29,10 @@ import CoreData
 
 // MARK: - AttributeProtocol
 
-internal protocol AttributeProtocol: AnyObject {
+internal protocol AttributeProtocol: PropertyProtocol {
     
     static var attributeType: NSAttributeType { get }
     
-    var keyPath: KeyPathString { get }
     var isOptional: Bool { get }
     var isTransient: Bool { get }
     var allowsExternalBinaryDataStorage: Bool { get }
diff --git a/Sources/CoreStoreObject+DataSources.swift b/Sources/CoreStoreObject+DataSources.swift
index 4080be2..3147b2c 100644
--- a/Sources/CoreStoreObject+DataSources.swift
+++ b/Sources/CoreStoreObject+DataSources.swift
@@ -13,7 +13,7 @@ import Combine
 
 // MARK: - LiveList: ObservableObject
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 extension CoreStoreObject: ObservableObject {
 
     // MARK: ObservableObject
diff --git a/Sources/CoreStoreObject.swift b/Sources/CoreStoreObject.swift
index 34b5de7..43d73f3 100644
--- a/Sources/CoreStoreObject.swift
+++ b/Sources/CoreStoreObject.swift
@@ -116,6 +116,27 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
     
     internal let rawObject: CoreStoreManagedObject?
     internal let isMeta: Bool
+
+    internal class func metaProperties(includeSuperclasses: Bool) -> [PropertyProtocol] {
+
+        func keyPaths(_ allKeyPaths: inout [PropertyProtocol], for dynamicType: CoreStoreObject.Type) {
+
+            allKeyPaths.append(contentsOf: dynamicType.meta.propertyProtocolsByName())
+            guard
+                includeSuperclasses,
+                case let superType as CoreStoreObject.Type = (dynamicType as AnyClass).superclass(),
+                superType != CoreStoreObject.self
+                else {
+
+                    return
+            }
+            keyPaths(&allKeyPaths, for: superType)
+        }
+
+        var allKeyPaths: [PropertyProtocol] = []
+        keyPaths(&allKeyPaths, for: self)
+        return allKeyPaths
+    }
     
     
     // MARK: Private
@@ -144,6 +165,22 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
             }
         }
     }
+
+    private func propertyProtocolsByName() -> [PropertyProtocol] {
+
+        Internals.assert(self.isMeta, "'propertyProtocolsByName()' accessed from non-meta instance of \(Internals.typeName(self))")
+
+        let cacheKey = ObjectIdentifier(Self.self)
+        if let properties = Static.propertiesCache[cacheKey] {
+
+            return properties
+        }
+        let values: [PropertyProtocol] = Mirror(reflecting: self)
+            .children
+            .compactMap({ $0.value as? PropertyProtocol })
+        Static.propertiesCache[cacheKey] = values
+        return values
+    }
 }
 
 
@@ -187,4 +224,5 @@ fileprivate enum Static {
     // MARK: FilePrivate
     
     fileprivate static var metaCache: [ObjectIdentifier: Any] = [:]
+    fileprivate static var propertiesCache: [ObjectIdentifier: [PropertyProtocol]] = [:]
 }
diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift
index e2def5d..91905e5 100644
--- a/Sources/CoreStoreSchema.swift
+++ b/Sources/CoreStoreSchema.swift
@@ -283,9 +283,9 @@ public final class CoreStoreSchema: DynamicSchema {
         func createProperties(for type: CoreStoreObject.Type) -> [NSPropertyDescription] {
             
             var propertyDescriptions: [NSPropertyDescription] = []
-            for child in Mirror(reflecting: type.meta).children {
+            for property in type.metaProperties(includeSuperclasses: false) {
                 
-                switch child.value {
+                switch property {
                     
                 case let attribute as AttributeProtocol:
                     Internals.assert(
@@ -378,9 +378,10 @@ public final class CoreStoreSchema: DynamicSchema {
         for (entity, entityDescription) in entityDescriptionsByEntity {
             
             let relationshipsByName = relationshipsByNameByEntity[entity]!
-            for child in Mirror(reflecting: (entity.type as! CoreStoreObject.Type).meta).children {
+            let entityType = entity.type as! CoreStoreObject.Type
+            for property in entityType.metaProperties(includeSuperclasses: false) {
                 
-                switch child.value {
+                switch property {
                     
                 case let relationship as RelationshipProtocol:
                     let (destinationType, destinationKeyPath) = relationship.inverse
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 3b0c24d..34ce792 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -31,7 +31,7 @@ import CoreData
 
 // MARK: - DataStack
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 extension DataStack {
 
     public func liveList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
index 2ff6cd9..9be4987 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -48,7 +48,7 @@ import CoreData
 //            self.tableView = tableView
 //            self.cellProvider = cellProvider
 //
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
 //                self.rawDataSource = UITableViewDiffableDataSource<String, D.ObjectID>(
 //                    tableView: tableView,
@@ -71,7 +71,7 @@ import CoreData
 //        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
 //
 //            let dataSource = UITableViewDiffableDataSource<String, D>.
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
 //                self.rawDataSource! as! UITableViewDiffableDataSource<String, D>
 //
@@ -95,7 +95,7 @@ import CoreData
 //        private let cellProvider: (UITableView, IndexPath, ObjectType) -> UITableViewCell?
 //        private let rawDataSource: Any?
 //
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 //        private var diffableDataSource: UITableViewDiffableDataSource<String, D.ObjectID> {
 //
 //            return self.rawDataSource! as! UITableViewDiffableDataSource<String, D.ObjectID>
diff --git a/Sources/DiffableDataSourceSnapshotProtocol.swift b/Sources/DiffableDataSourceSnapshotProtocol.swift
new file mode 100644
index 0000000..46872bc
--- /dev/null
+++ b/Sources/DiffableDataSourceSnapshotProtocol.swift
@@ -0,0 +1,34 @@
+//
+//  DiffableDataSourceSnapshotProtocol.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - DiffableDataSourceSnapshotProtocol
+
+internal protocol DiffableDataSourceSnapshotProtocol {
+
+}
diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift
index d5054aa..b0eebc4 100644
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -74,10 +74,10 @@ extension DynamicObject {
 
     // MARK: Internal
     
-    internal static func keyPathBuilder() -> DynamicObjectMeta<Never, Self> {
-
-        return .init(keyPathString: "SELF")
-    }
+//    internal static func keyPathBuilder() -> DynamicObjectMeta<Never, Self> {
+//
+//        return .init(keyPathString: "SELF")
+//    }
     
     internal func runtimeType() -> Self.Type {
         
diff --git a/Sources/EnvironmentKeys.swift b/Sources/EnvironmentKeys.swift
index 2472e96..882e012 100644
--- a/Sources/EnvironmentKeys.swift
+++ b/Sources/EnvironmentKeys.swift
@@ -2,8 +2,25 @@
 //  EnvironmentKeys.swift
 //  CoreStore
 //
-//  Created by John Rommel Estropia on 2019/10/05.
-//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
 //
 
 #if canImport(SwiftUI)
@@ -13,7 +30,7 @@ import SwiftUI
 
 // MARK: - DataStackEnvironmentKey
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 public struct DataStackEnvironmentKey: EnvironmentKey {
 
     // MARK: Public
@@ -27,7 +44,7 @@ public struct DataStackEnvironmentKey: EnvironmentKey {
 
 // MARK: - EnvironmentValues
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 extension EnvironmentValues {
 
     // MARK: Public
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index f5afcf9..deb0a74 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -48,18 +48,14 @@ extension Internals {
 
         // MARK: Internal
 
-        internal let nextStateTag: UUID
-
         init() {
 
             self.structure = .init()
-            self.nextStateTag = .init()
         }
 
-        init(sections: [NSFetchedResultsSectionInfo], previousStateTag: UUID, nextStateTag: UUID) {
+        init(sections: [NSFetchedResultsSectionInfo]) {
 
-            self.structure = .init(sections: sections, previousStateTag: previousStateTag)
-            self.nextStateTag = nextStateTag
+            self.structure = .init(sections: sections)
         }
 
         var numberOfItems: Int {
@@ -77,21 +73,11 @@ extension Internals {
             return self.structure.allSectionIDs
         }
 
-        var allSectionStateIDs: [SectionStateID] {
-
-            return self.structure.allSectionStateIDs
-        }
-
         var allItemIDs: [NSManagedObjectID] {
 
             return self.structure.allItemIDs
         }
 
-        var allItemStateIDs: [ItemStateID] {
-
-            return self.structure.allItemStateIDs
-        }
-
         func numberOfItems(inSection identifier: String) -> Int {
 
             return self.itemIDs(inSection: identifier).count
@@ -102,21 +88,11 @@ extension Internals {
             return self.structure.items(in: identifier)
         }
 
-        func itemStateIDs(inSection identifier: String) -> [ItemStateID] {
-
-            return self.structure.itemStateIDs(in: identifier)
-        }
-
         func sectionIDs(containingItem identifier: NSManagedObjectID) -> String? {
 
             return self.structure.section(containing: identifier)
         }
 
-        func sectionStateIDs(containingItem identifier: NSManagedObjectID) -> SectionStateID? {
-
-            return self.structure.sectionStateID(containing: identifier)
-        }
-
         func indexOfItemID(_ identifier: NSManagedObjectID) -> Int? {
 
             return self.structure.allItemIDs.firstIndex(of: identifier)
@@ -127,24 +103,19 @@ extension Internals {
             return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
 
-        func itemIDs(where stateCondition: @escaping (UUID) -> Bool) -> [NSManagedObjectID] {
+        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
 
-            return self.structure.itemsIDs(where: stateCondition)
+            self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
         }
 
-        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?, nextStateTag: UUID) {
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID) {
 
-            self.structure.append(itemIDs: identifiers, to: sectionIdentifier, nextStateTag: nextStateTag)
+            self.structure.insert(itemIDs: identifiers, before: beforeIdentifier)
         }
 
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID, nextStateTag: UUID) {
+        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID) {
 
-            self.structure.insert(itemIDs: identifiers, before: beforeIdentifier, nextStateTag: nextStateTag)
-        }
-
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID, nextStateTag: UUID) {
-
-            self.structure.insert(itemIDs: identifiers, after: afterIdentifier, nextStateTag: nextStateTag)
+            self.structure.insert(itemIDs: identifiers, after: afterIdentifier)
         }
 
         mutating func deleteItems(_ identifiers: [NSManagedObjectID]) {
@@ -172,19 +143,19 @@ extension Internals {
             self.structure.update(itemIDs: identifiers, nextStateTag: nextStateTag)
         }
 
-        mutating func appendSections(_ identifiers: [String], nextStateTag: UUID) {
+        mutating func appendSections(_ identifiers: [String]) {
 
-            self.structure.append(sectionIDs: identifiers, nextStateTag: nextStateTag)
+            self.structure.append(sectionIDs: identifiers)
         }
 
-        mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String, nextStateTag: UUID) {
+        mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String) {
 
-            self.structure.insert(sectionIDs: identifiers, before: toIdentifier, nextStateTag: nextStateTag)
+            self.structure.insert(sectionIDs: identifiers, before: toIdentifier)
         }
 
-        mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String, nextStateTag: UUID) {
+        mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String) {
 
-            self.structure.insert(sectionIDs: identifiers, after: toIdentifier, nextStateTag: nextStateTag)
+            self.structure.insert(sectionIDs: identifiers, after: toIdentifier)
         }
 
         mutating func deleteSections(_ identifiers: [String]) {
@@ -271,7 +242,7 @@ extension Internals {
                 self.sections = []
             }
 
-            init(sections: [NSFetchedResultsSectionInfo], previousStateTag: UUID) {
+            init(sections: [NSFetchedResultsSectionInfo]) {
 
                 self.sections = sections.map {
 
@@ -279,8 +250,7 @@ extension Internals {
                         id: $0.name,
                         items: $0.objects?
                             .compactMap({ ($0 as? NSManagedObject)?.objectID })
-                            .map({ Item(id: $0, stateTag: previousStateTag) }) ?? [],
-                        stateTag: previousStateTag
+                            .map({ Item(id: $0) }) ?? []
                     )
                 }
             }
@@ -290,21 +260,11 @@ extension Internals {
                 return self.sections.map({ $0.id })
             }
 
-            var allSectionStateIDs: [SectionStateID] {
-
-                return self.sections.map({ $0.stateID })
-            }
-
             var allItemIDs: [NSManagedObjectID] {
 
                 return self.sections.lazy.flatMap({ $0.elements }).map({ $0.id })
             }
 
-            var allItemStateIDs: [ItemStateID] {
-
-                return self.sections.lazy.flatMap({ $0.elements }).map({ $0.stateID })
-            }
-
             func items(in sectionID: String) -> [NSManagedObjectID] {
 
                 guard let sectionIndex = self.sectionIndex(of: sectionID) else {
@@ -314,33 +274,12 @@ extension Internals {
                 return self.sections[sectionIndex].elements.map({ $0.id })
             }
 
-            func itemsIDs(where stateCondition: @escaping (UUID) -> Bool) -> [NSManagedObjectID] {
-
-                return self.sections.lazy
-                    .flatMap({ $0.elements.filter({ stateCondition($0.stateTag) }) })
-                    .map({ $0.id })
-            }
-
-            func itemStateIDs(in sectionID: String) -> [ItemStateID] {
-
-                guard let sectionIndex = self.sectionIndex(of: sectionID) else {
-
-                    Internals.abort("Section \"\(sectionID)\" does not exist")
-                }
-                return self.sections[sectionIndex].elements.map({ $0.stateID })
-            }
-
             func section(containing itemID: NSManagedObjectID) -> String? {
 
                 return self.itemPositionMap()[itemID]?.section.id
             }
 
-            func sectionStateID(containing itemID: NSManagedObjectID) -> SectionStateID? {
-
-                return self.itemPositionMap()[itemID]?.section.stateID
-            }
-
-            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?, nextStateTag: UUID) {
+            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?) {
 
                 let index: Array<Section>.Index
                 if let sectionID = sectionID {
@@ -360,22 +299,22 @@ extension Internals {
                     }
                     index = section.index(before: section.endIndex)
                 }
-                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
+                let items = itemIDs.lazy.map({ Item(id: $0) })
                 self.sections[index].elements.append(contentsOf: items)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID, nextStateTag: UUID) {
+            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID) {
 
                 guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
 
                     Internals.abort("Item \(beforeItemID) does not exist")
                 }
-                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
+                let items = itemIDs.lazy.map({ Item(id: $0) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemPosition.itemRelativeIndex)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID, nextStateTag: UUID) {
+            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID) {
 
                 guard let itemPosition = self.itemPositionMap()[afterItemID] else {
 
@@ -383,7 +322,7 @@ extension Internals {
                 }
                 let itemIndex = self.sections[itemPosition.sectionIndex].elements
                     .index(after: itemPosition.itemRelativeIndex)
-                let items = itemIDs.lazy.map({ Item(id: $0, stateTag: nextStateTag) })
+                let items = itemIDs.lazy.map({ Item(id: $0) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemIndex)
             }
@@ -459,34 +398,34 @@ extension Internals {
                         continue
                     }
                     self.sections[itemPosition.sectionIndex]
-                        .elements[itemPosition.itemRelativeIndex].stateTag = nextStateTag
+                        .elements[itemPosition.itemRelativeIndex].isReloaded = true
                 }
             }
 
-            mutating func append(sectionIDs: [String], nextStateTag: UUID) {
+            mutating func append(sectionIDs: [String]) {
 
-                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
+                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
                 self.sections.append(contentsOf: newSections)
             }
 
-            mutating func insert(sectionIDs: [String], before beforeSectionID: String, nextStateTag: UUID) {
+            mutating func insert(sectionIDs: [String], before beforeSectionID: String) {
 
                 guard let sectionIndex = self.sectionIndex(of: beforeSectionID) else {
 
                     Internals.abort("Section \"\(beforeSectionID)\" does not exist")
                 }
-                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
+                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
-            mutating func insert(sectionIDs: [String], after afterSectionID: String, nextStateTag: UUID) {
+            mutating func insert(sectionIDs: [String], after afterSectionID: String) {
 
                 guard let beforeIndex = self.sectionIndex(of: afterSectionID) else {
 
                     Internals.abort("Section \"\(afterSectionID)\" does not exist")
                 }
                 let sectionIndex = self.sections.index(after: beforeIndex)
-                let newSections = sectionIDs.lazy.map({ Section(id: $0, stateTag: nextStateTag) })
+                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
@@ -533,7 +472,7 @@ extension Internals {
 
                         continue
                     }
-                    self.sections[sectionIndex].stateTag = nextStateTag
+                    self.sections[sectionIndex].isReloaded = true
                 }
             }
 
@@ -589,22 +528,17 @@ extension Internals {
 
             fileprivate struct Item: Identifiable, Equatable {
 
-                var stateTag: UUID
+                var isReloaded: Bool
 
-                init(id: NSManagedObjectID, stateTag: UUID) {
+                init(id: NSManagedObjectID, isReloaded: Bool = false) {
 
                     self.id = id
-                    self.stateTag = stateTag
-                }
-
-                var stateID: ItemStateID {
-
-                    return .init(id: self.id, stateTag: self.stateTag)
+                    self.isReloaded = isReloaded
                 }
 
                 func isContentEqual(to source: Item) -> Bool {
 
-                    return self.id == source.id && self.stateTag == source.stateTag
+                    return !self.isReloaded && self.id == source.id
                 }
 
                 // MARK: Identifiable
@@ -618,27 +552,22 @@ extension Internals {
             fileprivate struct Section: Identifiable, Equatable {
 
                 var elements: [Item] = []
-                var stateTag: UUID
+                var isReloaded: Bool
 
-                init(id: String, items: [Item] = [], stateTag: UUID) {
+                init(id: String, items: [Item] = [], isReloaded: Bool = false) {
                     self.id = id
                     self.elements = items
-                    self.stateTag = stateTag
+                    self.isReloaded = isReloaded
                 }
 
                 init<S: Sequence>(source: Section, elements: S) where S.Element == Item {
 
-                    self.init(id: source.id, items: Array(elements), stateTag: source.stateTag)
-                }
-
-                var stateID: SectionStateID {
-
-                    return .init(id: self.id, stateTag: self.stateTag)
+                    self.init(id: source.id, items: Array(elements), isReloaded: source.isReloaded)
                 }
 
                 func isContentEqual(to source: Section) -> Bool {
 
-                    return self.id == source.id && self.stateTag == source.stateTag
+                    return !self.isReloaded && self.id == source.id
                 }
 
                 // MARK: Identifiable
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index a9185f8..a49e902 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -77,7 +77,7 @@ extension Internals {
 
 //            #if canImport(UIKit) || canImport(AppKit)
 //
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
 //                return
 //            }
@@ -96,7 +96,7 @@ extension Internals {
 
 //        #if canImport(UIKit) || canImport(AppKit)
 //
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 //        @objc
 //        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
 //
@@ -111,48 +111,12 @@ extension Internals {
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
 
-            let nextStateTag: UUID = .init()
-            var dataSourceSnapshot = Internals.DiffableDataSourceSnapshot(
-                sections: controller.sections ?? [],
-                previousStateTag: self.previousStateTag,
-                nextStateTag: nextStateTag
-            )
-            dataSourceSnapshot.reloadItems(self.reloadedItemIDs, nextStateTag: nextStateTag)
-            dataSourceSnapshot.reloadSections(self.reloadedSectionIDs, nextStateTag: nextStateTag)
-
             self.handler?.controller(
                 controller,
-                didChangContentWith: dataSourceSnapshot
+                didChangContentWith: Internals.DiffableDataSourceSnapshot(
+                    sections: controller.sections ?? []
+                )
             )
-            self.previousStateTag = nextStateTag
         }
-
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
-
-            let managedObject = anObject as! NSManagedObject
-            self.reloadedItemIDs.insert(managedObject.objectID)
-        }
-
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
-
-            self.reloadedSectionIDs.insert(sectionInfo.name)
-        }
-
-
-        // MARK: Private
-
-        private var previousStateTag: UUID = .init() {
-
-            didSet {
-
-                self.reloadedItemIDs = []
-                self.reloadedSectionIDs = []
-            }
-        }
-
-        private var reloadedItemIDs: Set<NSManagedObjectID> = []
-        private var reloadedSectionIDs: Set<String> = []
     }
 }
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 5509a4b..51b985d 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -128,17 +128,17 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public mutating func appendItems(_ identifiers: [ItemID], toSection sectionIdentifier: SectionID? = nil) {
 
-        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier, nextStateTag: .init())
+        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier)
     }
 
     public mutating func insertItems(_ identifiers: [ItemID], beforeItem beforeIdentifier: ItemID) {
 
-        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier, nextStateTag: .init())
+        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier)
     }
 
     public mutating func insertItems(_ identifiers: [ItemID], afterItem afterIdentifier: ItemID) {
 
-        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier, nextStateTag: .init())
+        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier)
     }
 
     public mutating func deleteItems(_ identifiers: [ItemID]) {
@@ -168,17 +168,17 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public mutating func appendSections(_ identifiers: [SectionID]) {
 
-        self.diffableSnapshot.appendSections(identifiers, nextStateTag: .init())
+        self.diffableSnapshot.appendSections(identifiers)
     }
 
     public mutating func insertSections(_ identifiers: [SectionID], beforeSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.insertSections(identifiers, beforeSection: toIdentifier, nextStateTag: .init())
+        self.diffableSnapshot.insertSections(identifiers, beforeSection: toIdentifier)
     }
 
     public mutating func insertSections(_ identifiers: [SectionID], afterSection toIdentifier: SectionID) {
 
-        self.diffableSnapshot.insertSections(identifiers, afterSection: toIdentifier, nextStateTag: .init())
+        self.diffableSnapshot.insertSections(identifiers, afterSection: toIdentifier)
     }
 
     public mutating func deleteSections(_ identifiers: [SectionID]) {
@@ -263,16 +263,6 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         self.diffableSnapshot = diffableSnapshot
         self.context = context
     }
-
-    internal var nextStateTag: UUID {
-
-        return self.diffableSnapshot.nextStateTag
-    }
-
-    internal func itemIDs(where stateCondition: @escaping (UUID) -> Bool) -> [ItemID] {
-
-        return self.diffableSnapshot.itemIDs(where: stateCondition)
-    }
     
     
     // MARK: Private
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 1029a64..da455aa 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -49,10 +49,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
         willSet {
 
-            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
-
-                self.willChange()
-            }
+            self.willChange()
         }
     }
 
@@ -267,7 +264,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
             applyFetchClauses: applyFetchClauses
         )
 
-        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 
             #if canImport(Combine)
             self.rawObjectWillChange = ObservableObjectPublisher()
@@ -318,20 +315,33 @@ extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 #if canImport(Combine)
 import Combine
 
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+extension LiveList: ObservableObject {}
+
+#endif
+
 // MARK: - LiveList: LiveResult
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 extension LiveList: LiveResult {
 
     // MARK: ObservableObject
 
+    #if canImport(Combine)
+
+    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
     public var objectWillChange: ObservableObjectPublisher {
 
         return self.rawObjectWillChange! as! ObservableObjectPublisher
     }
 
+    #endif
+
     public func willChange() {
 
+        guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) else {
+
+            return
+        }
         #if canImport(Combine)
 
         #if canImport(SwiftUI)
@@ -340,11 +350,10 @@ extension LiveList: LiveResult {
             self.objectWillChange.send()
         }
 
-        #else
-        self.objectWillChange.send()
-
         #endif
 
+        self.objectWillChange.send()
+
         #endif
     }
 
@@ -353,5 +362,3 @@ extension LiveList: LiveResult {
         // TODO:
     }
 }
-
-#endif
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index f11be0d..2e6c937 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -100,7 +100,7 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
         self.id = id
         self.context = context
-        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
+        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 
             #if canImport(Combine)
             self.rawObjectWillChange = ObservableObjectPublisher()
@@ -132,10 +132,7 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
                         return
                 }
                 self.$lazySnapshot.reset({ initializer(id, context) })
-                if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *) {
-
-                    self.willChange()
-                }
+                self.willChange()
             }
         )
 
@@ -156,20 +153,33 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 #if canImport(Combine)
 import Combine
 
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+extension LiveObject: ObservableObject {}
+
+#endif
+
 // MARK: - LiveObject: LiveResult
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 extension LiveObject: LiveResult {
 
     // MARK: ObservableObject
 
+    #if canImport(Combine)
+
+    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
     public var objectWillChange: ObservableObjectPublisher {
 
         return self.rawObjectWillChange! as! ObservableObjectPublisher
     }
+    
+    #endif
 
     public func willChange() {
 
+        guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) else {
+
+            return
+        }
         #if canImport(Combine)
 
         #if canImport(SwiftUI)
@@ -178,11 +188,10 @@ extension LiveObject: LiveResult {
             self.objectWillChange.send()
         }
 
-        #else
-        self.objectWillChange.send()
-
         #endif
 
+        self.objectWillChange.send()
+
         #endif
     }
 
@@ -192,8 +201,6 @@ extension LiveObject: LiveResult {
     }
 }
 
-#endif
-
 
 // MARK: - LiveObject where O: NSManagedObject
 
diff --git a/Sources/LiveQuery.swift b/Sources/LiveQuery.swift
index c270229..aefa1ce 100644
--- a/Sources/LiveQuery.swift
+++ b/Sources/LiveQuery.swift
@@ -31,7 +31,7 @@
 //
 //
 //#warning("TODO: autoupdating doesn't work yet")
-//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 //@propertyWrapper
 //public struct LiveQuery<Result: LiveResult>: DynamicProperty {
 //    
@@ -143,7 +143,7 @@
 //
 //#if canImport(UIKit) || canImport(AppKit)
 //
-//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 //extension LiveQuery {
 //
 //    public init<D: DynamicObject>(liveList: LiveList<D>) where Result == LiveList<D> {
diff --git a/Sources/LiveResult.swift b/Sources/LiveResult.swift
index e246116..e2c012f 100644
--- a/Sources/LiveResult.swift
+++ b/Sources/LiveResult.swift
@@ -36,8 +36,7 @@ import AppKit
 
 // MARK: - LiveResult
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-public protocol LiveResult: ObservableObject {
+public protocol LiveResult: AnyObject {
     
     associatedtype ObjectType
     associatedtype SnapshotType: SnapshotResult where SnapshotType.ObjectType == Self.ObjectType
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
new file mode 100644
index 0000000..d68b8e2
--- /dev/null
+++ b/Sources/ObjectRepresentation.swift
@@ -0,0 +1,9 @@
+//
+//  ObjectRepresentation.swift
+//  CoreStore
+//
+//  Created by John Estropia on 2019/10/11.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
diff --git a/Sources/PropertyProtocol.swift b/Sources/PropertyProtocol.swift
new file mode 100644
index 0000000..1c6292a
--- /dev/null
+++ b/Sources/PropertyProtocol.swift
@@ -0,0 +1,35 @@
+//
+//  PropertyProtocol.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - PropertyProtocol
+
+internal protocol PropertyProtocol: AnyObject {
+
+    var keyPath: KeyPathString { get }
+}
diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift
index 6fe5419..4243db4 100644
--- a/Sources/Relationship.swift
+++ b/Sources/Relationship.swift
@@ -249,11 +249,15 @@ public enum RelationshipContainer<O: CoreStoreObject> {
         // MARK: RelationshipKeyPathStringConvertible
 
         public typealias ReturnValueType = DestinationValueType?
+
+
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
         
         
         // MARK: RelationshipProtocol
-        
-        internal let keyPath: KeyPathString
+
         internal let isToMany = false
         internal let isOrdered = false
         internal let deleteRule: NSDeleteRule
@@ -540,11 +544,15 @@ public enum RelationshipContainer<O: CoreStoreObject> {
         // MARK: RelationshipKeyPathStringConvertible
 
         public typealias ReturnValueType = [DestinationValueType]
+
+
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
         
         
         // MARK: RelationshipProtocol
-        
-        internal let keyPath: KeyPathString
+
         internal let isToMany = true
         internal let isOptional = true
         internal let isOrdered = true
@@ -837,11 +845,15 @@ public enum RelationshipContainer<O: CoreStoreObject> {
         // MARK: RelationshipKeyPathStringConvertible
 
         public typealias ReturnValueType = Set<DestinationValueType>
+
+
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
         
         
         // MARK: RelationshipProtocol
         
-        internal let keyPath: KeyPathString
         internal let isToMany = true
         internal let isOptional = true
         internal let isOrdered = false
diff --git a/Sources/RelationshipProtocol.swift b/Sources/RelationshipProtocol.swift
index 31e4293..b2269a5 100644
--- a/Sources/RelationshipProtocol.swift
+++ b/Sources/RelationshipProtocol.swift
@@ -29,9 +29,8 @@ import CoreData
 
 // MARK: - RelationshipProtocol
 
-internal protocol RelationshipProtocol: AnyObject {
-    
-    var keyPath: KeyPathString { get }
+internal protocol RelationshipProtocol: PropertyProtocol {
+
     var isToMany: Bool { get }
     var isOrdered: Bool { get }
     var deleteRule: NSDeleteRule { get }
diff --git a/Sources/SnapshotResult.swift b/Sources/SnapshotResult.swift
index e22bfb6..a58422c 100644
--- a/Sources/SnapshotResult.swift
+++ b/Sources/SnapshotResult.swift
@@ -36,7 +36,6 @@ import AppKit
 
 // MARK: - SnapshotResult
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
 public protocol SnapshotResult {
     
     associatedtype ObjectType: DynamicObject
diff --git a/Sources/Transformable.swift b/Sources/Transformable.swift
index 52ac645..f26ed6c 100644
--- a/Sources/Transformable.swift
+++ b/Sources/Transformable.swift
@@ -209,6 +209,11 @@ public enum TransformableContainer<O: CoreStoreObject> {
         public typealias ReturnValueType = DestinationValueType
 
 
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
+
+
         // MARK: AttributeProtocol
         
         internal static var attributeType: NSAttributeType {
@@ -216,7 +221,6 @@ public enum TransformableContainer<O: CoreStoreObject> {
             return .transformableAttributeType
         }
 
-        internal let keyPath: KeyPathString
         internal let isOptional = false
         internal let isTransient: Bool
         internal let allowsExternalBinaryDataStorage: Bool
@@ -427,6 +431,11 @@ public enum TransformableContainer<O: CoreStoreObject> {
         public typealias ReturnValueType = DestinationValueType?
 
 
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
+
+
         // MARK: AttributeProtocol
 
         internal static var attributeType: NSAttributeType {
@@ -434,7 +443,6 @@ public enum TransformableContainer<O: CoreStoreObject> {
             return .transformableAttributeType
         }
 
-        internal let keyPath: KeyPathString
         internal let isOptional = true
         internal let isTransient: Bool
         internal let allowsExternalBinaryDataStorage: Bool
diff --git a/Sources/Value.swift b/Sources/Value.swift
index f4c2d28..fec2e9a 100644
--- a/Sources/Value.swift
+++ b/Sources/Value.swift
@@ -202,6 +202,11 @@ public enum ValueContainer<O: CoreStoreObject> {
         // MARK: AttributeKeyPathStringConvertible
 
         public typealias ReturnValueType = DestinationValueType
+
+
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
         
         
         // MARK: AttributeProtocol
@@ -210,8 +215,7 @@ public enum ValueContainer<O: CoreStoreObject> {
             
             return V.cs_rawAttributeType
         }
-        
-        internal let keyPath: KeyPathString
+
         internal let isOptional = false
         internal let isTransient: Bool
         internal let allowsExternalBinaryDataStorage = false
@@ -420,6 +424,11 @@ public enum ValueContainer<O: CoreStoreObject> {
         // MARK: AttributeKeyPathStringConvertible
 
         public typealias ReturnValueType = DestinationValueType?
+
+
+        // MARK: PropertyProtocol
+
+        internal let keyPath: KeyPathString
         
         
         // MARK: AttributeProtocol
@@ -429,7 +438,6 @@ public enum ValueContainer<O: CoreStoreObject> {
             return V.cs_rawAttributeType
         }
         
-        internal let keyPath: KeyPathString
         internal let isOptional = true
         internal let isTransient: Bool
         internal let allowsExternalBinaryDataStorage = false

From 12c58e395594481fd79ccd979d0613a6f715a0ec Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sat, 12 Oct 2019 10:02:00 +0900
Subject: [PATCH 12/58] improved caching in utility methods

---
 CoreStoreDemo/CoreStoreDemo/Info.plist        |   2 +-
 .../SwiftUI Demo/SwiftUIView.swift            |   3 +-
 .../DiffableDataSourceSnapshotProtocol.swift  |  28 +++++
 ...Internals.DiffableDataSourceSnapshot.swift | 114 +++++++++++++++---
 ...edDiffableDataSourceSnapshotDelegate.swift |  46 +++----
 ...Internals.SharedNotificationObserver.swift |  65 ++++++++--
 Sources/ListSnapshot.swift                    |  38 +++---
 Sources/LiveList.swift                        |   6 +-
 Sources/LiveObject.swift                      |  33 ++---
 .../NSManagedObjectContext+CoreStore.swift    |  84 ++++++++++---
 10 files changed, 307 insertions(+), 112 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/Info.plist b/CoreStoreDemo/CoreStoreDemo/Info.plist
index c99470e..3f0a53f 100644
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/CoreStoreDemo/CoreStoreDemo/Info.plist
@@ -51,6 +51,6 @@
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 	<key>UIUserInterfaceStyle</key>
-	<string>light</string>
+	<string>Light</string>
 </dict>
 </plist>
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index fdf851e..ccad57d 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -39,7 +39,7 @@ struct SwiftUIView: View {
     var body: some View {
         NavigationView {
             List {
-                ForEach(palettes.sections, id: \.self) { (sectionID) in
+                ForEach(palettes.sectionIdentifiers, id: \.self) { (sectionID) in
                     Section(header: Text(sectionID)) {
                         ForEach(self.palettes[section: sectionID], id: \.self) { palette in
                             NavigationLink(
@@ -118,7 +118,6 @@ struct SwiftUIView: View {
                 self.needsShowAlert = true
             }
         }
-        .colorScheme(.dark)
     }
 
     @State
diff --git a/Sources/DiffableDataSourceSnapshotProtocol.swift b/Sources/DiffableDataSourceSnapshotProtocol.swift
index 46872bc..34195b6 100644
--- a/Sources/DiffableDataSourceSnapshotProtocol.swift
+++ b/Sources/DiffableDataSourceSnapshotProtocol.swift
@@ -31,4 +31,32 @@ import CoreData
 
 internal protocol DiffableDataSourceSnapshotProtocol {
 
+    init()
+
+    var numberOfItems: Int { get }
+    var numberOfSections: Int { get }
+    var sectionIdentifiers: [String] { get }
+    var itemIdentifiers: [NSManagedObjectID] { get }
+
+    func numberOfItems(inSection identifier: String) -> Int
+    func itemIdentifiers(inSection identifier: String) -> [NSManagedObjectID]
+    func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> String?
+    func indexOfItem(_ identifier: NSManagedObjectID) -> Int?
+    func indexOfSection(_ identifier: String) -> Int?
+
+    mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?)
+    mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID)
+    mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID)
+    mutating func deleteItems(_ identifiers: [NSManagedObjectID])
+    mutating func deleteAllItems()
+    mutating func moveItem(_ identifier: NSManagedObjectID, beforeItem toIdentifier: NSManagedObjectID)
+    mutating func moveItem(_ identifier: NSManagedObjectID, afterItem toIdentifier: NSManagedObjectID)
+    mutating func reloadItems(_ identifiers: [NSManagedObjectID])
+    mutating func appendSections(_ identifiers: [String])
+    mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String)
+    mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String)
+    mutating func deleteSections(_ identifiers: [String])
+    mutating func moveSection(_ identifier: String, beforeSection toIdentifier: String)
+    mutating func moveSection(_ identifier: String, afterSection toIdentifier: String)
+    mutating func reloadSections(_ identifiers: [String])
 }
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index deb0a74..15bcc98 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -40,24 +40,26 @@ import AppKit
 
 extension Internals {
 
-
     // MARK: - DiffableDataSourceSnapshot
 
     // Implementation based on https://github.com/ra1028/DiffableDataSources
-    internal struct DiffableDataSourceSnapshot {
+    internal struct DiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol {
 
         // MARK: Internal
 
-        init() {
-
-            self.structure = .init()
-        }
-
         init(sections: [NSFetchedResultsSectionInfo]) {
 
             self.structure = .init(sections: sections)
         }
 
+
+        // MARK: DiffableDataSourceSnapshotProtocol
+
+        init() {
+
+            self.structure = .init()
+        }
+
         var numberOfItems: Int {
 
             return self.structure.allItemIDs.count
@@ -68,37 +70,37 @@ extension Internals {
             return self.structure.allSectionIDs.count
         }
 
-        var allSectionIDs: [String] {
+        var sectionIdentifiers: [String] {
 
             return self.structure.allSectionIDs
         }
 
-        var allItemIDs: [NSManagedObjectID] {
+        var itemIdentifiers: [NSManagedObjectID] {
 
             return self.structure.allItemIDs
         }
 
         func numberOfItems(inSection identifier: String) -> Int {
 
-            return self.itemIDs(inSection: identifier).count
+            return self.itemIdentifiers(inSection: identifier).count
         }
 
-        func itemIDs(inSection identifier: String) -> [NSManagedObjectID] {
+        func itemIdentifiers(inSection identifier: String) -> [NSManagedObjectID] {
 
             return self.structure.items(in: identifier)
         }
 
-        func sectionIDs(containingItem identifier: NSManagedObjectID) -> String? {
+        func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> String? {
 
             return self.structure.section(containing: identifier)
         }
 
-        func indexOfItemID(_ identifier: NSManagedObjectID) -> Int? {
+        func indexOfItem(_ identifier: NSManagedObjectID) -> Int? {
 
             return self.structure.allItemIDs.firstIndex(of: identifier)
         }
 
-        func indexOfSectionID(_ identifier: String) -> Int? {
+        func indexOfSection(_ identifier: String) -> Int? {
 
             return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
@@ -138,9 +140,9 @@ extension Internals {
             self.structure.move(itemID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadItems<S: Sequence>(_ identifiers: S, nextStateTag: UUID) where S.Element == NSManagedObjectID {
+        mutating func reloadItems(_ identifiers: [NSManagedObjectID]) {
 
-            self.structure.update(itemIDs: identifiers, nextStateTag: nextStateTag)
+            self.structure.update(itemIDs: identifiers)
         }
 
         mutating func appendSections(_ identifiers: [String]) {
@@ -173,9 +175,9 @@ extension Internals {
             self.structure.move(sectionID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadSections<S: Sequence>(_ identifiers: S, nextStateTag: UUID) where S.Element == String {
+        mutating func reloadSections(_ identifiers: [String]) {
 
-            self.structure.update(sectionIDs: identifiers, nextStateTag: nextStateTag)
+            self.structure.update(sectionIDs: identifiers)
         }
 
 
@@ -388,7 +390,7 @@ extension Internals {
                     .insert(removed, at: itemIndex)
             }
 
-            mutating func update<S: Sequence>(itemIDs: S, nextStateTag: UUID) where S.Element == NSManagedObjectID {
+            mutating func update<S: Sequence>(itemIDs: S) where S.Element == NSManagedObjectID {
 
                 let itemPositionMap = self.itemPositionMap()
                 for itemID in itemIDs {
@@ -464,7 +466,7 @@ extension Internals {
                 self.sections.insert(removed, at: sectionIndex)
             }
 
-            mutating func update<S: Sequence>(sectionIDs: S, nextStateTag: UUID) where S.Element == String {
+            mutating func update<S: Sequence>(sectionIDs: S) where S.Element == String {
 
                 for sectionID in sectionIDs {
 
@@ -590,4 +592,76 @@ extension Internals {
 }
 
 
+// MARK: - NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
+extension NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol where SectionIdentifierType == NSString, ItemIdentifierType == NSManagedObjectID {
+
+    internal var sectionIdentifiers: [String] {
+
+        return self.sectionIdentifiers as [NSString] as [String]
+    }
+
+    internal func numberOfItems(inSection identifier: String) -> Int {
+
+        return self.numberOfItems(inSection: identifier as NSString)
+    }
+
+    internal func itemIdentifiers(inSection identifier: String) -> [NSManagedObjectID] {
+
+        return self.itemIdentifiers(inSection: identifier as NSString)
+    }
+
+    internal func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> String? {
+
+        return self.sectionIdentifier(containingItem: identifier) as NSString? as String?
+    }
+
+    internal func indexOfSection(_ identifier: String) -> Int? {
+
+        return self.indexOfSection(identifier as NSString)
+    }
+
+    internal mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
+
+        self.appendItems(identifiers, toSection: sectionIdentifier as NSString?)
+    }
+
+    internal mutating func appendSections(_ identifiers: [String]) {
+
+        self.appendSections(identifiers as [NSString])
+    }
+
+    internal mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String) {
+
+        self.insertSections(identifiers as [NSString], beforeSection: toIdentifier as NSString)
+    }
+
+    internal mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String) {
+
+        return self.insertSections(identifiers as [NSString], afterSection: toIdentifier as NSString)
+    }
+
+    internal mutating func deleteSections(_ identifiers: [String]) {
+
+        self.deleteSections(identifiers as [NSString])
+    }
+
+    internal mutating func moveSection(_ identifier: String, beforeSection toIdentifier: String) {
+
+        self.moveSection(identifier as NSString, beforeSection: toIdentifier as NSString)
+    }
+
+    internal mutating func moveSection(_ identifier: String, afterSection toIdentifier: String) {
+
+        self.moveSection(identifier as NSString, afterSection: toIdentifier as NSString)
+    }
+
+    internal mutating func reloadSections(_ identifiers: [String]) {
+
+        self.reloadSections(identifiers as [NSString])
+    }
+}
+
+
 #endif
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index a49e902..5a1ad65 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -41,7 +41,7 @@ import AppKit
 
 internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject {
 
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: Internals.DiffableDataSourceSnapshot)
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: DiffableDataSourceSnapshotProtocol)
 }
 
 
@@ -75,14 +75,14 @@ extension Internals {
 
         internal func initialFetch() {
 
-//            #if canImport(UIKit) || canImport(AppKit)
-//
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return
-//            }
-//
-//            #endif
+            #if canImport(UIKit) || canImport(AppKit)
+
+            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+
+                return
+            }
+
+            #endif
 
             guard let fetchedResultsController = self.fetchedResultsController else {
 
@@ -94,26 +94,26 @@ extension Internals {
 
         // MARK: NSFetchedResultsControllerDelegate
 
-//        #if canImport(UIKit) || canImport(AppKit)
-//
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//        @objc
-//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
-//
-//            self.handler?.controller(
-//                controller,
-//                didChangContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-//            )
-//        }
-//
-//        #endif
+        #if canImport(UIKit) || canImport(AppKit)
+
+        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+
+            self.handler?.controller(
+                controller,
+                didChangeContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
+            )
+        }
+
+        #endif
         
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
 
             self.handler?.controller(
                 controller,
-                didChangContentWith: Internals.DiffableDataSourceSnapshot(
+                didChangeContentWith: Internals.DiffableDataSourceSnapshot(
                     sections: controller.sections ?? []
                 )
             )
diff --git a/Sources/Internals.SharedNotificationObserver.swift b/Sources/Internals.SharedNotificationObserver.swift
index c97aa4c..e724ab5 100644
--- a/Sources/Internals.SharedNotificationObserver.swift
+++ b/Sources/Internals.SharedNotificationObserver.swift
@@ -25,32 +25,83 @@
 
 import Foundation
 
-
 // MARK: - Internal
 
 extension Internals {
 
     // MARK: - SharedNotificationObserver
 
-    internal final class SharedNotificationObserver {
+    internal final class SharedNotificationObserver<T> {
 
         // MARK: Internal
 
-        let observer: NSObjectProtocol
-
-        init(notificationName: Notification.Name, object: Any?, queue: OperationQueue? = nil, closure: @escaping (_ note: Notification) -> Void) {
+        internal init(notificationName: Notification.Name, object: Any?, queue: OperationQueue? = nil, sharedValue: @escaping (_ note: Notification) -> T) {
 
             self.observer = NotificationCenter.default.addObserver(
                 forName: notificationName,
                 object: object,
                 queue: queue,
-                using: closure
+                using: { [weak self] (notification) in
+
+                    guard let self = self else {
+
+                        return
+                    }
+                    let value = sharedValue(notification)
+                    self.notifyObservers(value)
+                }
             )
         }
 
         deinit {
 
-            NotificationCenter.default.removeObserver(self.observer)
+            self.observer.map(NotificationCenter.default.removeObserver(_:))
+        }
+
+        internal func addObserver<U: AnyObject>(_ observer: U, closure: @escaping (T) -> Void) {
+
+            self.observers.setObject(Closure(closure), forKey: observer)
+        }
+
+
+        // MARK: Private
+
+        private var observer: NSObjectProtocol!
+        private let observers: NSMapTable<AnyObject, Closure> = .weakToStrongObjects()
+
+        private func notifyObservers(_ sharedValue: T) {
+
+            guard let enumerator = self.observers.objectEnumerator() else {
+
+                return
+            }
+            for closure in enumerator {
+
+                (closure as! Closure).invoke(with: sharedValue)
+            }
+        }
+
+
+        // MARK: - Closure
+
+        fileprivate final class Closure {
+
+            // MARK: FilePrivate
+
+            fileprivate init(_ closure: @escaping (T) -> Void) {
+
+                self.closure = closure
+            }
+
+            fileprivate func invoke(with argument: T) {
+
+                self.closure(argument)
+            }
+
+
+            // MARK: Private
+
+            private let closure: (T) -> Void
         }
     }
 }
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 51b985d..4a03c73 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -46,7 +46,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     public subscript<S: Sequence>(indices indices: S) -> [LiveObject<O>] where S.Element == Index {
 
         let context = self.context!
-        let itemIDs = self.diffableSnapshot.allItemIDs
+        let itemIDs = self.diffableSnapshot.itemIdentifiers
         return indices.map { position in
 
             let itemID = itemIDs[position]
@@ -57,7 +57,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
 
         let context = self.context!
-        let itemIDs = self.diffableSnapshot.itemIDs(inSection: sectionID)
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
         return itemIDs.map {
 
             return LiveObject<O>(id: $0, context: context)
@@ -67,7 +67,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
 
         let context = self.context!
-        let itemIDs = self.diffableSnapshot.itemIDs(inSection: sectionID)
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
         return itemIndices.map { position in
 
             let itemID = itemIDs[position]
@@ -85,14 +85,14 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         return self.diffableSnapshot.numberOfSections
     }
 
-    public var sectionIDs: [SectionID] {
+    public var sectionIdentifiers: [SectionID] {
 
-        return self.diffableSnapshot.allSectionIDs
+        return self.diffableSnapshot.sectionIdentifiers
     }
 
     public var itemIdentifiers: [ItemID] {
 
-        return self.diffableSnapshot.allItemIDs
+        return self.diffableSnapshot.itemIdentifiers
     }
 
     public func numberOfItems(inSection identifier: SectionID) -> Int {
@@ -102,28 +102,28 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public func itemIdentifiers(inSection identifier: SectionID) -> [ItemID] {
 
-        return self.diffableSnapshot.itemIDs(inSection: identifier)
+        return self.diffableSnapshot.itemIdentifiers(inSection: identifier)
     }
 
     public func itemIdentifiers(inSection identifier: SectionID, atIndices indices: IndexSet) -> [ItemID] {
 
-        let itemIDs = self.diffableSnapshot.itemIDs(inSection: identifier)
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: identifier)
         return indices.map({ itemIDs[$0] })
     }
 
     public func sectionIdentifier(containingItem identifier: ItemID) -> SectionID? {
 
-        return self.diffableSnapshot.sectionIDs(containingItem: identifier)
+        return self.diffableSnapshot.sectionIdentifier(containingItem: identifier)
     }
 
     public func indexOfItem(_ identifier: ItemID) -> Index? {
 
-        return self.diffableSnapshot.indexOfItemID(identifier)
+        return self.diffableSnapshot.indexOfItem(identifier)
     }
 
     public func indexOfSection(_ identifier: SectionID) -> Int? {
 
-        return self.diffableSnapshot.indexOfSectionID(identifier)
+        return self.diffableSnapshot.indexOfSection(identifier)
     }
 
     public mutating func appendItems(_ identifiers: [ItemID], toSection sectionIdentifier: SectionID? = nil) {
@@ -163,7 +163,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public mutating func reloadItems(_ identifiers: [ItemID]) {
 
-        self.diffableSnapshot.reloadItems(identifiers, nextStateTag: .init())
+        self.diffableSnapshot.reloadItems(identifiers)
     }
 
     public mutating func appendSections(_ identifiers: [SectionID]) {
@@ -198,7 +198,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public mutating func reloadSections(_ identifiers: [SectionID]) {
 
-        self.diffableSnapshot.reloadSections(identifiers, nextStateTag: .init())
+        self.diffableSnapshot.reloadSections(identifiers)
     }
     
     
@@ -211,18 +211,18 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     
     public var startIndex: Index {
         
-        return self.diffableSnapshot.allItemIDs.startIndex
+        return self.diffableSnapshot.itemIdentifiers.startIndex
     }
     
     public var endIndex: Index {
         
-        return self.diffableSnapshot.allItemIDs.endIndex
+        return self.diffableSnapshot.itemIdentifiers.endIndex
     }
     
     public subscript(position: Index) -> Element {
         
         let context = self.context!
-        let itemID = self.diffableSnapshot.allItemIDs[position]
+        let itemID = self.diffableSnapshot.itemIdentifiers[position]
         return LiveObject<O>(id: itemID, context: context)
     }
     
@@ -254,11 +254,11 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     
     internal init() {
 
-        self.diffableSnapshot = .init()
+        self.diffableSnapshot = Internals.DiffableDataSourceSnapshot()
         self.context = nil
     }
     
-    internal init(diffableSnapshot: Internals.DiffableDataSourceSnapshot, context: NSManagedObjectContext) {
+    internal init(diffableSnapshot: DiffableDataSourceSnapshotProtocol, context: NSManagedObjectContext) {
 
         self.diffableSnapshot = diffableSnapshot
         self.context = context
@@ -270,5 +270,5 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     private let id: UUID = .init()
     private let context: NSManagedObjectContext?
 
-    private var diffableSnapshot: Internals.DiffableDataSourceSnapshot
+    private var diffableSnapshot: DiffableDataSourceSnapshotProtocol
 }
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index da455aa..35fc7c5 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -63,9 +63,9 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return self.snapshot.numberOfSections
     }
 
-    public var sections: [SectionID] {
+    public var sectionIdentifiers: [SectionID] {
 
-        return self.snapshot.sectionIDs
+        return self.snapshot.sectionIdentifiers
     }
 
     public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
@@ -302,7 +302,7 @@ extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 
     // MARK: FetchedDiffableDataSourceSnapshotHandler
 
-    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangContentWith snapshot: Internals.DiffableDataSourceSnapshot) {
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: DiffableDataSourceSnapshotProtocol) {
 
         self.snapshot = .init(
             diffableSnapshot: snapshot,
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index 2e6c937..545c8bc 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -114,36 +114,23 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
             self.rawObjectWillChange = nil
         }
-        self.observer = NotificationCenter.default.addObserver(
-            forName: .NSManagedObjectContextObjectsDidChange,
-            object: context,
-            queue: .main,
-            using: { [weak self] (notification) in
-
-                guard let self = self, let userInfo = notification.userInfo else {
-
-                    return
-                }
-                let updatedObjects = (userInfo[NSUpdatedObjectsKey] as! NSSet? ?? [])
-                let mergedObjects = (userInfo[NSRefreshedObjectsKey] as! NSSet? ?? [])
-                guard mergedObjects.contains(where: { ($0 as! NSManagedObject).objectID == id })
-                    || updatedObjects.contains(where: { ($0 as! NSManagedObject).objectID == id }) else {
-
-                        return
-                }
-                self.$lazySnapshot.reset({ initializer(id, context) })
-                self.willChange()
-            }
-        )
-
         self.$lazySnapshot.initialize({ initializer(id, context) })
+        
+        context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (objectIDs) in
+
+            guard let self = self else {
+
+                return
+            }
+            self.$lazySnapshot.reset({ initializer(id, context) })
+            self.willChange()
+        }
     }
 
 
     // MARK: Private
     
     private let context: NSManagedObjectContext
-    private var observer: NSObjectProtocol?
 
     @Internals.LazyNonmutating(uninitialized: ())
     private var lazySnapshot: ObjectSnapshot<O>
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index ffe0b9f..10524c4 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -89,7 +89,10 @@ extension NSManagedObjectContext {
     @nonobjc
     internal func liveObject<D: DynamicObject>(id: NSManagedObjectID) -> LiveObject<D> {
 
-        let cache = self.liveObjectsCache(D.self)
+        let cache: NSMapTable<NSManagedObjectID, LiveObject<D>> = self.userInfo(for: .liveObjectsCache(D.self)) {
+
+            return .strongToWeakObjects()
+        }
         return Internals.with {
 
             if let liveObject = cache.object(forKey: id) {
@@ -103,27 +106,38 @@ extension NSManagedObjectContext {
     }
 
     @nonobjc
-    private func liveObjectsCache<D: DynamicObject>(_ objectType: D.Type) -> NSMapTable<NSManagedObjectID, LiveObject<D>> {
+    internal func objectsDidChangeObserver<U: AnyObject>(for observer: U) -> Internals.SharedNotificationObserver<Set<NSManagedObjectID>> {
 
-        let key = Internals.typeName(objectType)
-        if let cache = self.userInfo[key] {
+        return self.userInfo(for: .objectsChangeObserver(U.self)) { [unowned self] in
 
-            return cache as! NSMapTable<NSManagedObjectID, LiveObject<D>>
+            return .init(
+                notificationName: .NSManagedObjectContextObjectsDidChange,
+                object: self,
+                queue: .main,
+                sharedValue: { (notification) -> Set<NSManagedObjectID> in
+
+                    guard let userInfo = notification.userInfo else {
+
+                        return []
+                    }
+                    var updatedObjectIDs: Set<NSManagedObjectID> = []
+                    if let updatedObjects = userInfo[NSUpdatedObjectsKey] as? Set<NSManagedObjectID> {
+
+                        updatedObjectIDs.formUnion(updatedObjects)
+                    }
+                    if let mergedObjects = userInfo[NSRefreshedObjectsKey] as? Set<NSManagedObjectID> {
+
+                        updatedObjectIDs.formUnion(mergedObjects)
+                    }
+                    return updatedObjectIDs
+                }
+            )
         }
-        let cache = NSMapTable<NSManagedObjectID, LiveObject<D>>.strongToWeakObjects()
-        self.userInfo[key] = cache
-        return cache
     }
     
     
     // MARK: Private
     
-    private struct PropertyKeys {
-        
-        static var observerForWillSaveNotification: Void?
-        static var shouldCascadeSavesToParent: Void?
-    }
-    
     @nonobjc
     private var observerForWillSaveNotification: Internals.NotificationObserver? {
         
@@ -143,5 +157,47 @@ extension NSManagedObjectContext {
             )
         }
     }
+
+    private func userInfo<T>(for key: UserInfoKeys, initialize: @escaping () -> T) -> T {
+
+        let keyString = key.keyString
+        if let value = self.userInfo[keyString] {
+
+            return value as! T
+        }
+        let value = initialize()
+        self.userInfo[keyString] = value
+        return value
+    }
+
+
+    // MARK: - PropertyKeys
+
+    private struct PropertyKeys {
+
+        static var observerForWillSaveNotification: Void?
+        static var shouldCascadeSavesToParent: Void?
+    }
+
+
+    // MARK: - UserInfoKeys
+
+    private enum UserInfoKeys {
+
+        case liveObjectsCache(DynamicObject.Type)
+        case objectsChangeObserver(AnyObject.Type)
+
+        var keyString: String {
+
+            switch self {
+
+            case .liveObjectsCache(let objectType):
+                return "CoreStore.liveObjectsCache(\(Internals.typeName(objectType)))"
+
+            case .objectsChangeObserver:
+                return "CoreStore.objectsChangeObserver"
+            }
+        }
+    }
 }
 

From f5a165d47db69fa3e4f61eea6f20812b8950db38 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sun, 13 Oct 2019 11:45:30 +0900
Subject: [PATCH 13/58] back-portable TableView DiffableDataSource

---
 CoreStore.xcodeproj/project.pbxproj           |  70 ++-
 .../CoreStoreDemo/Base.lproj/Main.storyboard  |  84 +--
 .../ListObserverDemoViewController.swift      | 178 ++----
 .../ObserversViewController.swift             |  16 +
 Sources/DataStack+DataSources.swift           |   1 -
 Sources/DiffableDataSource.TableView.swift    | 349 ++++++++++--
 Sources/Differentiable.swift                  |  62 +++
 Sources/Internals.Closure.swift               |  54 ++
 ...Internals.DiffableDataSourceSnapshot.swift | 226 +++-----
 ...s.DiffableDataUIDispatcher.Changeset.swift | 141 +++++
 ....DiffableDataUIDispatcher.DiffResult.swift | 320 +++++++++++
 ...ableDataUIDispatcher.StagedChangeset.swift | 516 ++++++++++++++++++
 .../Internals.DiffableDataUIDispatcher.swift  | 229 ++++++++
 ...als.FallbackDiffableDataUIDispatcher.swift | 157 ------
 ...edDiffableDataSourceSnapshotDelegate.swift |  58 +-
 ...Internals.SharedNotificationObserver.swift |  30 +-
 Sources/Internals.swift                       |   1 +
 Sources/ListMonitor.swift                     |   2 +-
 Sources/ListSnapshot.swift                    |  39 +-
 Sources/LiveList.swift                        | 134 +++--
 20 files changed, 2031 insertions(+), 636 deletions(-)
 create mode 100644 Sources/Differentiable.swift
 create mode 100644 Sources/Internals.Closure.swift
 create mode 100644 Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
 create mode 100644 Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
 create mode 100644 Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
 create mode 100644 Sources/Internals.DiffableDataUIDispatcher.swift
 delete mode 100644 Sources/Internals.FallbackDiffableDataUIDispatcher.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 322dab3..35598f5 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -105,6 +105,26 @@
 		B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
 		B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */; };
+		B50E174D23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */; };
+		B50E174E23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */; };
+		B50E174F23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */; };
+		B50E175023517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */; };
+		B50E175223517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */; };
+		B50E175323517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */; };
+		B50E175423517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */; };
+		B50E175523517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */; };
+		B50E175723517DE4004F033C /* Differentiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175623517DE4004F033C /* Differentiable.swift */; };
+		B50E175823517DE4004F033C /* Differentiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175623517DE4004F033C /* Differentiable.swift */; };
+		B50E175923517DE4004F033C /* Differentiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175623517DE4004F033C /* Differentiable.swift */; };
+		B50E175A23517DE4004F033C /* Differentiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175623517DE4004F033C /* Differentiable.swift */; };
+		B50E175C2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */; };
+		B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */; };
+		B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */; };
+		B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */; };
+		B50E17612351FA66004F033C /* Internals.Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E17602351FA66004F033C /* Internals.Closure.swift */; };
+		B50E17622351FA66004F033C /* Internals.Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E17602351FA66004F033C /* Internals.Closure.swift */; };
+		B50E17632351FA66004F033C /* Internals.Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E17602351FA66004F033C /* Internals.Closure.swift */; };
+		B50E17642351FA66004F033C /* Internals.Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50E17602351FA66004F033C /* Internals.Closure.swift */; };
 		B50EE14223473C92009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
 		B50EE14323473C96009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
 		B50EE14423473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */; };
@@ -572,10 +592,10 @@
 		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
 		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
 		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
-		B5BF7FBC234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
-		B5BF7FBD234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
-		B5BF7FBE234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
-		B5BF7FBF234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */; };
+		B5BF7FBC234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
+		B5BF7FBD234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
+		B5BF7FBE234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
+		B5BF7FBF234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
 		B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
 		B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
@@ -878,6 +898,11 @@
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
 		B50564D22350CC3100482308 /* PropertyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PropertyProtocol.swift; sourceTree = "<group>"; };
 		B509C7F31E54511B0061C547 /* ImportableAttributeType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableAttributeType.swift; sourceTree = "<group>"; };
+		B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.StagedChangeset.swift; sourceTree = "<group>"; };
+		B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.Changeset.swift; sourceTree = "<group>"; };
+		B50E175623517DE4004F033C /* Differentiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Differentiable.swift; sourceTree = "<group>"; };
+		B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.DiffResult.swift; sourceTree = "<group>"; };
+		B50E17602351FA66004F033C /* Internals.Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.Closure.swift; sourceTree = "<group>"; };
 		B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+DataSources.swift"; sourceTree = "<group>"; };
 		B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Convenience.swift"; sourceTree = "<group>"; };
 		B51260881E9B252B00402229 /* NSEntityDescription+DynamicModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSEntityDescription+DynamicModel.swift"; sourceTree = "<group>"; };
@@ -994,7 +1019,7 @@
 		B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataSourceSnapshot.swift; sourceTree = "<group>"; };
 		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
 		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.TableView.swift; sourceTree = "<group>"; };
-		B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FallbackDiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
+		B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
 		B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveObject.swift; sourceTree = "<group>"; };
 		B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
 		B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.LazyNonmutating.swift; sourceTree = "<group>"; };
@@ -1316,6 +1341,7 @@
 				B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */,
 				B50564D22350CC3100482308 /* PropertyProtocol.swift */,
 				B53D9E5823513712000F48FB /* DiffableDataSourceSnapshotProtocol.swift */,
+				B50E175623517DE4004F033C /* Differentiable.swift */,
 			);
 			name = Protocols;
 			sourceTree = "<group>";
@@ -1714,13 +1740,17 @@
 				B5474D142227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift */,
 				B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */,
 				B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */,
-				B5BF7FBB234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift */,
+				B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */,
+				B50E174C23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift */,
+				B50E175123517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift */,
+				B50E175B2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift */,
 				B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */,
 				B54A6A541BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift */,
 				B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */,
 				B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */,
 				B5E84F2B1AFF849C0064E85B /* Internals.NotificationObserver.swift */,
 				B5277676234F265F0056BE9F /* Internals.SharedNotificationObserver.swift */,
+				B50E17602351FA66004F033C /* Internals.Closure.swift */,
 				B5DE522A230BD7CC00A22534 /* Internals.swift */,
 				B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */,
 				B51260881E9B252B00402229 /* NSEntityDescription+DynamicModel.swift */,
@@ -2063,6 +2093,7 @@
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
 				B5CA2B081F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
+				B50E17612351FA66004F033C /* Internals.Closure.swift in Sources */,
 				B5C976E71C6E3A5A00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F51EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
 				B5F1DA901B9AA991007C5CBB /* ImportableUniqueObject.swift in Sources */,
@@ -2114,6 +2145,7 @@
 				B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */,
 				B5E1B5931CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				B5277677234F265F0056BE9F /* Internals.SharedNotificationObserver.swift in Sources */,
+				B50E175C2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5ECDC291CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B5F335582348D75D00FD649F /* LiveResult.swift in Sources */,
@@ -2121,6 +2153,7 @@
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
 				B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */,
+				B50E175223517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
 				B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */,
 				B546F9731C9C553300D5AC55 /* SetupResult.swift in Sources */,
 				B53CA9A21EF1EF1600E0F440 /* PartialObject.swift in Sources */,
@@ -2160,6 +2193,7 @@
 				B596BBB61DD5BC67001DCDD9 /* FetchableSource.swift in Sources */,
 				B5E1B5A21CAA4365007FD580 /* CSCoreStore+Observing.swift in Sources */,
 				B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */,
+				B50E175723517DE4004F033C /* Differentiable.swift in Sources */,
 				B53304AA230BA4F7007C2BD8 /* DynamicObjectMeta.swift in Sources */,
 				B59AFF411C6593E400C0ABE2 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
 				B5E84F231AFF84860064E85B /* ListMonitor.swift in Sources */,
@@ -2177,6 +2211,7 @@
 				B5FAD6A91B50A4B400714891 /* Progress+Convenience.swift in Sources */,
 				B5E84EFC1AFF846E0064E85B /* SynchronousDataTransaction.swift in Sources */,
 				B5215CA91FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
+				B50E174D23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
 				B5E222231CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift in Sources */,
 				B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */,
 				B52F744A1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
@@ -2185,7 +2220,7 @@
 				B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */,
 				B56923E81EB827F5007C4DC9 /* InferredSchemaMappingProvider.swift in Sources */,
 				B53B275F1EE3B92E00E9B352 /* CoreStoreManagedObject.swift in Sources */,
-				B5BF7FBC234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
+				B5BF7FBC234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */,
 				B5215CA41FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A011E96012400C880DE /* Relationship.swift in Sources */,
 				B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */,
@@ -2288,7 +2323,7 @@
 				82BA18B21C4BBD3900A0916E /* ImportableObject.swift in Sources */,
 				82BA18AE1C4BBD3100A0916E /* DataStack+Transaction.swift in Sources */,
 				82BA18AB1C4BBD3100A0916E /* AsynchronousDataTransaction.swift in Sources */,
-				B5BF7FBD234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
+				B5BF7FBD234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */,
 				B5D339D91E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				82BA18CE1C4BBD7100A0916E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B56923FB1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2307,6 +2342,7 @@
 				B5A992201EA898720091A2E3 /* UserInfo.swift in Sources */,
 				B5FE4DAD1C85D44E00FA6A91 /* SQLiteStore.swift in Sources */,
 				B5D339E31E948C3600C880DE /* Value.swift in Sources */,
+				B50E175323517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
 				82BA18C51C4BBD5300A0916E /* ListObserver.swift in Sources */,
 				B53FBA0D1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
 				82BA18C21C4BBD5300A0916E /* ObjectMonitor.swift in Sources */,
@@ -2324,6 +2360,7 @@
 				B5E1B5AA1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B5D339F21E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5E1B59F1CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
+				B50E17622351FA66004F033C /* Internals.Closure.swift in Sources */,
 				B5ECDC251CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
 				B549F6741E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
@@ -2396,11 +2433,13 @@
 				B5E222251CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift in Sources */,
 				82BA18C41C4BBD5300A0916E /* ListMonitor.swift in Sources */,
 				B5215CAA1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
+				B50E175823517DE4004F033C /* Differentiable.swift in Sources */,
 				82BA18BA1C4BBD4A00A0916E /* Select.swift in Sources */,
 				B52F744B1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
 				B5E2222C1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */,
 				82BA18A71C4BBD2900A0916E /* CoreStore+Logging.swift in Sources */,
+				B50E174E23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
 				82BA18D81C4BBD7100A0916E /* Internals.WeakObject.swift in Sources */,
 				B56923E91EB827F5007C4DC9 /* InferredSchemaMappingProvider.swift in Sources */,
 				B53B27601EE3B92E00E9B352 /* CoreStoreManagedObject.swift in Sources */,
@@ -2436,6 +2475,7 @@
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322B2346A9AE00FC238B /* LiveList.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
@@ -2507,7 +2547,7 @@
 				B546F9761C9C553300D5AC55 /* SetupResult.swift in Sources */,
 				B53FBA161CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B5ECDC271CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
-				B5BF7FBF234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
+				B5BF7FBF234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */,
 				B5D339DB1E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				B52DD1951BE1F92500949AFE /* CoreStoreError.swift in Sources */,
 				B56923FD1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2526,6 +2566,7 @@
 				B5A992221EA898720091A2E3 /* UserInfo.swift in Sources */,
 				B5D7A5BA1CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B5D339E51E948C3600C880DE /* Value.swift in Sources */,
+				B50E175523517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
 				B5A5F26A1CAEC50F004AB9AF /* CSSelect.swift in Sources */,
 				B5220E1B1D13079B009BC71E /* CSCoreStore+Observing.swift in Sources */,
 				B5FEC1911C9166E700532541 /* NSPersistentStore+Setup.swift in Sources */,
@@ -2543,6 +2584,7 @@
 				B5D339F41E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5220E241D13085E009BC71E /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B559CD471CAA8B6300E4D58B /* CSSetupResult.swift in Sources */,
+				B50E17642351FA66004F033C /* Internals.Closure.swift in Sources */,
 				B5ECDBF01CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B549F6761E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
@@ -2615,11 +2657,13 @@
 				B5220E1A1D130791009BC71E /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B5215CAC1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
 				B53FBA0F1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
+				B50E175A23517DE4004F033C /* Differentiable.swift in Sources */,
 				B52F744D1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B52DD19A1BE1F92800949AFE /* CoreStore+Logging.swift in Sources */,
 				B52DD1A71BE1F93200949AFE /* BaseDataTransaction+Querying.swift in Sources */,
 				B546F96C1C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
 				B56923EB1EB827F5007C4DC9 /* InferredSchemaMappingProvider.swift in Sources */,
+				B50E175023517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
 				B53B27621EE3B92E00E9B352 /* CoreStoreManagedObject.swift in Sources */,
 				B5215CA71FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A041E96012400C880DE /* Relationship.swift in Sources */,
@@ -2655,6 +2699,7 @@
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322E2346A9B100FC238B /* LiveList.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
@@ -2726,7 +2771,7 @@
 				B56321AD1BD6521C006C9394 /* Internals.MigrationManager.swift in Sources */,
 				B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */,
 				B56321961BD65216006C9394 /* From.swift in Sources */,
-				B5BF7FBE234C99190070E741 /* Internals.FallbackDiffableDataUIDispatcher.swift in Sources */,
+				B5BF7FBE234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */,
 				B5D339DA1E9489AB00C880DE /* CoreStoreObject.swift in Sources */,
 				B5ECDC021CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B56923FC1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
@@ -2745,6 +2790,7 @@
 				B5A992211EA898720091A2E3 /* UserInfo.swift in Sources */,
 				B563218C1BD65216006C9394 /* DataStack+Transaction.swift in Sources */,
 				B5D339E41E948C3600C880DE /* Value.swift in Sources */,
+				B50E175423517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
 				B53FBA0E1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
 				B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */,
 				B5D7A5B91CA3BF8F005C752B /* CSInto.swift in Sources */,
@@ -2762,6 +2808,7 @@
 				B5D339F31E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5E1B5A01CAA2568007FD580 /* CSDataStack+Observing.swift in Sources */,
 				B5ECDC261CA81A3900C7F112 /* CSCoreStore+Querying.swift in Sources */,
+				B50E17632351FA66004F033C /* Internals.Closure.swift in Sources */,
 				B563217F1BD65216006C9394 /* CoreStore.swift in Sources */,
 				B549F6751E56A92800FBAB2D /* CoreDataNativeType.swift in Sources */,
 				B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
@@ -2834,11 +2881,13 @@
 				B56321A51BD65216006C9394 /* MigrationChain.swift in Sources */,
 				B5E222261CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift in Sources */,
 				B56321A21BD65216006C9394 /* ListObserver.swift in Sources */,
+				B50E175923517DE4004F033C /* Differentiable.swift in Sources */,
 				B5215CAB1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
 				B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */,
 				B52F744C1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B5AEFAB71C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
 				B5E2222D1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */,
+				B50E174F23517C03004F033C /* Internals.DiffableDataUIDispatcher.StagedChangeset.swift in Sources */,
 				B563219F1BD65216006C9394 /* ObjectMonitor.swift in Sources */,
 				B56321B61BD6521C006C9394 /* Internals.WeakObject.swift in Sources */,
 				B56923EA1EB827F5007C4DC9 /* InferredSchemaMappingProvider.swift in Sources */,
@@ -2874,6 +2923,7 @@
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322D2346A9B000FC238B /* LiveList.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index 9779183..f71eda2 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -510,18 +510,18 @@
                         <viewControllerLayoutGuide type="bottom" id="aI4-O3-OCi"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="w8K-eN-RvU">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NhC-oM-bkd">
-                                <rect key="frame" x="16" y="69.5" width="343" height="77.5"/>
+                                <rect key="frame" x="16" y="69.5" width="343" height="80"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="TIX-qi-B34"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vfe-Yq-3Xa">
-                                <rect key="frame" x="16" y="157" width="343" height="18"/>
+                                <rect key="frame" x="16" y="159.5" width="343" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" id="4h9-ha-EzR"/>
                                 </constraints>
@@ -530,37 +530,37 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hue" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sgg-Md-Nf3">
-                                <rect key="frame" x="16" y="195" width="74" height="18"/>
+                                <rect key="frame" x="16" y="197.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Saturation" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rry-vh-bRK">
-                                <rect key="frame" x="16" y="233" width="74" height="18"/>
+                                <rect key="frame" x="16" y="235.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Brightness" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTa-ly-eyO">
-                                <rect key="frame" x="16" y="271" width="74" height="18"/>
+                                <rect key="frame" x="16" y="273.5" width="74" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="359" translatesAutoresizingMaskIntoConstraints="NO" id="YQ6-fq-3Wb">
-                                <rect key="frame" x="98" y="189" width="263" height="31"/>
+                                <rect key="frame" x="98" y="191.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="hueSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="9Hy-3h-llE"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="xXz-78-tAd">
-                                <rect key="frame" x="98" y="227" width="263" height="31"/>
+                                <rect key="frame" x="98" y="229.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="saturationSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="qtU-ua-ZTc"/>
                                 </connections>
                             </slider>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="hpy-2d-eOP">
-                                <rect key="frame" x="98" y="265" width="263" height="31"/>
+                                <rect key="frame" x="98" y="267.5" width="263" height="31"/>
                                 <connections>
                                     <action selector="brightnessSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="F09-EP-2iD"/>
                                 </connections>
@@ -637,34 +637,52 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5f-tW-lXf">
-                                <rect key="frame" x="0.0" y="44" width="375" height="311.5"/>
-                                <connections>
-                                    <segue destination="5Fw-je-9gI" kind="embed" id="YcI-2Z-ijV"/>
-                                </connections>
-                            </containerView>
-                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
-                                <rect key="frame" x="0.0" y="355.5" width="375" height="311.5"/>
-                                <connections>
-                                    <segue destination="bLr-DM-i2t" kind="embed" id="OdS-gZ-CUA"/>
-                                </connections>
-                            </containerView>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="cce-yT-4dn">
+                                <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                                <subviews>
+                                    <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5f-tW-lXf">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
+                                        <connections>
+                                            <segue destination="5Fw-je-9gI" kind="embed" id="YcI-2Z-ijV"/>
+                                        </connections>
+                                    </containerView>
+                                    <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
+                                        <rect key="frame" x="0.0" y="311.5" width="375" height="311.5"/>
+                                        <connections>
+                                            <segue destination="bLr-DM-i2t" kind="embed" id="OdS-gZ-CUA"/>
+                                        </connections>
+                                    </containerView>
+                                </subviews>
+                            </stackView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="6So-f3-4Gp" firstAttribute="top" secondItem="L5f-tW-lXf" secondAttribute="bottom" id="3m8-tj-Nd4"/>
-                            <constraint firstAttribute="trailing" secondItem="6So-f3-4Gp" secondAttribute="trailing" id="4L8-wZ-F59"/>
-                            <constraint firstItem="L5f-tW-lXf" firstAttribute="height" secondItem="6So-f3-4Gp" secondAttribute="height" id="8XS-L3-hvN"/>
-                            <constraint firstAttribute="bottom" secondItem="6So-f3-4Gp" secondAttribute="bottom" id="8wL-zm-wnt"/>
-                            <constraint firstItem="L5f-tW-lXf" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leading" id="CbE-2f-7wk"/>
-                            <constraint firstAttribute="trailing" secondItem="L5f-tW-lXf" secondAttribute="trailing" id="dso-2g-fgA"/>
-                            <constraint firstItem="6So-f3-4Gp" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leading" id="eXM-D3-NLv"/>
-                            <constraint firstItem="L5f-tW-lXf" firstAttribute="top" secondItem="IML-3o-caw" secondAttribute="bottom" id="zJ5-sE-iJA"/>
+                            <constraint firstAttribute="trailing" secondItem="cce-yT-4dn" secondAttribute="trailing" id="DE1-u6-1mr"/>
+                            <constraint firstItem="LNL-mj-D7l" firstAttribute="top" secondItem="cce-yT-4dn" secondAttribute="bottom" id="WIZ-M3-bdr"/>
+                            <constraint firstItem="cce-yT-4dn" firstAttribute="leading" secondItem="6x3-vn-Egt" secondAttribute="leading" id="ZiS-j0-ANp"/>
+                            <constraint firstItem="cce-yT-4dn" firstAttribute="top" secondItem="IML-3o-caw" secondAttribute="bottom" id="zjs-CM-7r5"/>
                         </constraints>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" top="YES"/>
-                    <navigationItem key="navigationItem" title="Colors" id="7Gd-Ad-Bzu"/>
+                    <navigationItem key="navigationItem" title="Colors" id="7Gd-Ad-Bzu">
+                        <rightBarButtonItems>
+                            <barButtonItem title="▼" width="36" id="aPM-OC-EB8">
+                                <connections>
+                                    <action selector="toggleBottomContainerView" destination="YOI-b7-Nxn" id="7fn-z6-pne"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem title="▲" width="36" id="6q3-Zk-A9p">
+                                <connections>
+                                    <action selector="toggleTopContainerView" destination="YOI-b7-Nxn" id="APN-Kk-C3n"/>
+                                </connections>
+                            </barButtonItem>
+                        </rightBarButtonItems>
+                    </navigationItem>
                     <nil key="simulatedBottomBarMetrics"/>
+                    <connections>
+                        <outlet property="bottomContainerView" destination="6So-f3-4Gp" id="C7O-e2-k0l"/>
+                        <outlet property="topContainerView" destination="L5f-tW-lXf" id="DRV-mm-rBY"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="C9h-Ba-WoL" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -700,7 +718,7 @@
             <objects>
                 <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="DAz-BE-6Ca">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
@@ -885,11 +903,11 @@
                         <viewControllerLayoutGuide type="bottom" id="Q1w-Zn-fPm"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kof-sr-Xm1">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="309"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="SwiftUI is not supported on this device/OS version" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M6C-fv-74B">
-                                <rect key="frame" x="16" y="124.5" width="343" height="60"/>
+                                <rect key="frame" x="16" y="126" width="343" height="60"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="25"/>
                                 <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index e41661e..cb08957 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -43,10 +43,10 @@ struct ColorsDemo {
         
         didSet {
             
-            self.palettes.refetch(
-                self.filter.whereClause(),
-                OrderBy<Palette>(.ascending(\.hue))
-            )
+//            self.palettes.refetch(
+//                self.filter.whereClause(),
+//                OrderBy<Palette>(.ascending(\.hue))
+//            )
         }
     }
     
@@ -73,9 +73,9 @@ struct ColorsDemo {
         return dataStack
     }()
     
-    static let palettes: ListMonitor<Palette> = {
+    static let palettes: LiveList<Palette> = {
 
-        return ColorsDemo.stack.monitorSectionedList(
+        return ColorsDemo.stack.liveList(
             From<Palette>()
                 .sectionBy(\.colorName)
                 .orderBy(.ascending(\.hue))
@@ -86,15 +86,7 @@ struct ColorsDemo {
 
 // MARK: - ListObserverDemoViewController
 
-class ListObserverDemoViewController: UITableViewController, ListSectionObserver {
-    
-    // MARK: NSObject
-    
-    deinit {
-        
-        ColorsDemo.palettes.removeObserver(self)
-    }
-    
+class ListObserverDemoViewController: UITableViewController {
     
     // MARK: UIViewController
 
@@ -132,10 +124,26 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
             filterBarButton
         ]
         self.filterBarButton = filterBarButton
-        
-        ColorsDemo.palettes.addObserver(self)
-        
-        self.setTable(enabled: !ColorsDemo.palettes.isPendingRefetch)
+
+        self.dataSource = DiffableDataSource.TableView<Palette>(
+            tableView: self.tableView,
+            dataStack: ColorsDemo.stack,
+            cellProvider: { (tableView, indexPath, palette) in
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell
+                cell.colorView?.backgroundColor = palette.color
+                cell.label?.text = palette.colorText
+                return cell
+            }
+        )
+        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList, snapshot) in
+            
+            guard let self = self else {
+                
+                return
+            }
+            self.dataSource?.apply(snapshot, animatingDifferences: true)
+        }
     }
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -153,30 +161,6 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     }
     
     
-    // MARK: UITableViewDataSource
-    
-    override func numberOfSections(in tableView: UITableView) -> Int {
-        
-        return ColorsDemo.palettes.numberOfSections()
-    }
-
-    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
-        return ColorsDemo.palettes.numberOfObjects(in: section)
-    }
-    
-    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
-        let cell = tableView.dequeueReusableCell(withIdentifier: "PaletteTableViewCell") as! PaletteTableViewCell
-        
-        let palette = ColorsDemo.palettes[indexPath]
-        cell.colorView?.backgroundColor = palette.color
-        cell.label?.text = palette.colorText
-        
-        return cell
-    }
-    
-    
     // MARK: UITableViewDelegate
     
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
@@ -185,7 +169,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         
         self.performSegue(
             withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath]
+            sender: ColorsDemo.palettes[indexPath: indexPath]?.object
         )
     }
     
@@ -194,11 +178,11 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         switch editingStyle {
             
         case .delete:
-            let palette = ColorsDemo.palettes[indexPath]
+            let palette = ColorsDemo.palettes[indexPath: indexPath]
             ColorsDemo.stack.perform(
                 asynchronous: { (transaction) in
                     
-                    transaction.delete(palette)
+                    transaction.delete(palette?.object)
                 },
                 completion: { _ in }
             )
@@ -208,81 +192,16 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
         }
     }
     
-    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        
-        return ColorsDemo.palettes.sectionInfo(at: section).name
-    }
-    
-    
-    // MARK: ListObserver
-    
-    func listMonitorWillChange(_ monitor: ListMonitor<Palette>) {
-        
-        self.tableView.beginUpdates()
-    }
-    
-    func listMonitorDidChange(_ monitor: ListMonitor<Palette>) {
-        
-        self.tableView.endUpdates()
-    }
-    
-    func listMonitorWillRefetch(_ monitor: ListMonitor<Palette>) {
-        
-        self.setTable(enabled: false)
-    }
-    
-    func listMonitorDidRefetch(_ monitor: ListMonitor<Palette>) {
-        
-        self.filterBarButton?.title = ColorsDemo.filter.rawValue
-        self.tableView.reloadData()
-        self.setTable(enabled: true)
-    }
-    
-    
-    // MARK: ListObjectObserver
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: IndexPath) {
-        
-        self.tableView.insertRows(at: [indexPath], with: .automatic)
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: IndexPath) {
-        
-        self.tableView.deleteRows(at: [indexPath], with: .automatic)
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: IndexPath) {
-        
-        if let cell = self.tableView.cellForRow(at: indexPath) as? PaletteTableViewCell {
-            
-            let palette = ColorsDemo.palettes[indexPath]
-            cell.colorView?.backgroundColor = palette.color
-            cell.label?.text = palette.colorText
-        }
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
-
-        self.tableView.moveRow(at: fromIndexPath, to: toIndexPath)
-    }
-    
-    
-    // MARK: ListSectionObserver
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
-        
-        self.tableView.insertSections(IndexSet(integer: sectionIndex), with: .automatic)
-    }
-    
-    func listMonitor(_ monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
-        
-        self.tableView.deleteSections(IndexSet(integer: sectionIndex), with: .automatic)
-    }
-    
     
     // MARK: Private
     
     private var filterBarButton: UIBarButtonItem?
+    private var dataSource: DiffableDataSource.TableView<Palette>?
+    
+    deinit {
+        
+        ColorsDemo.palettes.removeObserver(self)
+    }
     
     @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
         
@@ -313,8 +232,6 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
     }
 
     @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
-
-        self.setTable(enabled: false)
         ColorsDemo.stack.perform(
             asynchronous: { (transaction) in
 
@@ -324,28 +241,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
                     palette.colorName .= nil
                 }
             },
-            completion: { _ in
-
-                self.setTable(enabled: true)
-            }
-        )
-    }
-    
-    private func setTable(enabled: Bool) {
-
-        tableView.isUserInteractionEnabled = enabled
-        UIView.animate(
-            withDuration: 0.2,
-            delay: 0,
-            options: .beginFromCurrentState,
-            animations: { () -> Void in
-                
-                if let tableView = self.tableView {
-                    
-                    tableView.alpha = enabled ? 1.0 : 0.5
-                }
-            },
-            completion: nil
+            completion: { _ in }
         )
     }
 }
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift
index b8f74cf..cbaa477 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift	
@@ -27,4 +27,20 @@ class ObserversViewController: UIViewController {
         alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: nil))
         self.present(alert, animated: true, completion: nil)
     }
+    
+    
+    // MARK: Private
+    
+    @IBOutlet private dynamic weak var topContainerView: UIView?
+    @IBOutlet private dynamic weak var bottomContainerView: UIView?
+    
+    @IBAction private dynamic func toggleTopContainerView() {
+        
+        self.topContainerView?.isHidden.toggle()
+    }
+    
+    @IBAction private dynamic func toggleBottomContainerView() {
+        
+        self.bottomContainerView?.isHidden.toggle()
+    }
 }
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 34ce792..2f1895f 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -31,7 +31,6 @@ import CoreData
 
 // MARK: - DataStack
 
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 extension DataStack {
 
     public func liveList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
index 9be4987..19060f2 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -29,79 +29,324 @@ import UIKit
 import CoreData
 
 
-//// MARK: - DiffableDataSource
-//
-//extension DiffableDataSource {
-//
-//    // MARK: - TableView
-//
-//    public open class TableView<D: DynamicObject>: NSObject, UITableViewDataSource {
-//
-//        // MARK: Public
-//
-//        public typealias ObjectType = D
-//
-//        public var defaultRowAnimation: UITableView.RowAnimation = .automatic
-//
-//        public init(tableView: UITableView, cellProvider: @escaping (UITableView, IndexPath, ObjectType) -> UITableViewCell?) {
-//
-//            self.tableView = tableView
-//            self.cellProvider = cellProvider
-//
+// MARK: - DiffableDataSource
+
+extension DiffableDataSource {
+
+    // MARK: - TableView
+
+    open class TableView<O: DynamicObject>: NSObject, UITableViewDataSource {
+        
+        // MARK: Open
+
+        @nonobjc
+        open var defaultRowAnimation: UITableView.RowAnimation = .automatic
+        
+
+        // MARK: Public
+
+        public typealias ObjectType = O
+        
+        @nonobjc
+        public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, ObjectType) -> UITableViewCell?) {
+
+            self.tableView = tableView
+            self.cellProvider = cellProvider
+            self.dataStack = dataStack
+
+            super.init()
+            
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
-//                self.rawDataSource = UITableViewDiffableDataSource<String, D.ObjectID>(
+//                self.rawDataSource = UITableViewDiffableDataSource<String, O.ObjectID>(
 //                    tableView: tableView,
-//                    cellProvider: { (tableView, indexPath, managedObjectID) -> UITableViewCell? in
+//                    cellProvider: { [weak self] (tableView, indexPath, objectID) -> UITableViewCell? in
 //
-//                        cellProvider(
+//                        guard let self = self else {
+//
+//                            return nil
+//                        }
+//                        guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+//
+//                            return nil
+//                        }
+//                        return self.cellProvider(tableView, indexPath, object)
 //                    }
 //                )
 //            }
 //            else {
-//
-//                self.rawDataSource = nil
+                
+                self.rawDataSource = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
 //            }
-//
-//            super.init()
-//
-//            tableView.dataSource = self
-//        }
-//
-//        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
-//
-//            let dataSource = UITableViewDiffableDataSource<String, D>.
+
+            tableView.dataSource = self
+        }
+
+        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
+
+            let diffableSnapshot = snapshot.diffableSnapshot
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
-//                self.rawDataSource! as! UITableViewDiffableDataSource<String, D>
-//
+//                self.modernDataSource.apply(
+//                    diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
+//                    animatingDifferences: animatingDifferences,
+//                    completion: nil
+//                )
 //            }
 //            else {
-//
+                
+                self.legacyDataSource.apply(
+                    diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                    view: self.tableView,
+                    animatingDifferences: animatingDifferences,
+                    performUpdates: { tableView, changeset, setSections in
+                        
+                        tableView.reload(
+                            using: changeset,
+                            with: self.defaultRowAnimation,
+                            setData: setSections
+                        )
+                    }
+                )
 //            }
-//            core.apply(
-//                snapshot,
-//                view: tableView,
-//                animatingDifferences: animatingDifferences,
-//                performUpdates: { tableView, changeset, setSections in
-//                    tableView.reload(using: changeset, with: self.defaultRowAnimation, setData: setSections)
-//            })
-//        }
+        }
+
+        public func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
+//                return self.modernDataSource.itemIdentifier(for: indexPath)
+//            }
+//            else {
+             
+                return self.legacyDataSource.itemIdentifier(for: indexPath)
+//            }
+        }
+
+        public func indexPath(for itemIdentifier: O.ObjectID) -> IndexPath? {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
-//        // MARK: Private
+//                return self.modernDataSource.indexPath(for: itemIdentifier)
+//            }
+//            else {
+             
+                return self.legacyDataSource.indexPath(for: itemIdentifier)
+//            }
+        }
+        
+        
+        // MARK: - UITableViewDataSource
+
+        @objc
+        public dynamic func numberOfSections(in tableView: UITableView) -> Int {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
-//        private weak var tableView: UITableView?
-//        private let cellProvider: (UITableView, IndexPath, ObjectType) -> UITableViewCell?
-//        private let rawDataSource: Any?
+//                return self.modernDataSource.numberOfSections(in: tableView)
+//            }
+//            else {
+             
+                return self.legacyDataSource.numberOfSections()
+//            }
+        }
+
+        @objc
+        public dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
+//                return self.modernDataSource.tableView(tableView, numberOfRowsInSection: section)
+//            }
+//            else {
+             
+                return self.legacyDataSource.numberOfItems(inSection: section)
+//            }
+        }
+
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.snapshot().sectionIdentifiers[section]
+//            }
+//            else {
+
+                return self.legacyDataSource.sectionIdentifier(inSection: section)
+//            }
+        }
+
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.tableView(tableView, titleForFooterInSection: section)
+//            }
+//            else {
+
+                return nil
+//            }
+        }
+        
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+            
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.tableView(tableView, cellForRowAt: indexPath)
+//            }
+//            else {
+             
+                guard let objectID = self.legacyDataSource.itemIdentifier(for: indexPath) else {
+                    
+                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
+                }
+                guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+                    
+                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
+                }
+                guard let cell = self.cellProvider(tableView, indexPath, object) else {
+                    
+                    Internals.abort("\(Internals.typeName(UITableViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
+                }
+                return cell
+//            }
+        }
+
+
+        // MARK: Private
+
+        private weak var tableView: UITableView?
+        
+        private let dataStack: DataStack
+        private let cellProvider: (UITableView, IndexPath, ObjectType) -> UITableViewCell?
+        private var rawDataSource: Any!
+        
 //        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//        private var diffableDataSource: UITableViewDiffableDataSource<String, D.ObjectID> {
+//        private var modernDataSource: UITableViewDiffableDataSource<String, O.ObjectID> {
 //
-//            return self.rawDataSource! as! UITableViewDiffableDataSource<String, D.ObjectID>
+//            return self.rawDataSource as! UITableViewDiffableDataSource<String, O.ObjectID>
 //        }
-//    }
-//}
+        
+        private var legacyDataSource: Internals.DiffableDataUIDispatcher<O> {
+            
+            return self.rawDataSource as! Internals.DiffableDataUIDispatcher<O>
+        }
+    }
+}
+
+
+// MARK: - UITableView
+
+extension UITableView {
+
+    // MARK: FilePrivate
+    
+    @nonobjc
+    fileprivate func reload<C, O>(
+        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
+        with animation: @autoclosure () -> RowAnimation,
+        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
+        setData: (C) -> Void
+    ) {
+        
+        self.reload(
+            using: stagedChangeset,
+            deleteSectionsAnimation: animation(),
+            insertSectionsAnimation: animation(),
+            reloadSectionsAnimation: animation(),
+            deleteRowsAnimation: animation(),
+            insertRowsAnimation: animation(),
+            reloadRowsAnimation: animation(),
+            interrupt: interrupt,
+            setData: setData
+        )
+    }
+    
+    @nonobjc
+    fileprivate func reload<C, O>(
+        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
+        deleteSectionsAnimation: @autoclosure () -> RowAnimation,
+        insertSectionsAnimation: @autoclosure () -> RowAnimation,
+        reloadSectionsAnimation: @autoclosure () -> RowAnimation,
+        deleteRowsAnimation: @autoclosure () -> RowAnimation,
+        insertRowsAnimation: @autoclosure () -> RowAnimation,
+        reloadRowsAnimation: @autoclosure () -> RowAnimation,
+        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
+        setData: (C) -> Void
+    ) {
+        
+        if case .none = window, let data = stagedChangeset.last?.data {
+            
+            setData(data)
+            self.reloadData()
+            return
+        }
+        for changeset in stagedChangeset {
+            
+            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
+                
+                setData(data)
+                self.reloadData()
+                return
+            }
+            self.cs_performBatchUpdates {
+                
+                setData(changeset.data)
+
+                if !changeset.sectionDeleted.isEmpty {
+                    
+                    self.deleteSections(IndexSet(changeset.sectionDeleted), with: deleteSectionsAnimation())
+                }
+                if !changeset.sectionInserted.isEmpty {
+                    
+                    self.insertSections(IndexSet(changeset.sectionInserted), with: insertSectionsAnimation())
+                }
+                if !changeset.sectionUpdated.isEmpty {
+                    
+                    self.reloadSections(IndexSet(changeset.sectionUpdated), with: reloadSectionsAnimation())
+                }
+                for (source, target) in changeset.sectionMoved {
+                    
+                    self.moveSection(source, toSection: target)
+                }
+                if !changeset.elementDeleted.isEmpty {
+                    
+                    self.deleteRows(at: changeset.elementDeleted.map { IndexPath(row: $0.element, section: $0.section) }, with: deleteRowsAnimation())
+                }
+                if !changeset.elementInserted.isEmpty {
+                    
+                    self.insertRows(at: changeset.elementInserted.map { IndexPath(row: $0.element, section: $0.section) }, with: insertRowsAnimation())
+                }
+                if !changeset.elementUpdated.isEmpty {
+                    
+                    self.reloadRows(at: changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) }, with: reloadRowsAnimation())
+                }
+                for (source, target) in changeset.elementMoved {
+                    
+                    self.moveRow(at: IndexPath(row: source.element, section: source.section), to: IndexPath(row: target.element, section: target.section))
+                }
+            }
+        }
+    }
+
+    @nonobjc
+    private func cs_performBatchUpdates(_ updates: () -> Void) {
+        
+        if #available(iOS 11.0, tvOS 11.0, *) {
+            
+            self.performBatchUpdates(updates)
+        }
+        else {
+            
+            self.beginUpdates()
+            updates()
+            self.endUpdates()
+        }
+    }
+}
 
 
 #endif
diff --git a/Sources/Differentiable.swift b/Sources/Differentiable.swift
new file mode 100644
index 0000000..6a5a442
--- /dev/null
+++ b/Sources/Differentiable.swift
@@ -0,0 +1,62 @@
+//
+//  Differentiable.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - Differentiable
+
+@usableFromInline
+internal protocol Differentiable {
+
+    associatedtype DifferenceIdentifier: Hashable
+
+    var differenceIdentifier: DifferenceIdentifier { get }
+
+    func isContentEqual(to source: Self) -> Bool
+}
+
+extension Differentiable where Self: AnyObject {
+
+    // MARK: Internal
+    
+    internal var differenceIdentifier: ObjectIdentifier {
+    
+        return .init(self)
+    }
+}
+
+
+// MARK: - DifferentiableSection
+
+@usableFromInline
+internal protocol DifferentiableSection: Differentiable {
+    
+    associatedtype Collection: Swift.Collection where Collection.Element: Differentiable
+    
+    var elements: Collection { get }
+
+    init<S: Sequence>(source: Self, elements: S) where S.Element == Collection.Element
+}
diff --git a/Sources/Internals.Closure.swift b/Sources/Internals.Closure.swift
new file mode 100644
index 0000000..a7438ec
--- /dev/null
+++ b/Sources/Internals.Closure.swift
@@ -0,0 +1,54 @@
+//
+//  Internals.Closure.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - Internals
+
+extension Internals {
+    
+    // MARK: - Closure
+    
+    internal final class Closure<T, U> {
+        
+        // MARK: FilePrivate
+        
+        internal init(_ closure: @escaping (T) -> U) {
+            
+            self.closure = closure
+        }
+        
+        internal func invoke(with argument: T) -> U {
+            
+            return self.closure(argument)
+        }
+        
+        
+        // MARK: Private
+        
+        private let closure: (T) -> U
+    }
+}
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index 15bcc98..0da8f30 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -51,6 +51,18 @@ extension Internals {
 
             self.structure = .init(sections: sections)
         }
+        
+        var sections: [Section] {
+            
+            get {
+                
+                return self.structure.sections
+            }
+            set {
+                
+                self.structure.sections = newValue
+            }
+        }
 
 
         // MARK: DiffableDataSourceSnapshotProtocol
@@ -186,48 +198,66 @@ extension Internals {
         private var structure: BackingStructure
 
 
-        // MARK: - ItemStateID
+        // MARK: - Section
 
-        internal struct ItemStateID: Identifiable, Equatable {
+        internal struct Section: DifferentiableSection, Equatable {
 
-            let stateTag: UUID
+            var isReloaded: Bool
 
-            init(id: NSManagedObjectID, stateTag: UUID) {
-
-                self.id = id
-                self.stateTag = stateTag
+            init(differenceIdentifier: String, items: [Item] = [], isReloaded: Bool = false) {
+                
+                self.differenceIdentifier = differenceIdentifier
+                self.elements = items
+                self.isReloaded = isReloaded
             }
 
-            func isContentEqual(to source: ItemStateID) -> Bool {
+            // MARK: Differentiable
 
-                return self.id == source.id && self.stateTag == source.stateTag
+            let differenceIdentifier: String
+
+            func isContentEqual(to source: Section) -> Bool {
+
+                return !self.isReloaded
+                    && self.differenceIdentifier == source.differenceIdentifier
             }
+            
+            
+            // MARK: DifferentiableSection
+            
+            var elements: [Item] = []
 
-            // MARK: Identifiable
+            init<S: Sequence>(source: Section, elements: S) where S.Element == Item {
 
-            let id: NSManagedObjectID
+                self.init(
+                    differenceIdentifier: source.differenceIdentifier,
+                    items: Array(elements),
+                    isReloaded: source.isReloaded
+                )
+            }
         }
 
 
-        // MARK: - SectionStateID
+        // MARK: - Item
 
-        internal struct SectionStateID: Identifiable, Equatable {
+        internal struct Item: Differentiable, Equatable {
 
-            let stateTag: UUID
+            var isReloaded: Bool
 
-            init(id: String, stateTag: UUID) {
-                self.id = id
-                self.stateTag = stateTag
+            init(differenceIdentifier: NSManagedObjectID, isReloaded: Bool = false) {
+
+                self.differenceIdentifier = differenceIdentifier
+                self.isReloaded = isReloaded
             }
 
-            func isContentEqual(to source: SectionStateID) -> Bool {
+            // MARK: Differentiable
 
-                return self.id == source.id && self.stateTag == source.stateTag
+            let differenceIdentifier: NSManagedObjectID
+
+            func isContentEqual(to source: Item) -> Bool {
+
+                return !self.isReloaded
+                    && self.differenceIdentifier == source.differenceIdentifier
             }
-
-            // MARK: Identifiable
-
-            let id: String
         }
 
 
@@ -249,22 +279,22 @@ extension Internals {
                 self.sections = sections.map {
 
                     Section(
-                        id: $0.name,
+                        differenceIdentifier: $0.name,
                         items: $0.objects?
                             .compactMap({ ($0 as? NSManagedObject)?.objectID })
-                            .map({ Item(id: $0) }) ?? []
+                            .map({ Item(differenceIdentifier: $0) }) ?? []
                     )
                 }
             }
 
             var allSectionIDs: [String] {
 
-                return self.sections.map({ $0.id })
+                return self.sections.map({ $0.differenceIdentifier })
             }
 
             var allItemIDs: [NSManagedObjectID] {
 
-                return self.sections.lazy.flatMap({ $0.elements }).map({ $0.id })
+                return self.sections.lazy.flatMap({ $0.elements }).map({ $0.differenceIdentifier })
             }
 
             func items(in sectionID: String) -> [NSManagedObjectID] {
@@ -273,12 +303,12 @@ extension Internals {
 
                     Internals.abort("Section \"\(sectionID)\" does not exist")
                 }
-                return self.sections[sectionIndex].elements.map({ $0.id })
+                return self.sections[sectionIndex].elements.map({ $0.differenceIdentifier })
             }
 
             func section(containing itemID: NSManagedObjectID) -> String? {
 
-                return self.itemPositionMap()[itemID]?.section.id
+                return self.itemPositionMap()[itemID]?.section.differenceIdentifier
             }
 
             mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?) {
@@ -301,7 +331,7 @@ extension Internals {
                     }
                     index = section.index(before: section.endIndex)
                 }
-                let items = itemIDs.lazy.map({ Item(id: $0) })
+                let items = itemIDs.lazy.map({ Item(differenceIdentifier: $0) })
                 self.sections[index].elements.append(contentsOf: items)
             }
 
@@ -311,7 +341,7 @@ extension Internals {
 
                     Internals.abort("Item \(beforeItemID) does not exist")
                 }
-                let items = itemIDs.lazy.map({ Item(id: $0) })
+                let items = itemIDs.lazy.map({ Item(differenceIdentifier: $0) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemPosition.itemRelativeIndex)
             }
@@ -324,7 +354,7 @@ extension Internals {
                 }
                 let itemIndex = self.sections[itemPosition.sectionIndex].elements
                     .index(after: itemPosition.itemRelativeIndex)
-                let items = itemIDs.lazy.map({ Item(id: $0) })
+                let items = itemIDs.lazy.map({ Item(differenceIdentifier: $0) })
                 self.sections[itemPosition.sectionIndex].elements
                     .insert(contentsOf: items, at: itemIndex)
             }
@@ -406,7 +436,7 @@ extension Internals {
 
             mutating func append(sectionIDs: [String]) {
 
-                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
+                let newSections = sectionIDs.lazy.map({ Section(differenceIdentifier: $0) })
                 self.sections.append(contentsOf: newSections)
             }
 
@@ -416,7 +446,7 @@ extension Internals {
 
                     Internals.abort("Section \"\(beforeSectionID)\" does not exist")
                 }
-                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
+                let newSections = sectionIDs.lazy.map({ Section(differenceIdentifier: $0) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
@@ -427,7 +457,7 @@ extension Internals {
                     Internals.abort("Section \"\(afterSectionID)\" does not exist")
                 }
                 let sectionIndex = self.sections.index(after: beforeIndex)
-                let newSections = sectionIDs.lazy.map({ Section(id: $0) })
+                let newSections = sectionIDs.lazy.map({ Section(differenceIdentifier: $0) })
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
@@ -481,11 +511,9 @@ extension Internals {
 
             // MARK: Private
 
-            private static let zeroUUID: UUID = .init(uuid: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
-
             private func sectionIndex(of sectionID: String) -> Array<Section>.Index? {
 
-                return self.sections.firstIndex(where: { $0.id == sectionID })
+                return self.sections.firstIndex(where: { $0.differenceIdentifier == sectionID })
             }
 
             @discardableResult
@@ -515,7 +543,7 @@ extension Internals {
 
                     for (itemRelativeIndex, item) in section.element.elements.enumerated() {
 
-                        result[item.id] = ItemPosition(
+                        result[item.differenceIdentifier] = ItemPosition(
                             item: item,
                             itemRelativeIndex: itemRelativeIndex,
                             section: section.element,
@@ -526,58 +554,6 @@ extension Internals {
             }
 
 
-            // MARK: - Item
-
-            fileprivate struct Item: Identifiable, Equatable {
-
-                var isReloaded: Bool
-
-                init(id: NSManagedObjectID, isReloaded: Bool = false) {
-
-                    self.id = id
-                    self.isReloaded = isReloaded
-                }
-
-                func isContentEqual(to source: Item) -> Bool {
-
-                    return !self.isReloaded && self.id == source.id
-                }
-
-                // MARK: Identifiable
-
-                let id: NSManagedObjectID
-            }
-
-
-            // MARK: - Section
-
-            fileprivate struct Section: Identifiable, Equatable {
-
-                var elements: [Item] = []
-                var isReloaded: Bool
-
-                init(id: String, items: [Item] = [], isReloaded: Bool = false) {
-                    self.id = id
-                    self.elements = items
-                    self.isReloaded = isReloaded
-                }
-
-                init<S: Sequence>(source: Section, elements: S) where S.Element == Item {
-
-                    self.init(id: source.id, items: Array(elements), isReloaded: source.isReloaded)
-                }
-
-                func isContentEqual(to source: Section) -> Bool {
-
-                    return !self.isReloaded && self.id == source.id
-                }
-
-                // MARK: Identifiable
-
-                let id: String
-            }
-
-
             // MARK: - ItemPosition
 
             fileprivate struct ItemPosition {
@@ -595,73 +571,7 @@ extension Internals {
 // MARK: - NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-extension NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol where SectionIdentifierType == NSString, ItemIdentifierType == NSManagedObjectID {
-
-    internal var sectionIdentifiers: [String] {
-
-        return self.sectionIdentifiers as [NSString] as [String]
-    }
-
-    internal func numberOfItems(inSection identifier: String) -> Int {
-
-        return self.numberOfItems(inSection: identifier as NSString)
-    }
-
-    internal func itemIdentifiers(inSection identifier: String) -> [NSManagedObjectID] {
-
-        return self.itemIdentifiers(inSection: identifier as NSString)
-    }
-
-    internal func sectionIdentifier(containingItem identifier: NSManagedObjectID) -> String? {
-
-        return self.sectionIdentifier(containingItem: identifier) as NSString? as String?
-    }
-
-    internal func indexOfSection(_ identifier: String) -> Int? {
-
-        return self.indexOfSection(identifier as NSString)
-    }
-
-    internal mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
-
-        self.appendItems(identifiers, toSection: sectionIdentifier as NSString?)
-    }
-
-    internal mutating func appendSections(_ identifiers: [String]) {
-
-        self.appendSections(identifiers as [NSString])
-    }
-
-    internal mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String) {
-
-        self.insertSections(identifiers as [NSString], beforeSection: toIdentifier as NSString)
-    }
-
-    internal mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String) {
-
-        return self.insertSections(identifiers as [NSString], afterSection: toIdentifier as NSString)
-    }
-
-    internal mutating func deleteSections(_ identifiers: [String]) {
-
-        self.deleteSections(identifiers as [NSString])
-    }
-
-    internal mutating func moveSection(_ identifier: String, beforeSection toIdentifier: String) {
-
-        self.moveSection(identifier as NSString, beforeSection: toIdentifier as NSString)
-    }
-
-    internal mutating func moveSection(_ identifier: String, afterSection toIdentifier: String) {
-
-        self.moveSection(identifier as NSString, afterSection: toIdentifier as NSString)
-    }
-
-    internal mutating func reloadSections(_ identifiers: [String]) {
-
-        self.reloadSections(identifiers as [NSString])
-    }
-}
+extension NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol where SectionIdentifierType == String, ItemIdentifierType == NSManagedObjectID {}
 
 
 #endif
diff --git a/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift b/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
new file mode 100644
index 0000000..510905b
--- /dev/null
+++ b/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
@@ -0,0 +1,141 @@
+//
+//  Internals.DiffableDataUIDispatcher.Changeset.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import Foundation
+
+
+// MARK: - Internals.DiffableDataUIDispatcher
+
+extension Internals.DiffableDataUIDispatcher {
+    
+    // MARK: - ChangeSet
+    
+    internal struct Changeset<C: Collection>: Equatable where C: Equatable {
+        
+        var data: C
+        var sectionDeleted: [Int]
+        var sectionInserted: [Int]
+        var sectionUpdated: [Int]
+        var sectionMoved: [(source: Int, target: Int)]
+
+        var elementDeleted: [ElementPath]
+        var elementInserted: [ElementPath]
+        var elementUpdated: [ElementPath]
+        var elementMoved: [(source: ElementPath, target: ElementPath)]
+
+        @inlinable
+        init(
+            data: C,
+            sectionDeleted: [Int] = [],
+            sectionInserted: [Int] = [],
+            sectionUpdated: [Int] = [],
+            sectionMoved: [(source: Int, target: Int)] = [],
+            elementDeleted: [ElementPath] = [],
+            elementInserted: [ElementPath] = [],
+            elementUpdated: [ElementPath] = [],
+            elementMoved: [(source: ElementPath, target: ElementPath)] = []
+        ) {
+            self.data = data
+            self.sectionDeleted = sectionDeleted
+            self.sectionInserted = sectionInserted
+            self.sectionUpdated = sectionUpdated
+            self.sectionMoved = sectionMoved
+            self.elementDeleted = elementDeleted
+            self.elementInserted = elementInserted
+            self.elementUpdated = elementUpdated
+            self.elementMoved = elementMoved
+        }
+
+        @inlinable
+        var sectionChangeCount: Int {
+            
+            return self.sectionDeleted.count
+                + self.sectionInserted.count
+                + self.sectionUpdated.count
+                + self.sectionMoved.count
+        }
+
+        @inlinable
+        var elementChangeCount: Int {
+            
+            return self.elementDeleted.count
+                + self.elementInserted.count
+                + self.elementUpdated.count
+                + self.elementMoved.count
+        }
+
+        @inlinable
+        var changeCount: Int {
+            
+            return self.sectionChangeCount + self.elementChangeCount
+        }
+
+        @inlinable
+        var hasSectionChanges: Bool {
+            
+            return self.sectionChangeCount > 0
+        }
+
+        @inlinable
+        var hasElementChanges: Bool {
+            
+            return self.elementChangeCount > 0
+        }
+
+        @inlinable
+        var hasChanges: Bool {
+            
+            return self.changeCount > 0
+        }
+        
+        
+        // MARK: Equatable
+        
+        static func == (lhs: Changeset, rhs: Changeset) -> Bool {
+            return lhs.data == rhs.data
+                && Set(lhs.sectionDeleted) == Set(rhs.sectionDeleted)
+                && Set(lhs.sectionInserted) == Set(rhs.sectionInserted)
+                && Set(lhs.sectionUpdated) == Set(rhs.sectionUpdated)
+                && Set(lhs.sectionMoved.map(HashablePair.init)) == Set(rhs.sectionMoved.map(HashablePair.init))
+                && Set(lhs.elementDeleted) == Set(rhs.elementDeleted)
+                && Set(lhs.elementInserted) == Set(rhs.elementInserted)
+                && Set(lhs.elementUpdated) == Set(rhs.elementUpdated)
+                && Set(lhs.elementMoved.map(HashablePair.init)) == Set(rhs.elementMoved.map(HashablePair.init))
+        }
+        
+        
+        // MARK: - HashablePair
+        
+        private struct HashablePair<H: Hashable>: Hashable {
+            
+            let first: H
+            let second: H
+        }
+    }
+}
+
+#endif
diff --git a/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
new file mode 100644
index 0000000..01e8df9
--- /dev/null
+++ b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
@@ -0,0 +1,320 @@
+//
+//  Internals.DiffableDataUIDispatcher.DiffResult.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import Foundation
+
+
+// MARK: - Internals.DiffableDataUIDispatcher
+
+extension Internals.DiffableDataUIDispatcher {
+    
+    // MARK: - DiffResult
+    
+    @usableFromInline
+    internal struct DiffResult<Index> {
+        
+        @usableFromInline
+        internal let deleted: [Index]
+        @usableFromInline
+        internal let inserted: [Index]
+        @usableFromInline
+        internal let updated: [Index]
+        @usableFromInline
+        internal let moved: [(source: Index, target: Index)]
+        @usableFromInline
+        internal let sourceTraces: ContiguousArray<Trace<Int>>
+        @usableFromInline
+        internal let targetReferences: ContiguousArray<Int?>
+        
+        @inlinable
+        @discardableResult
+        static func diff<E: Differentiable>(
+            source: ContiguousArray<E>,
+            target: ContiguousArray<E>,
+            useTargetIndexForUpdated: Bool,
+            mapIndex: (Int) -> Index,
+            updatedElementsPointer: UnsafeMutablePointer<ContiguousArray<E>>? = nil,
+            notDeletedElementsPointer: UnsafeMutablePointer<ContiguousArray<E>>? = nil
+        ) -> DiffResult<Index> {
+            
+            var deleted = [Index]()
+            var inserted = [Index]()
+            var updated = [Index]()
+            var moved = [(source: Index, target: Index)]()
+            
+            var sourceTraces = ContiguousArray<Trace<Int>>()
+            var sourceIdentifiers = ContiguousArray<E.DifferenceIdentifier>()
+            var targetReferences = ContiguousArray<Int?>(repeating: nil, count: target.count)
+            
+            sourceTraces.reserveCapacity(source.count)
+            sourceIdentifiers.reserveCapacity(source.count)
+            
+            for sourceElement in source {
+                
+                sourceTraces.append(Trace())
+                sourceIdentifiers.append(sourceElement.differenceIdentifier)
+            }
+            sourceIdentifiers.withUnsafeBufferPointer { bufferPointer in
+                
+                var sourceOccurrencesTable = [TableKey<E.DifferenceIdentifier>: Occurrence](minimumCapacity: source.count)
+                
+                for sourceIndex in sourceIdentifiers.indices {
+                    
+                    let pointer = bufferPointer.baseAddress!.advanced(by: sourceIndex)
+                    let key = TableKey(pointer: pointer)
+                    
+                    switch sourceOccurrencesTable[key] {
+                    case .none:
+                        sourceOccurrencesTable[key] = .unique(index: sourceIndex)
+                        
+                    case .unique(let otherIndex)?:
+                        let reference = IndicesReference([otherIndex, sourceIndex])
+                        sourceOccurrencesTable[key] = .duplicate(reference: reference)
+                        
+                    case .duplicate(let reference)?:
+                        reference.push(sourceIndex)
+                    }
+                }
+                for targetIndex in target.indices {
+                    
+                    var targetIdentifier = target[targetIndex].differenceIdentifier
+                    let key = TableKey(pointer: &targetIdentifier)
+                    
+                    switch sourceOccurrencesTable[key] {
+                        
+                    case .none:
+                        break
+                        
+                    case .unique(let sourceIndex)?:
+                        if case .none = sourceTraces[sourceIndex].reference {
+                            
+                            targetReferences[targetIndex] = sourceIndex
+                            sourceTraces[sourceIndex].reference = targetIndex
+                        }
+                        
+                    case .duplicate(let reference)?:
+                        if let sourceIndex = reference.next() {
+                            
+                            targetReferences[targetIndex] = sourceIndex
+                            sourceTraces[sourceIndex].reference = targetIndex
+                        }
+                    }
+                }
+            }
+            
+            var offsetByDelete = 0
+            var untrackedSourceIndex: Int? = 0
+            
+            for sourceIndex in source.indices {
+                
+                sourceTraces[sourceIndex].deleteOffset = offsetByDelete
+                
+                if let targetIndex = sourceTraces[sourceIndex].reference {
+                    
+                    let targetElement = target[targetIndex]
+                    updatedElementsPointer?.pointee.append(targetElement)
+                    notDeletedElementsPointer?.pointee.append(targetElement)
+                }
+                else {
+                    
+                    let sourceElement = source[sourceIndex]
+                    deleted.append(mapIndex(sourceIndex))
+                    sourceTraces[sourceIndex].isTracked = true
+                    offsetByDelete += 1
+                    updatedElementsPointer?.pointee.append(sourceElement)
+                }
+            }
+            for targetIndex in target.indices {
+                
+                untrackedSourceIndex = untrackedSourceIndex.flatMap { index in
+                    
+                    sourceTraces.suffix(from: index).firstIndex { !$0.isTracked }
+                }
+                if let sourceIndex = targetReferences[targetIndex] {
+                    
+                    sourceTraces[sourceIndex].isTracked = true
+                    
+                    let sourceElement = source[sourceIndex]
+                    let targetElement = target[targetIndex]
+                    
+                    if !targetElement.isContentEqual(to: sourceElement) {
+                        
+                        updated.append(mapIndex(useTargetIndexForUpdated ? targetIndex : sourceIndex))
+                    }
+                    if sourceIndex != untrackedSourceIndex {
+                        
+                        let deleteOffset = sourceTraces[sourceIndex].deleteOffset
+                        moved.append((source: mapIndex(sourceIndex - deleteOffset), target: mapIndex(targetIndex)))
+                    }
+                }
+                else {
+                    
+                    inserted.append(mapIndex(targetIndex))
+                }
+            }
+            return DiffResult(
+                deleted: deleted,
+                inserted: inserted,
+                updated: updated,
+                moved: moved,
+                sourceTraces: sourceTraces,
+                targetReferences: targetReferences
+            )
+        }
+        
+        
+        // MARK: Private
+        
+        @inlinable
+        internal init(
+            deleted: [Index] = [],
+            inserted: [Index] = [],
+            updated: [Index] = [],
+            moved: [(source: Index, target: Index)] = [],
+            sourceTraces: ContiguousArray<Trace<Int>>,
+            targetReferences: ContiguousArray<Int?>
+        ) {
+            
+            self.deleted = deleted
+            self.inserted = inserted
+            self.updated = updated
+            self.moved = moved
+            self.sourceTraces = sourceTraces
+            self.targetReferences = targetReferences
+        }
+        
+        
+        // MARK: - Trace
+        
+        @usableFromInline
+        internal struct Trace<Index> {
+            
+            @usableFromInline
+            internal var reference: Index?
+            
+            @usableFromInline
+            internal var deleteOffset = 0
+            
+            @usableFromInline
+            internal var isTracked = false
+            
+            @inlinable
+            init() {}
+        }
+        
+        
+        // MARK: - Occurrence
+        
+        @usableFromInline
+        internal enum Occurrence {
+            
+            case unique(index: Int)
+            case duplicate(reference: IndicesReference)
+        }
+        
+        
+        // MARK: - IndicesReference
+        
+        @usableFromInline
+        internal final class IndicesReference {
+            
+            @usableFromInline
+            internal var indices: ContiguousArray<Int>
+            
+            @usableFromInline
+            internal var position = 0
+            
+            @inlinable
+            internal init(_ indices: ContiguousArray<Int>) {
+                
+                self.indices = indices
+            }
+            
+            @inlinable
+            internal func push(_ index: Int) {
+                
+                self.indices.append(index)
+            }
+            
+            @inlinable
+            internal func next() -> Int? {
+                
+                guard self.position < self.indices.endIndex else {
+                    
+                    return nil
+                }
+                defer {
+                    
+                    self.position += 1
+                }
+                return self.indices[self.position]
+            }
+        }
+        
+        
+        // MARK: - TableKey
+        
+        @usableFromInline
+        internal struct TableKey<T: Hashable>: Hashable {
+            
+            @usableFromInline
+            internal let pointeeHashValue: Int
+            
+            @usableFromInline
+            internal let pointer: UnsafePointer<T>
+            
+            @inlinable
+            internal init(pointer: UnsafePointer<T>) {
+                
+                self.pointeeHashValue = pointer.pointee.hashValue
+                self.pointer = pointer
+            }
+            
+            
+            // MARK: Equatable
+            
+            @inlinable
+            internal static func == (lhs: TableKey, rhs: TableKey) -> Bool {
+                
+                return lhs.pointeeHashValue == rhs.pointeeHashValue
+                    && (lhs.pointer.distance(to: rhs.pointer) == 0
+                        || lhs.pointer.pointee == rhs.pointer.pointee)
+            }
+            
+            
+            // MARK: Hashable
+            
+            @inlinable
+            internal func hash(into hasher: inout Hasher) {
+                
+                hasher.combine(pointeeHashValue)
+            }
+        }
+    }
+}
+
+#endif
diff --git a/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift b/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
new file mode 100644
index 0000000..7ba2359
--- /dev/null
+++ b/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
@@ -0,0 +1,516 @@
+//
+//  Internals.DiffableDataUIDispatcher.StagedChangeset.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import Foundation
+
+
+// MARK: - Internals.DiffableDataUIDispatcher
+
+extension Internals.DiffableDataUIDispatcher {
+    
+    // MARK: - StagedChangeset
+
+    internal struct StagedChangeset<C: Collection>: ExpressibleByArrayLiteral, Equatable, RandomAccessCollection, RangeReplaceableCollection where C: Equatable {
+        
+        @usableFromInline
+        var changesets: ContiguousArray<Changeset<C>>
+
+        @inlinable
+        init<S: Sequence>(_ changesets: S) where S.Element == Changeset<C> {
+            
+            self.changesets = ContiguousArray(changesets)
+        }
+        
+        
+        // MARK: ExpressibleByArrayLiteral
+        
+        @inlinable
+        init(arrayLiteral elements: Changeset<C>...) {
+            
+            self.init(elements)
+        }
+        
+        
+        // MARK: Equatable
+
+        @inlinable
+        static func == (lhs: StagedChangeset, rhs: StagedChangeset) -> Bool {
+            
+            return lhs.changesets == rhs.changesets
+        }
+        
+        
+        // MARK: Sequence
+
+        typealias Element = Changeset<C>
+        
+        
+        // MARK: RandomAccessCollection
+
+        @inlinable
+        var startIndex: Int {
+            
+            return self.changesets.startIndex
+        }
+
+        @inlinable
+        var endIndex: Int {
+            
+            return self.changesets.endIndex
+        }
+
+        @inlinable
+        func index(after i: Int) -> Int {
+            
+            return self.changesets.index(after: i)
+        }
+
+        @inlinable
+        subscript(position: Int) -> Changeset<C> {
+            
+            get { return self.changesets[position] }
+            set { self.changesets[position] = newValue }
+        }
+        
+        
+        // MARK: RangeReplaceableCollection
+
+        @inlinable
+        init() {
+            
+            self.init([])
+        }
+
+        @inlinable
+        mutating func replaceSubrange<C2: Collection, R: RangeExpression>(_ subrange: R, with newElements: C2) where C2.Element == Changeset<C>, R.Bound == Int {
+            
+            self.changesets.replaceSubrange(subrange, with: newElements)
+        }
+    }
+}
+
+
+// MARK: - Internals.DiffableDataUIDispatcher.StagedChangeset where C: RangeReplaceableCollection, C.Element: Differentiable
+
+extension Internals.DiffableDataUIDispatcher.StagedChangeset where C: RangeReplaceableCollection, C.Element: Differentiable {
+    
+    @inlinable
+    internal init(source: C, target: C) {
+        
+        self.init(source: source, target: target, section: 0)
+    }
+    
+    @inlinable
+    internal init(source: C, target: C, section: Int) {
+        
+        typealias Changeset = Internals.DiffableDataUIDispatcher<O>.Changeset
+        typealias ElementPath = Internals.DiffableDataUIDispatcher<O>.ElementPath
+        typealias DiffResult = Internals.DiffableDataUIDispatcher<O>.DiffResult
+        
+        let sourceElements = ContiguousArray(source)
+        let targetElements = ContiguousArray(target)
+        if sourceElements.isEmpty && targetElements.isEmpty {
+            
+            self.init()
+            return
+        }
+        if !sourceElements.isEmpty && targetElements.isEmpty {
+            
+            self.init(
+                [
+                    Changeset(
+                        data: target,
+                        elementDeleted: sourceElements.indices.map {
+                            ElementPath(
+                                element: $0,
+                                section: section
+                            )
+                        }
+                    )
+                ]
+            )
+            return
+        }
+        if sourceElements.isEmpty && !targetElements.isEmpty {
+            
+            self.init(
+                [
+                    Changeset(
+                        data: target,
+                        elementInserted: targetElements.indices.map {
+                            ElementPath(
+                                element: $0,
+                                section: section
+                            )
+                        }
+                    )
+                ]
+            )
+            return
+        }
+        var firstStageElements = ContiguousArray<C.Element>()
+        var secondStageElements = ContiguousArray<C.Element>()
+        let result = DiffResult.diff(
+            source: sourceElements,
+            target: targetElements,
+            useTargetIndexForUpdated: false,
+            mapIndex: { ElementPath(element: $0, section: section) },
+            updatedElementsPointer: &firstStageElements,
+            notDeletedElementsPointer: &secondStageElements
+        )
+
+        var changesets = ContiguousArray<Changeset<C>>()
+        if !result.updated.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(firstStageElements),
+                    elementUpdated: result.updated
+                )
+            )
+        }
+        if !result.deleted.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(secondStageElements),
+                    elementDeleted: result.deleted
+                )
+            )
+        }
+        if !result.inserted.isEmpty || !result.moved.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: target,
+                    elementInserted: result.inserted,
+                    elementMoved: result.moved
+                )
+            )
+        }
+        if !changesets.isEmpty {
+            
+            let index = changesets.index(before: changesets.endIndex)
+            changesets[index].data = target
+        }
+        self.init(changesets)
+    }
+}
+
+
+// MARK: - Internals.DiffableDataUIDispatcher.StagedChangeset where C: RangeReplaceableCollection, C.Element: DifferentiableSection
+
+extension Internals.DiffableDataUIDispatcher.StagedChangeset where C: RangeReplaceableCollection, C.Element: DifferentiableSection {
+    
+    @inlinable
+    internal init(source: C, target: C) {
+        
+        typealias Section = C.Element
+        typealias SectionIdentifier = C.Element.DifferenceIdentifier
+        typealias Element = C.Element.Collection.Element
+        typealias ElementIdentifier = C.Element.Collection.Element.DifferenceIdentifier
+        
+        typealias Changeset = Internals.DiffableDataUIDispatcher<O>.Changeset
+        typealias ElementPath = Internals.DiffableDataUIDispatcher<O>.ElementPath
+        typealias DiffResult = Internals.DiffableDataUIDispatcher<O>.DiffResult
+        
+        typealias Trace = Internals.DiffableDataUIDispatcher<O>.DiffResult<Section>.Trace
+        typealias TableKey = Internals.DiffableDataUIDispatcher<O>.DiffResult<Section>.TableKey
+        typealias Occurrence = Internals.DiffableDataUIDispatcher<O>.DiffResult<Section>.Occurrence
+        typealias IndicesReference = Internals.DiffableDataUIDispatcher<O>.DiffResult<Section>.IndicesReference
+
+        let sourceSections = ContiguousArray(source)
+        let targetSections = ContiguousArray(target)
+
+        let contiguousSourceSections = ContiguousArray(sourceSections.map { ContiguousArray($0.elements) })
+        let contiguousTargetSections = ContiguousArray(targetSections.map { ContiguousArray($0.elements) })
+
+        var firstStageSections = sourceSections
+        var secondStageSections = ContiguousArray<Section>()
+        var thirdStageSections = ContiguousArray<Section>()
+        var fourthStageSections = ContiguousArray<Section>()
+
+        var sourceElementTraces = contiguousSourceSections.map { section in
+            
+            ContiguousArray(repeating: Trace<ElementPath>(), count: section.count)
+        }
+        var targetElementReferences = contiguousTargetSections.map { section in
+            
+            ContiguousArray<ElementPath?>(repeating: nil, count: section.count)
+        }
+
+        let flattenSourceCount = contiguousSourceSections.reduce(into: 0) { $0 += $1.count }
+        var flattenSourceIdentifiers = ContiguousArray<ElementIdentifier>()
+        var flattenSourceElementPaths = ContiguousArray<ElementPath>()
+
+        thirdStageSections.reserveCapacity(contiguousTargetSections.count)
+        fourthStageSections.reserveCapacity(contiguousTargetSections.count)
+
+        flattenSourceIdentifiers.reserveCapacity(flattenSourceCount)
+        flattenSourceElementPaths.reserveCapacity(flattenSourceCount)
+
+        let sectionResult = DiffResult.diff(
+            source: sourceSections,
+            target: targetSections,
+            useTargetIndexForUpdated: true,
+            mapIndex: { $0 }
+        )
+
+        var elementDeleted = [ElementPath]()
+        var elementInserted = [ElementPath]()
+        var elementUpdated = [ElementPath]()
+        var elementMoved = [(source: ElementPath, target: ElementPath)]()
+
+        for sourceSectionIndex in contiguousSourceSections.indices {
+            
+            for sourceElementIndex in contiguousSourceSections[sourceSectionIndex].indices {
+                
+                let sourceElementPath = ElementPath(element: sourceElementIndex, section: sourceSectionIndex)
+                let sourceElement = contiguousSourceSections[sourceElementPath]
+                flattenSourceIdentifiers.append(sourceElement.differenceIdentifier)
+                flattenSourceElementPaths.append(sourceElementPath)
+            }
+        }
+        flattenSourceIdentifiers.withUnsafeBufferPointer { bufferPointer in
+            
+            var sourceOccurrencesTable = [TableKey<ElementIdentifier>: Occurrence](minimumCapacity: flattenSourceCount)
+
+            for flattenSourceIndex in flattenSourceIdentifiers.indices {
+                let pointer = bufferPointer.baseAddress!.advanced(by: flattenSourceIndex)
+                let key = TableKey(pointer: pointer)
+
+                switch sourceOccurrencesTable[key] {
+                    
+                case .none:
+                    sourceOccurrencesTable[key] = .unique(index: flattenSourceIndex)
+
+                case .unique(let otherIndex)?:
+                    let reference = IndicesReference([otherIndex, flattenSourceIndex])
+                    sourceOccurrencesTable[key] = .duplicate(reference: reference)
+
+                case .duplicate(let reference)?:
+                    reference.push(flattenSourceIndex)
+                }
+            }
+
+            for targetSectionIndex in contiguousTargetSections.indices {
+                
+                let targetElements = contiguousTargetSections[targetSectionIndex]
+                for targetElementIndex in targetElements.indices {
+                    
+                    var targetIdentifier = targetElements[targetElementIndex].differenceIdentifier
+                    let key = TableKey(pointer: &targetIdentifier)
+
+                    switch sourceOccurrencesTable[key] {
+                        
+                    case .none:
+                        break
+
+                    case .unique(let flattenSourceIndex)?:
+                        let sourceElementPath = flattenSourceElementPaths[flattenSourceIndex]
+                        let targetElementPath = ElementPath(element: targetElementIndex, section: targetSectionIndex)
+                        if case .none = sourceElementTraces[sourceElementPath].reference {
+                            
+                            targetElementReferences[targetElementPath] = sourceElementPath
+                            sourceElementTraces[sourceElementPath].reference = targetElementPath
+                        }
+
+                    case .duplicate(let reference)?:
+                        if let flattenSourceIndex = reference.next() {
+                            
+                            let sourceElementPath = flattenSourceElementPaths[flattenSourceIndex]
+                            let targetElementPath = ElementPath(element: targetElementIndex, section: targetSectionIndex)
+                            targetElementReferences[targetElementPath] = sourceElementPath
+                            sourceElementTraces[sourceElementPath].reference = targetElementPath
+                        }
+                    }
+                }
+            }
+        }
+        for sourceSectionIndex in contiguousSourceSections.indices {
+            
+            let sourceSection = sourceSections[sourceSectionIndex]
+            let sourceElements = contiguousSourceSections[sourceSectionIndex]
+            var firstStageElements = sourceElements
+
+            if case .some = sectionResult.sourceTraces[sourceSectionIndex].reference {
+                
+                var offsetByDelete = 0
+                var secondStageElements = ContiguousArray<Element>()
+                for sourceElementIndex in sourceElements.indices {
+                    
+                    let sourceElementPath = ElementPath(element: sourceElementIndex, section: sourceSectionIndex)
+                    sourceElementTraces[sourceElementPath].deleteOffset = offsetByDelete
+
+                    if let targetElementPath = sourceElementTraces[sourceElementPath].reference,
+                        case .some = sectionResult.targetReferences[targetElementPath.section] {
+                        
+                        let targetElement = contiguousTargetSections[targetElementPath]
+                        firstStageElements[sourceElementIndex] = targetElement
+                        secondStageElements.append(targetElement)
+                        continue
+                    }
+                    elementDeleted.append(sourceElementPath)
+                    sourceElementTraces[sourceElementPath].isTracked = true
+                    offsetByDelete += 1
+                }
+
+                let secondStageSection = Section(source: sourceSection, elements: secondStageElements)
+                secondStageSections.append(secondStageSection)
+            }
+
+            let firstStageSection = Section(source: sourceSection, elements: firstStageElements)
+            firstStageSections[sourceSectionIndex] = firstStageSection
+        }
+        for targetSectionIndex in contiguousTargetSections.indices {
+            
+            guard let sourceSectionIndex = sectionResult.targetReferences[targetSectionIndex] else {
+                
+                thirdStageSections.append(targetSections[targetSectionIndex])
+                fourthStageSections.append(targetSections[targetSectionIndex])
+                continue
+            }
+
+            var untrackedSourceIndex: Int? = 0
+            let targetElements = contiguousTargetSections[targetSectionIndex]
+            let sectionDeleteOffset = sectionResult.sourceTraces[sourceSectionIndex].deleteOffset
+            let thirdStageSection = secondStageSections[sourceSectionIndex - sectionDeleteOffset]
+            thirdStageSections.append(thirdStageSection)
+
+            var fourthStageElements = ContiguousArray<Element>()
+            fourthStageElements.reserveCapacity(targetElements.count)
+
+            for targetElementIndex in targetElements.indices {
+                
+                untrackedSourceIndex = untrackedSourceIndex.flatMap { index in
+                    
+                    sourceElementTraces[sourceSectionIndex].suffix(from: index).firstIndex { !$0.isTracked }
+                }
+                let targetElementPath = ElementPath(element: targetElementIndex, section: targetSectionIndex)
+                let targetElement = contiguousTargetSections[targetElementPath]
+
+                guard
+                    let sourceElementPath = targetElementReferences[targetElementPath],
+                    let movedSourceSectionIndex = sectionResult.sourceTraces[sourceElementPath.section].reference
+                    else {
+                        
+                        fourthStageElements.append(targetElement)
+                        elementInserted.append(targetElementPath)
+                        continue
+                }
+                sourceElementTraces[sourceElementPath].isTracked = true
+
+                let sourceElement = contiguousSourceSections[sourceElementPath]
+                fourthStageElements.append(targetElement)
+
+                if !targetElement.isContentEqual(to: sourceElement) {
+                    
+                    elementUpdated.append(sourceElementPath)
+                }
+                if sourceElementPath.section != sourceSectionIndex || sourceElementPath.element != untrackedSourceIndex {
+                    
+                    let deleteOffset = sourceElementTraces[sourceElementPath].deleteOffset
+                    let moveSourceElementPath = ElementPath(element: sourceElementPath.element - deleteOffset, section: movedSourceSectionIndex)
+                    elementMoved.append((source: moveSourceElementPath, target: targetElementPath))
+                }
+            }
+            let fourthStageSection = Section(source: thirdStageSection, elements: fourthStageElements)
+            fourthStageSections.append(fourthStageSection)
+        }
+
+        var changesets = ContiguousArray<Changeset<C>>()
+        if !elementUpdated.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(firstStageSections),
+                    elementUpdated: elementUpdated
+                )
+            )
+        }
+        if !sectionResult.deleted.isEmpty || !elementDeleted.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(secondStageSections),
+                    sectionDeleted: sectionResult.deleted,
+                    elementDeleted: elementDeleted
+                )
+            )
+        }
+        if !sectionResult.inserted.isEmpty || !sectionResult.moved.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(thirdStageSections),
+                    sectionInserted: sectionResult.inserted,
+                    sectionMoved: sectionResult.moved
+                )
+            )
+        }
+        if !elementInserted.isEmpty || !elementMoved.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: C(fourthStageSections),
+                    elementInserted: elementInserted,
+                    elementMoved: elementMoved
+                )
+            )
+        }
+        if !sectionResult.updated.isEmpty {
+            
+            changesets.append(
+                Changeset(
+                    data: target,
+                    sectionUpdated: sectionResult.updated
+                )
+            )
+        }
+        if !changesets.isEmpty {
+            
+            let index = changesets.index(before: changesets.endIndex)
+            changesets[index].data = target
+        }
+        self.init(changesets)
+    }
+}
+
+
+// MARK: - MutableCollection
+
+extension MutableCollection where Element: MutableCollection, Index == Int, Element.Index == Int {
+    
+    @inlinable
+    internal subscript<O>(path: Internals.DiffableDataUIDispatcher<O>.ElementPath) -> Element.Element {
+        
+        get { return self[path.section][path.element] }
+        set { self[path.section][path.element] = newValue }
+    }
+}
+
+#endif
diff --git a/Sources/Internals.DiffableDataUIDispatcher.swift b/Sources/Internals.DiffableDataUIDispatcher.swift
new file mode 100644
index 0000000..295e9aa
--- /dev/null
+++ b/Sources/Internals.DiffableDataUIDispatcher.swift
@@ -0,0 +1,229 @@
+//
+//  Internals.DiffableDataUIDispatcher.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit) || canImport(AppKit)
+
+import CoreData
+
+#if canImport(QuartzCore)
+import QuartzCore
+
+#endif
+
+
+// MARK: - Internals
+
+extension Internals {
+
+    // MARK: Internal
+
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
+    @usableFromInline
+    internal final class DiffableDataUIDispatcher<O: DynamicObject> {
+
+        // MARK: Internal
+        
+        typealias ObjectType = O
+        
+        init(dataStack: DataStack) {
+            
+            self.dataStack = dataStack
+        }
+        
+        func apply<View: AnyObject>(_ snapshot: DiffableDataSourceSnapshot, view: View?, animatingDifferences: Bool, performUpdates: @escaping (View, StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>, @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void) -> Void) {
+            
+            self.dispatcher.dispatch { [weak self] in
+                
+                guard let self = self else {
+                    
+                    return
+                }
+
+                self.currentSnapshot = snapshot
+
+                let newSections = snapshot.sections
+                guard let view = view else {
+                    
+                    return self.sections = newSections
+                }
+
+                let performDiffingUpdates: () -> Void = {
+                    
+                    let changeset = StagedChangeset(source: self.sections, target: newSections)
+                    performUpdates(view, changeset) { sections in
+                        
+                        self.sections = sections
+                    }
+                }
+
+                #if canImport(QuartzCore)
+                
+                if !animatingDifferences {
+                    
+                    CATransaction.begin()
+                    CATransaction.setDisableActions(true)
+                    
+                    performDiffingUpdates()
+                    
+                    CATransaction.commit()
+                    return
+                }
+                
+                #endif
+                
+                performDiffingUpdates()
+            }
+        }
+
+        func snapshot() -> DiffableDataSourceSnapshot {
+            
+            var snapshot: DiffableDataSourceSnapshot = .init()
+            snapshot.sections = self.currentSnapshot.sections
+            return snapshot
+        }
+
+        func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
+            
+            guard (0 ..< self.sections.endIndex) ~= indexPath.section else {
+                
+                return nil
+            }
+            let items = self.sections[indexPath.section].elements
+            guard (0 ..< items.endIndex) ~= indexPath.item else {
+                
+                return nil
+            }
+            return items[indexPath.item].differenceIdentifier
+        }
+
+        func indexPath(for itemIdentifier: O.ObjectID) -> IndexPath? {
+            
+            let indexPathMap: [O.ObjectID: IndexPath] = self.sections.enumerated().reduce(into: [:]) { result, section in
+                
+                for (itemIndex, item) in section.element.elements.enumerated() {
+                    
+                    result[item.differenceIdentifier] = IndexPath(
+                        item: itemIndex,
+                        section: section.offset
+                    )
+                }
+            }
+            return indexPathMap[itemIdentifier]
+        }
+
+        func numberOfSections() -> Int {
+            
+            return self.sections.count
+        }
+
+        func numberOfItems(inSection section: Int) -> Int {
+            
+            return self.sections[section].elements.count
+        }
+        
+        func sectionIdentifier(inSection section: Int) -> String {
+            
+            return self.sections[section].differenceIdentifier
+        }
+
+
+        // MARK: Private
+
+        private let dispatcher: MainThreadSerialDispatcher = .init()
+        private let dataStack: DataStack
+
+        private var currentSnapshot: Internals.DiffableDataSourceSnapshot = .init()
+        private var sections: [Internals.DiffableDataSourceSnapshot.Section] = []
+        
+        
+        // MARK: - ElementPath
+        
+        @usableFromInline
+        internal struct ElementPath: Hashable {
+            
+            @usableFromInline
+            var element: Int
+            
+            @usableFromInline
+            var section: Int
+
+            @inlinable
+            init(element: Int, section: Int) {
+                
+                self.element = element
+                self.section = section
+            }
+        }
+
+
+        // MARK: - MainThreadSerialDispatcher
+
+        fileprivate final class MainThreadSerialDispatcher {
+
+            // MARK: FilePrivate
+
+            fileprivate init() {
+
+                self.executingCount.initialize(to: 0)
+            }
+
+            deinit {
+
+                self.executingCount.deinitialize(count: 1)
+                self.executingCount.deallocate()
+            }
+
+            fileprivate func dispatch(_ action: @escaping () -> Void) {
+
+                let count = OSAtomicIncrement32(self.executingCount)
+                if Thread.isMainThread && count == 1 {
+
+                    action()
+                    OSAtomicDecrement32(executingCount)
+                }
+                else {
+
+                    DispatchQueue.main.async { [weak self] in
+
+                        guard let self = self else {
+
+                            return
+                        }
+                        action()
+                        OSAtomicDecrement32(self.executingCount)
+                    }
+                }
+            }
+
+
+            // MARK: Private
+
+            private let executingCount: UnsafeMutablePointer<Int32> = .allocate(capacity: 1)
+        }
+        
+    }
+}
+
+#endif
diff --git a/Sources/Internals.FallbackDiffableDataUIDispatcher.swift b/Sources/Internals.FallbackDiffableDataUIDispatcher.swift
deleted file mode 100644
index f091916..0000000
--- a/Sources/Internals.FallbackDiffableDataUIDispatcher.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-//
-//  Internals.FallbackDiffableDataUIDispatcher.swift
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-#if canImport(UIKit) || canImport(AppKit)
-
-import CoreData
-
-#if canImport(QuartzCore)
-import QuartzCore
-
-#endif
-
-
-// MARK: - Internals
-
-extension Internals {
-
-    // MARK: Internal
-
-//    // Implementation based on https://github.com/ra1028/DiffableDataSources
-//    internal final class FallbackDiffableDataUIDispatcher {
-//
-//        // MARK: Internal
-//
-//        internal func apply() {
-//
-//        }
-//
-//        func snapshot() -> DiffableDataSourceSnapshot<SectionIdentifierType, ItemIdentifierType> {
-//            var snapshot = DiffableDataSourceSnapshot<SectionIdentifierType, ItemIdentifierType>()
-//            snapshot.structure.sections = currentSnapshot.structure.sections
-//            return snapshot
-//        }
-//
-//        func itemIdentifier(for indexPath: IndexPath) -> ItemIdentifierType? {
-//            guard 0..<sections.endIndex ~= indexPath.section else {
-//                return nil
-//            }
-//
-//            let items = sections[indexPath.section].elements
-//
-//            guard 0..<items.endIndex ~= indexPath.item else {
-//                return nil
-//            }
-//
-//            return items[indexPath.item].differenceIdentifier
-//        }
-//
-//        func unsafeItemIdentifier(for indexPath: IndexPath, file: StaticString = #file, line: UInt = #line) -> ItemIdentifierType {
-//            guard let itemIdentifier = itemIdentifier(for: indexPath) else {
-//                universalError("Item not found at the specified index path(\(indexPath)).")
-//            }
-//
-//            return itemIdentifier
-//        }
-//
-//        func indexPath(for itemIdentifier: ItemIdentifierType) -> IndexPath? {
-//            let indexPathMap: [ItemIdentifierType: IndexPath] = sections.enumerated()
-//                .reduce(into: [:]) { result, section in
-//                    for (itemIndex, item) in section.element.elements.enumerated() {
-//                        result[item.differenceIdentifier] = IndexPath(
-//                            item: itemIndex,
-//                            section: section.offset
-//                        )
-//                    }
-//            }
-//            return indexPathMap[itemIdentifier]
-//        }
-//
-//        func numberOfSections() -> Int {
-//            return sections.count
-//        }
-//
-//        func numberOfItems(inSection section: Int) -> Int {
-//            return sections[section].elements.count
-//        }
-//
-//
-//
-//        // MARK: Private
-//
-//        private let dispatcher: MainThreadSerialDispatcher = .init()
-//
-//        private var currentSnapshot: Internals.DiffableDataSourceSnapshot = FallbackDiffableDataSourceSnapshot()
-//        private var sections: [FallbackDiffableDataSourceSnapshot.BackingStructure.Section] = []
-//
-//
-//        // MARK: - MainThreadSerialDispatcher
-//
-//        fileprivate final class MainThreadSerialDispatcher {
-//
-//            // MARK: FilePrivate
-//
-//            fileprivate init() {
-//
-//                self.executingCount.initialize(to: 0)
-//            }
-//
-//            deinit {
-//
-//                self.executingCount.deinitialize(count: 1)
-//                self.executingCount.deallocate()
-//            }
-//
-//            fileprivate func dispatch(_ action: @escaping () -> Void) {
-//
-//                let count = OSAtomicIncrement32(self.executingCount)
-//                if Thread.isMainThread && count == 1 {
-//
-//                    action()
-//                    OSAtomicDecrement32(executingCount)
-//                }
-//                else {
-//
-//                    DispatchQueue.main.async { [weak self] in
-//
-//                        guard let self = self else {
-//
-//                            return
-//                        }
-//                        action()
-//                        OSAtomicDecrement32(self.executingCount)
-//                    }
-//                }
-//            }
-//
-//
-//            // MARK: Private
-//
-//            private let executingCount: UnsafeMutablePointer<Int32> = .allocate(capacity: 1)
-//        }
-//    }
-}
-
-#endif
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 5a1ad65..30725ca 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -41,7 +41,12 @@ import AppKit
 
 internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject {
 
-    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: DiffableDataSourceSnapshotProtocol)
+//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+//    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>)
+
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot)
+    
+    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String?
 }
 
 
@@ -75,14 +80,14 @@ extension Internals {
 
         internal func initialFetch() {
 
-            #if canImport(UIKit) || canImport(AppKit)
-
-            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-
-                return
-            }
-
-            #endif
+//            #if canImport(UIKit) || canImport(AppKit)
+//
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return
+//            }
+//
+//            #endif
 
             guard let fetchedResultsController = self.fetchedResultsController else {
 
@@ -94,19 +99,19 @@ extension Internals {
 
         // MARK: NSFetchedResultsControllerDelegate
 
-        #if canImport(UIKit) || canImport(AppKit)
-
-        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-        @objc
-        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
-
-            self.handler?.controller(
-                controller,
-                didChangeContentWith: snapshot as NSDiffableDataSourceSnapshot<NSString, NSManagedObjectID>
-            )
-        }
-
-        #endif
+//        #if canImport(UIKit) || canImport(AppKit)
+//
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+//        @objc
+//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
+//
+//            self.handler?.controller(
+//                controller,
+//                didChangeContentWith: snapshot as NSDiffableDataSourceSnapshot<String, NSManagedObjectID>
+//            )
+//        }
+//
+//        #endif
         
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
@@ -118,5 +123,14 @@ extension Internals {
                 )
             )
         }
+
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String) -> String? {
+
+            return self.handler?.controller(
+                controller,
+                sectionIndexTitleForSectionName: sectionName
+            )
+        }
     }
 }
diff --git a/Sources/Internals.SharedNotificationObserver.swift b/Sources/Internals.SharedNotificationObserver.swift
index e724ab5..5551d1a 100644
--- a/Sources/Internals.SharedNotificationObserver.swift
+++ b/Sources/Internals.SharedNotificationObserver.swift
@@ -56,18 +56,19 @@ extension Internals {
         deinit {
 
             self.observer.map(NotificationCenter.default.removeObserver(_:))
+            self.observers.removeAllObjects()
         }
 
         internal func addObserver<U: AnyObject>(_ observer: U, closure: @escaping (T) -> Void) {
 
-            self.observers.setObject(Closure(closure), forKey: observer)
+            self.observers.setObject(Closure<T, Void>(closure), forKey: observer)
         }
 
 
         // MARK: Private
 
         private var observer: NSObjectProtocol!
-        private let observers: NSMapTable<AnyObject, Closure> = .weakToStrongObjects()
+        private let observers: NSMapTable<AnyObject, Closure<T, Void>> = .weakToStrongObjects()
 
         private func notifyObservers(_ sharedValue: T) {
 
@@ -77,31 +78,8 @@ extension Internals {
             }
             for closure in enumerator {
 
-                (closure as! Closure).invoke(with: sharedValue)
+                (closure as! Closure<T, Void>).invoke(with: sharedValue)
             }
         }
-
-
-        // MARK: - Closure
-
-        fileprivate final class Closure {
-
-            // MARK: FilePrivate
-
-            fileprivate init(_ closure: @escaping (T) -> Void) {
-
-                self.closure = closure
-            }
-
-            fileprivate func invoke(with argument: T) {
-
-                self.closure(argument)
-            }
-
-
-            // MARK: Private
-
-            private let closure: (T) -> Void
-        }
     }
 }
diff --git a/Sources/Internals.swift b/Sources/Internals.swift
index 27a1abf..0c48a84 100644
--- a/Sources/Internals.swift
+++ b/Sources/Internals.swift
@@ -27,6 +27,7 @@ import Foundation
 
 // MARK: - Internals
 
+@usableFromInline
 internal enum Internals {
 
     // MARK: Associated Objects
diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift
index 0f3645c..74e0d63 100644
--- a/Sources/ListMonitor.swift
+++ b/Sources/ListMonitor.swift
@@ -1453,7 +1453,7 @@ extension ListMonitor: FetchedResultsControllerHandler {
         )
     }
     
-   internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String? {
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String? {
     
         return self.sectionIndexTransformer(sectionName)
     }
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 4a03c73..539dad2 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -42,6 +42,24 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
     public typealias SectionID = String
     public typealias ItemID = O.ObjectID
+    
+    public init(byCloning snapshot: ListSnapshot<O>, for dataStack: DataStack) {
+
+//        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//            self.init(
+//                diffableSnapshot: snapshot.diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
+//                context: dataStack.mainContext
+//            )
+//        }
+//        else {
+
+            self.init(
+                diffableSnapshot: snapshot.diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                context: dataStack.mainContext
+            )
+//        }
+    }
 
     public subscript<S: Sequence>(indices indices: S) -> [LiveObject<O>] where S.Element == Index {
 
@@ -252,13 +270,29 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     
     // MARK: Internal
     
+    internal private(set) var diffableSnapshot: DiffableDataSourceSnapshotProtocol
+    
     internal init() {
 
-        self.diffableSnapshot = Internals.DiffableDataSourceSnapshot()
+//        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//            self.diffableSnapshot = NSDiffableDataSourceSnapshot<String, NSManagedObjectID>()
+//        }
+//        else {
+            
+            self.diffableSnapshot = Internals.DiffableDataSourceSnapshot()
+//        }
         self.context = nil
     }
     
-    internal init(diffableSnapshot: DiffableDataSourceSnapshotProtocol, context: NSManagedObjectContext) {
+//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+//    internal init(diffableSnapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>, context: NSManagedObjectContext) {
+//
+//        self.diffableSnapshot = diffableSnapshot
+//        self.context = context
+//    }
+    
+    internal init(diffableSnapshot: Internals.DiffableDataSourceSnapshot, context: NSManagedObjectContext) {
 
         self.diffableSnapshot = diffableSnapshot
         self.context = context
@@ -270,5 +304,4 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
     private let id: UUID = .init()
     private let context: NSManagedObjectContext?
 
-    private var diffableSnapshot: DiffableDataSourceSnapshotProtocol
 }
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 35fc7c5..992e61b 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -45,29 +45,6 @@ public final class LiveList<O: DynamicObject>: Hashable {
     public typealias SectionID = SnapshotType.SectionID
     public typealias ItemID = SnapshotType.ItemID
 
-    public fileprivate(set) var snapshot: SnapshotType = .init() {
-
-        willSet {
-
-            self.willChange()
-        }
-    }
-
-    public var numberOfItems: Int {
-
-        return self.snapshot.numberOfItems
-    }
-
-    public var numberOfSections: Int {
-
-        return self.snapshot.numberOfSections
-    }
-
-    public var sectionIdentifiers: [SectionID] {
-
-        return self.snapshot.sectionIdentifiers
-    }
-
     public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
 
         let context = self.context
@@ -85,6 +62,24 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return self.context.liveObject(id: validID)
     }
 
+    public subscript(indexPath indexPath: IndexPath) -> LiveObject<O>? {
+        
+        let snapshot = self.snapshot
+        let sectionIdentifiers = snapshot.sectionIdentifiers
+        guard sectionIdentifiers.indices.contains(indexPath.section) else {
+            
+            return nil
+        }
+        let sectionID = sectionIdentifiers[indexPath.section]
+        let itemIdentifiers = snapshot.itemIdentifiers(inSection: sectionID)
+        guard itemIdentifiers.indices.contains(indexPath.item) else {
+            
+            return nil
+        }
+        let itemID = itemIdentifiers[indexPath.item]
+        return self.context.liveObject(id: itemID)
+    }
+
     public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
 
         let context = self.context
@@ -96,6 +91,34 @@ public final class LiveList<O: DynamicObject>: Hashable {
         }
     }
 
+    public fileprivate(set) var snapshot: SnapshotType = .init() {
+
+        willSet {
+
+            self.willChange()
+        }
+        didSet {
+            
+            self.notifyObservers(self.snapshot)
+            self.didChange()
+        }
+    }
+
+    public var numberOfItems: Int {
+
+        return self.snapshot.numberOfItems
+    }
+
+    public var numberOfSections: Int {
+
+        return self.snapshot.numberOfSections
+    }
+
+    public var sectionIdentifiers: [SectionID] {
+
+        return self.snapshot.sectionIdentifiers
+    }
+
     public var items: [LiveObject<O>] {
 
         let context = self.context
@@ -141,6 +164,26 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
         return self.snapshot.indexOfSection(identifier)
     }
+    
+    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveList<O>, ListSnapshot<O>) -> Void) {
+        
+        self.observers.setObject(
+            Internals.Closure(callback),
+            forKey: observer
+        )
+        
+        callback(self, self.snapshot)
+    }
+    
+    public func removeObserver<T: AnyObject>(_ observer: T) {
+        
+        self.observers.removeObject(forKey: observer)
+    }
+
+    deinit {
+
+        self.observers.removeAllObjects()
+    }
 
 
     // MARK: Equatable
@@ -222,12 +265,14 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
     private var fetchedResultsController: Internals.CoreStoreFetchedResultsController
     private var fetchedResultsControllerDelegate: Internals.FetchedDiffableDataSourceSnapshotDelegate
+    private let sectionIndexTransformer: (_ sectionName: KeyPathString?) -> String?
     private var applyFetchClauses: (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void
     private var observerForWillChangePersistentStore: Internals.NotificationObserver!
     private var observerForDidChangePersistentStore: Internals.NotificationObserver!
 
     private let from: From<ObjectType>
     private let sectionBy: SectionBy<ObjectType>?
+    private let observers: NSMapTable<AnyObject, Internals.Closure<(LiveList<O>, ListSnapshot<O>), Void>> = .weakToStrongObjects()
 
     private lazy var context: NSManagedObjectContext = self.fetchedResultsController.managedObjectContext
 
@@ -279,20 +324,31 @@ public final class LiveList<O: DynamicObject>: Hashable {
             self.rawObjectWillChange = nil
         }
 
+        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
 
-//        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
-//
-//            self.sectionIndexTransformer = sectionIndexTransformer
-//        }
-//        else {
-//
-//            self.sectionIndexTransformer = { $0 }
-//        }
+            self.sectionIndexTransformer = sectionIndexTransformer
+        }
+        else {
+
+            self.sectionIndexTransformer = { $0 }
+        }
         self.applyFetchClauses = applyFetchClauses
         self.fetchedResultsControllerDelegate.handler = self
 
         try! self.fetchedResultsController.performFetchFromSpecifiedStores()
     }
+
+    private func notifyObservers(_ snapshot: ListSnapshot<O>) {
+
+        guard let enumerator = self.observers.objectEnumerator() else {
+
+            return
+        }
+        for closure in enumerator {
+
+            (closure as! Internals.Closure<(LiveList<O>, ListSnapshot<O>), Void>).invoke(with: (self, snapshot))
+        }
+    }
 }
 
 
@@ -301,14 +357,28 @@ public final class LiveList<O: DynamicObject>: Hashable {
 extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 
     // MARK: FetchedDiffableDataSourceSnapshotHandler
+    
+//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+//    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>) {
+//
+//        self.snapshot = .init(
+//            diffableSnapshot: snapshot,
+//            context: controller.managedObjectContext
+//        )
+//    }
 
-    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: DiffableDataSourceSnapshotProtocol) {
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot) {
 
         self.snapshot = .init(
             diffableSnapshot: snapshot,
             context: controller.managedObjectContext
         )
     }
+    
+    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String? {
+    
+        return self.sectionIndexTransformer(sectionName)
+    }
 }
 
 

From 6b64eb7650b68eea9792faa908bc30fb74b13c2a Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 14 Oct 2019 21:36:03 +0900
Subject: [PATCH 14/58] WIP: ObjectRepresentable utilities

---
 .../ListObserverDemoViewController.swift      | 11 +--
 .../ObjectObserverDemoViewController.swift    | 25 ++----
 Sources/AsynchronousDataTransaction.swift     | 48 ++++------
 Sources/BaseDataTransaction.swift             | 41 ++++-----
 Sources/CoreStore+Observing.swift             |  6 +-
 Sources/DataStack+Observing.swift             |  6 +-
 Sources/DynamicObject.swift                   | 38 ++++----
 ...edDiffableDataSourceSnapshotDelegate.swift | 22 ++++-
 ...Internals.SharedNotificationObserver.swift |  5 ++
 Sources/ListSnapshot.swift                    |  8 +-
 Sources/LiveList.swift                        | 30 +++----
 Sources/LiveObject.swift                      | 89 ++++++++++++++++---
 .../NSManagedObjectContext+CoreStore.swift    |  8 +-
 Sources/ObjectMonitor.swift                   | 48 +++++++---
 Sources/ObjectRepresentation.swift            | 74 ++++++++++++++-
 Sources/SynchronousDataTransaction.swift      | 48 ++++------
 Sources/UnsafeDataTransaction+Observing.swift |  6 +-
 17 files changed, 315 insertions(+), 198 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index cb08957..2a5e1b6 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -136,14 +136,15 @@ class ListObserverDemoViewController: UITableViewController {
                 return cell
             }
         )
-        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList, snapshot) in
+        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList) in
             
             guard let self = self else {
                 
                 return
             }
-            self.dataSource?.apply(snapshot, animatingDifferences: true)
+            self.dataSource?.apply(liveList.snapshot, animatingDifferences: true)
         }
+        self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
     }
     
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -152,8 +153,8 @@ class ListObserverDemoViewController: UITableViewController {
         
         switch (segue.identifier, segue.destination, sender) {
             
-        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as Palette):
-            destinationViewController.palette = palette
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as LiveObject<Palette>):
+            destinationViewController.setPalette(palette)
             
         default:
             break
@@ -169,7 +170,7 @@ class ListObserverDemoViewController: UITableViewController {
         
         self.performSegue(
             withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath: indexPath]?.object
+            sender: ColorsDemo.palettes[indexPath: indexPath]
         )
     }
     
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
index c7c006c..6f0d74b 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
@@ -14,30 +14,23 @@ import CoreStore
 
 class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
-    var palette: Palette? {
+    func setPalette<O: ObjectRepresentation>(_ newValue: O?) where O.ObjectType == Palette {
         
-        get {
+        guard self.monitor?.cs_id() != newValue?.cs_id() else {
             
-            return self.monitor?.object
+            return
         }
-        set {
+        if let newValue = newValue {
             
-            guard self.monitor?.object != newValue else {
-                
-                return
-            }
+            self.monitor = ColorsDemo.stack.monitorObject(newValue)
+        }
+        else {
             
-            if let palette = newValue {
-                
-                self.monitor = ColorsDemo.stack.monitorObject(palette)
-            }
-            else {
-                
-                self.monitor = nil
-            }
+            self.monitor = nil
         }
     }
     
+    
     // MARK: NSObject
     
     deinit {
diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift
index fd89666..3c926fb 100644
--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -108,51 +108,35 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
         
         return super.edit(into, objectID)
     }
-    
+
     /**
-     Deletes a specified `NSManagedObject` or `CoreStoreObject`.
-     
-     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be deleted
+     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
+
+     - 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<D: DynamicObject>(_ object: D?) {
-        
-        Internals.assert(
-            !self.isCommitted,
-            "Attempted to delete an entity of type \(Internals.typeName(object)) from an already committed \(Internals.typeName(self))."
-        )
-        
-        super.delete(object)
-    }
-    
-    /**
-     Deletes the specified `DynamicObject`s.
-     
-     - parameter object1: the `DynamicObject` to be deleted
-     - parameter object2: another `DynamicObject` to be deleted
-     - parameter objects: other `DynamicObject`s to be deleted
-     */
-    public override func delete<D: DynamicObject>(_ object1: D?, _ object2: D?, _ objects: D?...) {
-        
+    public override func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+
         Internals.assert(
             !self.isCommitted,
             "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
         )
-        
-        super.delete(([object1, object2] + objects).compactMap { $0 })
+
+        super.delete(([object] + objects).compactMap { $0 })
     }
-    
+
     /**
-     Deletes the specified `DynamicObject`s.
-     
-     - parameter objects: the `DynamicObject`s to be deleted
+    Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by an `ObjectRepresenation`.
+
+    - 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: DynamicObject {
-        
+    public override func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
+
         Internals.assert(
             !self.isCommitted,
             "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
         )
-        
+
         super.delete(objects)
     }
     
diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift
index 501617a..9353b8c 100644
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -156,47 +156,36 @@ public /*abstract*/ class BaseDataTransaction {
     }
     
     /**
-     Deletes a specified `NSManagedObject` or `CoreStoreObject`.
+     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
      
-     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be deleted
+     - 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<D: DynamicObject>(_ object: D?) {
+    public func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to delete an entity outside its designated queue."
         )
-        let context = self.context
-        object
-            .flatMap(context.fetchExisting)
-            .flatMap({ context.delete($0.cs_toRaw()) })
+        self.delete(([object] + objects).compactMap { $0 })
     }
     
     /**
-     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s.
+     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by an `ObjectRepresenation`.
      
-     - parameter object1: the `NSManagedObject` or `CoreStoreObject` to be deleted
-     - parameter object2: another `NSManagedObject` or `CoreStoreObject` to be deleted
-     - parameter objects: other `NSManagedObject`s or `CoreStoreObject`s to be deleted
+     - parameter objects: the `ObjectRepresenation`s representing `NSManagedObject`s or `CoreStoreObject`s to be deleted
      */
-    public func delete<D: DynamicObject>(_ object1: D?, _ object2: D?, _ objects: D?...) {
-        
-        self.delete(([object1, object2] + objects).compactMap { $0 })
-    }
-    
-    /**
-     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s.
-     
-     - parameter objects: the `NSManagedObject`s or `CoreStoreObject`s to be deleted
-     */
-    public func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: DynamicObject {
+    public func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
             "Attempted to delete entities outside their designated queue."
         )
         let context = self.context
-        objects.forEach { context.fetchExisting($0).flatMap({ context.delete($0.cs_toRaw()) }) }
+        objects.forEach {
+            
+            $0.cs_rawObject(in: context).map({ context.delete($0) })
+        }
     }
     
     /**
@@ -217,10 +206,10 @@ public /*abstract*/ class BaseDataTransaction {
     /**
      Returns `true` if the object has any property values changed. This method should not be called after the `commit()` method was called.
 
-     - parameter entity: the `DynamicObject` instance
+     - parameter object: the `DynamicObject` instance
      - returns: `true` if the object has any property values changed.
      */
-    public func objectHasPersistentChangedValues<D: DynamicObject>(_ entity: D) -> Bool {
+    public func objectHasPersistentChangedValues<D: DynamicObject>(_ object: D) -> Bool {
 
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -230,7 +219,7 @@ public /*abstract*/ class BaseDataTransaction {
             !self.isCommitted,
             "Attempted to access inserted objects from an already committed \(Internals.typeName(self))."
         )
-        return entity.cs_toRaw().hasPersistentChangedValues
+        return object.cs_toRaw().hasPersistentChangedValues
     }
     
     /**
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index 9b44ead..79f9188 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -34,12 +34,12 @@ import CoreData
 extension CoreStore {
     
     /**
-     Using the `defaultStack`, creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Using the `defaultStack`, creates an `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `DynamicObject` to observe changes from
+     - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public static func monitorObject<D>(_ object: D) -> ObjectMonitor<D> {
+    public static func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
         
         return Shared.defaultStack.monitorObject(object)
     }
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index b298285..852b135 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -33,12 +33,12 @@ import CoreData
 extension DataStack {
     
     /**
-     Creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates an `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `DynamicObject` to observe changes from
+     - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public func monitorObject<D>(_ object: D) -> ObjectMonitor<D> {
+    public func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
         
         Internals.assert(
             Thread.isMainThread,
diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift
index b0eebc4..c4231f6 100644
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -33,22 +33,21 @@ import CoreData
  All CoreStore's utilities are designed around `DynamicObject` instances. `NSManagedObject` and `CoreStoreObject` instances all conform to `DynamicObject`.
  */
 public protocol DynamicObject: AnyObject {
-
     /**
      The object ID for this instance
      */
     typealias ObjectID = NSManagedObjectID
-
+    
     /**
      Used internally by CoreStore. Do not call directly.
      */
     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]
-
+    
     /**
      Used internally by CoreStore. Do not call directly.
      */
@@ -62,22 +61,17 @@ public protocol DynamicObject: AnyObject {
     /**
      Used internally by CoreStore. Do not call directly.
      */
-    func cs_id() -> ObjectID
+    func cs_toRaw() -> NSManagedObject
     
     /**
      Used internally by CoreStore. Do not call directly.
      */
-    func cs_toRaw() -> NSManagedObject
+    func cs_id() -> ObjectID
 }
 
 extension DynamicObject {
-
-    // MARK: Internal
     
-//    internal static func keyPathBuilder() -> DynamicObjectMeta<Never, Self> {
-//
-//        return .init(keyPathString: "SELF")
-//    }
+    // MARK: Internal
     
     internal func runtimeType() -> Self.Type {
         
@@ -120,15 +114,15 @@ extension NSManagedObject: DynamicObject {
         return object.isKind(of: self)
     }
     
-    public func cs_id() -> ObjectID {
-        
-        return self.objectID
-    }
-    
     public func cs_toRaw() -> NSManagedObject {
         
         return self
     }
+    
+    public func cs_id() -> ObjectID {
+        
+        return self.objectID
+    }
 }
 
 
@@ -210,13 +204,13 @@ extension CoreStoreObject {
         return (self as AnyClass).isSubclass(of: type as AnyClass)
     }
     
-    public func cs_id() -> ObjectID {
-        
-        return self.rawObject!.objectID
-    }
-    
     public func cs_toRaw() -> NSManagedObject {
         
         return self.rawObject!
     }
+    
+    public func cs_id() -> ObjectID {
+        
+        return self.rawObject!.objectID
+    }
 }
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 30725ca..7098e2d 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -116,12 +116,16 @@ extension Internals {
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
 
+            var snapshot = Internals.DiffableDataSourceSnapshot(
+                sections: controller.sections ?? []
+            )
+            snapshot.reloadItems(self.reloadedIDs)
+            
             self.handler?.controller(
                 controller,
-                didChangeContentWith: Internals.DiffableDataSourceSnapshot(
-                    sections: controller.sections ?? []
-                )
+                didChangeContentWith: snapshot
             )
+            self.reloadedIDs.removeAll()
         }
 
         @objc
@@ -132,5 +136,17 @@ extension Internals {
                 sectionIndexTitleForSectionName: sectionName
             )
         }
+        
+        @objc
+        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
+            
+            let object = anObject as! NSManagedObject
+            self.reloadedIDs.append(object.objectID)
+        }
+        
+        
+        // MARK: Private
+        
+        private var reloadedIDs: [NSManagedObjectID] = []
     }
 }
diff --git a/Sources/Internals.SharedNotificationObserver.swift b/Sources/Internals.SharedNotificationObserver.swift
index 5551d1a..7c4d177 100644
--- a/Sources/Internals.SharedNotificationObserver.swift
+++ b/Sources/Internals.SharedNotificationObserver.swift
@@ -63,6 +63,11 @@ extension Internals {
 
             self.observers.setObject(Closure<T, Void>(closure), forKey: observer)
         }
+        
+        internal func removeObserver<U: AnyObject>(_ observer: U) {
+
+            self.observers.removeObject(forKey: observer)
+        }
 
 
         // MARK: Private
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 539dad2..5f84726 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -68,7 +68,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         return indices.map { position in
 
             let itemID = itemIDs[position]
-            return LiveObject<O>(id: itemID, context: context)
+            return LiveObject<O>(objectID: itemID, context: context)
         }
     }
 
@@ -78,7 +78,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
         return itemIDs.map {
 
-            return LiveObject<O>(id: $0, context: context)
+            return LiveObject<O>(objectID: $0, context: context)
         }
     }
 
@@ -89,7 +89,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         return itemIndices.map { position in
 
             let itemID = itemIDs[position]
-            return LiveObject<O>(id: itemID, context: context)
+            return LiveObject<O>(objectID: itemID, context: context)
         }
     }
 
@@ -241,7 +241,7 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         
         let context = self.context!
         let itemID = self.diffableSnapshot.itemIdentifiers[position]
-        return LiveObject<O>(id: itemID, context: context)
+        return LiveObject<O>(objectID: itemID, context: context)
     }
     
     
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 992e61b..f1537b2 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -50,7 +50,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         let context = self.context
         return self.snapshot
             .itemIdentifiers(inSection: sectionID)
-            .map({ context.liveObject(id: $0) })
+            .map({ context.liveObject(objectID: $0) })
     }
 
     public subscript(itemID itemID: ItemID) -> LiveObject<O>? {
@@ -59,7 +59,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
             return nil
         }
-        return self.context.liveObject(id: validID)
+        return self.context.liveObject(objectID: validID)
     }
 
     public subscript(indexPath indexPath: IndexPath) -> LiveObject<O>? {
@@ -77,7 +77,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
             return nil
         }
         let itemID = itemIdentifiers[indexPath.item]
-        return self.context.liveObject(id: itemID)
+        return self.context.liveObject(objectID: itemID)
     }
 
     public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
@@ -87,7 +87,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return itemIndices.map { position in
 
             let itemID = itemIDs[position]
-            return context.liveObject(id: itemID)
+            return context.liveObject(objectID: itemID)
         }
     }
 
@@ -99,7 +99,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         }
         didSet {
             
-            self.notifyObservers(self.snapshot)
+            self.notifyObservers()
             self.didChange()
         }
     }
@@ -123,7 +123,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
         let context = self.context
         return self.snapshot.itemIdentifiers
-            .map({ context.liveObject(id: $0) })
+            .map({ context.liveObject(objectID: $0) })
     }
 
     public func numberOfItems(inSection identifier: SectionID) -> Int {
@@ -136,7 +136,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         let context = self.context
         return self.snapshot
             .itemIdentifiers(inSection: identifier)
-            .map({ context.liveObject(id: $0) })
+            .map({ context.liveObject(objectID: $0) })
     }
 
     public func items(inSection identifier: SectionID, atIndices indices: IndexSet) -> [LiveObject<O>] {
@@ -146,18 +146,18 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return indices.map { position in
 
             let itemID = itemIDs[position]
-            return context.liveObject(id: itemID)
+            return context.liveObject(objectID: itemID)
         }
     }
 
     public func section(containingItem item: LiveObject<O>) -> SectionID? {
 
-        return self.snapshot.sectionIdentifier(containingItem: item.id)
+        return self.snapshot.sectionIdentifier(containingItem: item.cs_id())
     }
 
     public func indexOfItem(_ item: LiveObject<O>) -> Int? {
 
-        return self.snapshot.indexOfItem(item.id)
+        return self.snapshot.indexOfItem(item.cs_id())
     }
 
     public func indexOfSection(_ identifier: SectionID) -> Int? {
@@ -165,14 +165,12 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return self.snapshot.indexOfSection(identifier)
     }
     
-    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveList<O>, ListSnapshot<O>) -> Void) {
+    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveList<O>) -> Void) {
         
         self.observers.setObject(
             Internals.Closure(callback),
             forKey: observer
         )
-        
-        callback(self, self.snapshot)
     }
     
     public func removeObserver<T: AnyObject>(_ observer: T) {
@@ -272,7 +270,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
     private let from: From<ObjectType>
     private let sectionBy: SectionBy<ObjectType>?
-    private let observers: NSMapTable<AnyObject, Internals.Closure<(LiveList<O>, ListSnapshot<O>), Void>> = .weakToStrongObjects()
+    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<LiveList<O>, Void>> = .weakToStrongObjects()
 
     private lazy var context: NSManagedObjectContext = self.fetchedResultsController.managedObjectContext
 
@@ -338,7 +336,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         try! self.fetchedResultsController.performFetchFromSpecifiedStores()
     }
 
-    private func notifyObservers(_ snapshot: ListSnapshot<O>) {
+    private func notifyObservers() {
 
         guard let enumerator = self.observers.objectEnumerator() else {
 
@@ -346,7 +344,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         }
         for closure in enumerator {
 
-            (closure as! Internals.Closure<(LiveList<O>, ListSnapshot<O>), Void>).invoke(with: (self, snapshot))
+            (closure as! Internals.Closure<LiveList<O>, Void>).invoke(with: self)
         }
     }
 }
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index 545c8bc..a21cb8b 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -39,7 +39,7 @@ import SwiftUI
 // MARK: - LiveObject
 
 @dynamicMemberLookup
-public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
+public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable {
 
     // MARK: Public
 
@@ -51,19 +51,60 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
         return self.lazySnapshot
     }
 
-    public private(set) lazy var object: O = self.context.fetchExisting(self.id)!
+    public private(set) lazy var object: O = self.context.fetchExisting(self.objectID)!
+    
+    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveObject<O>) -> Void) {
+        
+        self.observers.setObject(
+            Internals.Closure(callback),
+            forKey: observer
+        )
+    }
+    
+    public func removeObserver<T: AnyObject>(_ observer: T) {
+        
+        self.observers.removeObject(forKey: observer)
+    }
 
+    deinit {
 
-    // MARK: Identifiable
+        self.observers.removeAllObjects()
+    }
+    
+    
+    // MARK: ObjectRepresentation
 
-    public let id: O.ObjectID
+    public typealias ObjectType = O
+    
+    public static func cs_fromRaw(object: NSManagedObject) -> Self {
+        
+        return self.init(
+            objectID: object.objectID,
+            context: object.managedObjectContext!
+        )
+    }
+    
+    public func cs_id() -> O.ObjectID {
+        
+        return self.objectID
+    }
+    
+    public func cs_object() -> O? {
+        
+        return self.context.fetchExisting(self.objectID)
+    }
+    
+    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
+        
+        return self.object.cs_toRaw()
+    }
 
 
     // MARK: Equatable
 
     public static func == (_ lhs: LiveObject, _ rhs: LiveObject) -> Bool {
 
-        return lhs.id == rhs.id
+        return lhs.objectID == rhs.objectID
             && lhs.context == rhs.context
     }
 
@@ -72,23 +113,25 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
     public func hash(into hasher: inout Hasher) {
 
-        hasher.combine(self.id)
+        hasher.combine(self.objectID)
         hasher.combine(self.context)
     }
 
 
     // MARK: LiveResult
 
-    public typealias ObjectType = O
-
     public typealias SnapshotType = ObjectSnapshot<O>
 
 
     // MARK: Internal
 
-    internal convenience init(id: ID, context: NSManagedObjectContext) {
+    internal convenience init(objectID: O.ObjectID, context: NSManagedObjectContext) {
 
-        self.init(id: id, context: context, initializer: ObjectSnapshot<O>.init(id:context:))
+        self.init(
+            objectID: objectID,
+            context: context,
+            initializer: ObjectSnapshot<O>.init(id:context:)
+        )
     }
 
 
@@ -96,9 +139,9 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
     fileprivate let rawObjectWillChange: Any?
 
-    fileprivate init(id: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>) {
+    fileprivate init(objectID: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>) {
 
-        self.id = id
+        self.objectID = objectID
         self.context = context
         if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 
@@ -114,7 +157,7 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
             self.rawObjectWillChange = nil
         }
-        self.$lazySnapshot.initialize({ initializer(id, context) })
+        self.$lazySnapshot.initialize({ initializer(objectID, context) })
         
         context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (objectIDs) in
 
@@ -122,18 +165,36 @@ public final class LiveObject<O: DynamicObject>: Identifiable, Hashable {
 
                 return
             }
-            self.$lazySnapshot.reset({ initializer(id, context) })
             self.willChange()
+            self.$lazySnapshot.reset({ initializer(objectID, context) })
+            self.notifyObservers()
+            self.didChange()
         }
     }
 
 
     // MARK: Private
     
+    private let objectID: O.ObjectID
     private let context: NSManagedObjectContext
 
     @Internals.LazyNonmutating(uninitialized: ())
     private var lazySnapshot: ObjectSnapshot<O>
+    
+    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<LiveObject<O>, Void>> = .weakToStrongObjects()
+
+    private func notifyObservers() {
+
+        guard let enumerator = self.observers.objectEnumerator() else {
+
+            return
+        }
+        for closure in enumerator {
+
+            (closure as! Internals.Closure<LiveObject
+                <O>, Void>).invoke(with: self)
+        }
+    }
 }
 
 
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 10524c4..28a54e9 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -87,7 +87,7 @@ extension NSManagedObjectContext {
     }
 
     @nonobjc
-    internal func liveObject<D: DynamicObject>(id: NSManagedObjectID) -> LiveObject<D> {
+    internal func liveObject<D: DynamicObject>(objectID: NSManagedObjectID) -> LiveObject<D> {
 
         let cache: NSMapTable<NSManagedObjectID, LiveObject<D>> = self.userInfo(for: .liveObjectsCache(D.self)) {
 
@@ -95,12 +95,12 @@ extension NSManagedObjectContext {
         }
         return Internals.with {
 
-            if let liveObject = cache.object(forKey: id) {
+            if let liveObject = cache.object(forKey: objectID) {
 
                 return liveObject
             }
-            let liveObject = LiveObject<D>(id: id, context: self)
-            cache.setObject(liveObject, forKey: id)
+            let liveObject = LiveObject<D>(objectID: objectID, context: self)
+            cache.setObject(liveObject, forKey: objectID)
             return liveObject
         }
     }
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index ffa36c4..584b8e9 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -40,12 +40,7 @@ import CoreData
  Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
  */
 @available(macOS 10.12, *)
-public final class ObjectMonitor<D: DynamicObject>: Equatable {
-    
-    /**
-     The type for the object contained by the `ObjectMonitor`
-     */
-    public typealias ObjectType = D
+public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equatable {
     
     /**
      Returns the `DynamicObject` instance being observed, or `nil` if the object was already deleted.
@@ -125,6 +120,34 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
     public let userInfo = UserInfo()
     
     
+    // MARK: ObjectRepresentation
+    
+    public typealias ObjectType = D
+    
+    public static func cs_fromRaw(object: NSManagedObject) -> Self {
+        
+        return self.init(
+            context: object.managedObjectContext!,
+            objectID: object.objectID
+        )
+    }
+    
+    public func cs_id() -> ObjectType.ObjectID {
+        
+        return self.objectID
+    }
+    
+    public func cs_object() -> D? {
+        
+        return self.object
+    }
+    
+    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
+     
+        return context.fetchExisting(self.objectID)
+    }
+    
+    
     // MARK: Equatable
     
     public static func == (lhs: ObjectMonitor<ObjectType>, rhs: ObjectMonitor<ObjectType>) -> Bool {
@@ -158,14 +181,14 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
     
     // MARK: Internal
     
-    internal convenience init(dataStack: DataStack, object: ObjectType) {
+    internal convenience init<O: ObjectRepresentation>(dataStack: DataStack, object: O) where O.ObjectType == ObjectType {
         
-        self.init(context: dataStack.mainContext, object: object)
+        self.init(context: dataStack.mainContext, objectID: object.cs_id())
     }
     
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, object: ObjectType) {
+    internal convenience init<O: ObjectRepresentation>(unsafeTransaction: UnsafeDataTransaction, object: O) where O.ObjectType == ObjectType {
         
-        self.init(context: unsafeTransaction.context, object: object)
+        self.init(context: unsafeTransaction.context, objectID: object.cs_id())
     }
     
     internal func registerObserver<U: AnyObject>(_ observer: U, willChangeObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType, _ changedPersistentKeys: Set<String>) -> Void) {
@@ -250,6 +273,7 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
     
     // MARK: Private
     
+    private let objectID: ObjectType.ObjectID
     private let fetchedResultsController: Internals.CoreStoreFetchedResultsController
     private let fetchedResultsControllerDelegate: Internals.FetchedResultsControllerDelegate
     private var lastCommittedAttributes = [String: NSObject]()
@@ -258,9 +282,8 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
     private var didDeleteObjectKey: Void?
     private var didUpdateObjectKey: Void?
     
-    private init(context: NSManagedObjectContext, object: ObjectType) {
+    private init(context: NSManagedObjectContext, objectID: ObjectType.ObjectID) {
         
-        let objectID = object.cs_id()
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         fetchRequest.entity = objectID.entity
         fetchRequest.fetchLimit = 0
@@ -278,6 +301,7 @@ public final class ObjectMonitor<D: DynamicObject>: Equatable {
         
         let fetchedResultsControllerDelegate = Internals.FetchedResultsControllerDelegate()
         
+        self.objectID = objectID
         self.fetchedResultsController = fetchedResultsController
         self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
         
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index d68b8e2..6fd7eb5 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -2,8 +2,76 @@
 //  ObjectRepresentation.swift
 //  CoreStore
 //
-//  Created by John Estropia on 2019/10/11.
-//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
 //
 
-import Foundation
+import CoreData
+
+
+// MARK - ObjectRepresentation
+
+/**
+ An object that acts as interfaces for `CoreStoreObject`s or `NSManagedObject`s
+ */
+public protocol ObjectRepresentation {
+    
+    /**
+     The object type represented by this protocol
+     */
+    associatedtype ObjectType: DynamicObject
+    
+    /**
+     Used internally by CoreStore. Do not call directly.
+     */
+    static func cs_fromRaw(object: NSManagedObject) -> Self
+    
+    /**
+     Used internally by CoreStore. Do not call directly.
+     */
+    func cs_id() -> ObjectType.ObjectID
+    
+    /**
+     Used internally by CoreStore. Do not call directly.
+     */
+    func cs_object() -> ObjectType?
+    
+    /**
+     Used internally by CoreStore. Do not call directly.
+     */
+    func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject?
+}
+
+extension NSManagedObject: ObjectRepresentation {}
+
+extension CoreStoreObject: ObjectRepresentation {}
+
+extension DynamicObject where Self: ObjectRepresentation {
+    
+    public func cs_object() -> Self? {
+        
+        return self
+    }
+    
+    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
+        
+        return context.fetchExisting(self.cs_id())
+    }
+}
diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift
index c8970de..f456229 100644
--- a/Sources/SynchronousDataTransaction.swift
+++ b/Sources/SynchronousDataTransaction.swift
@@ -97,51 +97,35 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
         
         return super.edit(into, objectID)
     }
-    
+
     /**
-     Deletes a specified `NSManagedObject` or `CoreStoreObject`.
-     
-     - parameter object: the `NSManagedObject` or `CoreStoreObject` type to be deleted
+     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
+
+     - 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<D: DynamicObject>(_ object: D?) {
-        
-        Internals.assert(
-            !self.isCommitted,
-            "Attempted to delete an entity of type \(Internals.typeName(object)) from an already committed \(Internals.typeName(self))."
-        )
-        
-        super.delete(object)
-    }
-    
-    /**
-     Deletes the specified `DynamicObject`s.
-     
-     - parameter object1: the `DynamicObject` to be deleted
-     - parameter object2: another `DynamicObject` to be deleted
-     - parameter objects: other `DynamicObject`s to be deleted
-     */
-    public override func delete<D: DynamicObject>(_ object1: D?, _ object2: D?, _ objects: D?...) {
-        
+    public override func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+
         Internals.assert(
             !self.isCommitted,
             "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
         )
-        
-        super.delete(([object1, object2] + objects).compactMap { $0 })
+
+        super.delete(([object] + objects).compactMap { $0 })
     }
-    
+
     /**
-     Deletes the specified `DynamicObject`s.
-     
-     - parameter objects: the `DynamicObject`s to be deleted
+    Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by an `ObjectRepresenation`.
+
+    - 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: DynamicObject {
-        
+    public override func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
+
         Internals.assert(
             !self.isCommitted,
             "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
         )
-        
+
         super.delete(objects)
     }
     
diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift
index e51af42..7cedb7f 100644
--- a/Sources/UnsafeDataTransaction+Observing.swift
+++ b/Sources/UnsafeDataTransaction+Observing.swift
@@ -33,12 +33,12 @@ import CoreData
 extension UnsafeDataTransaction {
     
     /**
-     Creates a `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates a `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `DynamicObject` to observe changes from
+     - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public func monitorObject<D>(_ object: D) -> ObjectMonitor<D> {
+    public func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
         
         return ObjectMonitor(
             unsafeTransaction: self,

From 4619fbbec3149570d3c70362be5aeeb892b90311 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Wed, 16 Oct 2019 08:22:03 +0900
Subject: [PATCH 15/58] WIP: ObjectRepresentable

---
 Sources/LiveObject.swift           |  54 +++++++++++-----
 Sources/ObjectMonitor.swift        | 100 ++++++++++++++++++-----------
 Sources/ObjectRepresentation.swift |  55 ++++++++++++----
 Sources/ObjectSnapshot.swift       |  52 +++++++++++++--
 4 files changed, 190 insertions(+), 71 deletions(-)

diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index a21cb8b..80d2cec 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -50,8 +50,6 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
         return self.lazySnapshot
     }
-
-    public private(set) lazy var object: O = self.context.fetchExisting(self.objectID)!
     
     public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveObject<O>) -> Void) {
         
@@ -76,27 +74,49 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     public typealias ObjectType = O
     
-    public static func cs_fromRaw(object: NSManagedObject) -> Self {
+    public func objectID() -> O.ObjectID {
         
-        return self.init(
-            objectID: object.objectID,
-            context: object.managedObjectContext!
-        )
+        return self.id
     }
     
-    public func cs_id() -> O.ObjectID {
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
         
-        return self.objectID
+        let context = dataStack.unsafeContext()
+        if self.context == context {
+            
+            return self
+        }
+        return Self.init(objectID: self.id, context: context)
     }
     
-    public func cs_object() -> O? {
+    public func asEditable(in transaction: BaseDataTransaction) -> O? {
         
-        return self.context.fetchExisting(self.objectID)
+        return self.context.fetchExisting(self.id)
     }
     
-    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
+    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
         
-        return self.object.cs_toRaw()
+        let context = dataStack.unsafeContext()
+        if self.context == context {
+            
+            return self.lazySnapshot
+        }
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
+        
+        let context = transaction.unsafeContext()
+        if self.context == context {
+            
+            return self.lazySnapshot
+        }
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
+        
+        return .init(objectID: self.id, context: dataStack.unsafeContext())
     }
 
 
@@ -104,7 +124,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     public static func == (_ lhs: LiveObject, _ rhs: LiveObject) -> Bool {
 
-        return lhs.objectID == rhs.objectID
+        return lhs.id == rhs.id
             && lhs.context == rhs.context
     }
 
@@ -113,7 +133,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     public func hash(into hasher: inout Hasher) {
 
-        hasher.combine(self.objectID)
+        hasher.combine(self.id)
         hasher.combine(self.context)
     }
 
@@ -141,7 +161,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     fileprivate init(objectID: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>) {
 
-        self.objectID = objectID
+        self.id = objectID
         self.context = context
         if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 
@@ -175,7 +195,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     // MARK: Private
     
-    private let objectID: O.ObjectID
+    private let id: O.ObjectID
     private let context: NSManagedObjectContext
 
     @Internals.LazyNonmutating(uninitialized: ())
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index 584b8e9..0641123 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -122,6 +122,44 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     
     // MARK: ObjectRepresentation
     
+    public func objectID() -> D.ObjectID {
+        
+        return self.id
+    }
+    
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<D>? {
+        
+        let context = dataStack.unsafeContext()
+        return .init(objectID: self.id, context: context)
+    }
+    
+    public func asEditable(in transaction: BaseDataTransaction) -> D? {
+        
+        return self.context.fetchExisting(self.id)
+    }
+    
+    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<D>? {
+        
+        let context = dataStack.unsafeContext()
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<D>? {
+        
+        let context = transaction.unsafeContext()
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<D>? {
+        
+        let context = dataStack.unsafeContext()
+        if self.context == context {
+            
+            return self
+        }
+        return .init(objectID: self.id, context: dataStack.unsafeContext())
+    }
+    
     public typealias ObjectType = D
     
     public static func cs_fromRaw(object: NSManagedObject) -> Self {
@@ -181,14 +219,34 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     
     // MARK: Internal
     
-    internal convenience init<O: ObjectRepresentation>(dataStack: DataStack, object: O) where O.ObjectType == ObjectType {
+    internal init(objectID: ObjectType.ObjectID, context: NSManagedObjectContext) {
         
-        self.init(context: dataStack.mainContext, objectID: object.cs_id())
-    }
-    
-    internal convenience init<O: ObjectRepresentation>(unsafeTransaction: UnsafeDataTransaction, object: O) where O.ObjectType == ObjectType {
+        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
+        fetchRequest.entity = objectID.entity
+        fetchRequest.fetchLimit = 0
+        fetchRequest.resultType = .managedObjectResultType
+        fetchRequest.sortDescriptors = []
+        fetchRequest.includesPendingChanges = false
+        fetchRequest.shouldRefreshRefetchedObjects = true
         
-        self.init(context: unsafeTransaction.context, objectID: object.cs_id())
+        let fetchedResultsController = Internals.CoreStoreFetchedResultsController(
+            context: context,
+            fetchRequest: fetchRequest,
+            from: From<ObjectType>([objectID.persistentStore?.configurationName]),
+            applyFetchClauses: Where<ObjectType>("SELF", isEqualTo: objectID).applyToFetchRequest
+        )
+        
+        let fetchedResultsControllerDelegate = Internals.FetchedResultsControllerDelegate()
+        
+        self.objectID = objectID
+        self.fetchedResultsController = fetchedResultsController
+        self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
+        
+        fetchedResultsControllerDelegate.handler = self
+        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
+        try! fetchedResultsController.performFetchFromSpecifiedStores()
+        
+        self.lastCommittedAttributes = (self.object?.cs_toRaw().committedValues(forKeys: nil) as? [String: NSObject]) ?? [:]
     }
     
     internal func registerObserver<U: AnyObject>(_ observer: U, willChangeObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType, _ changedPersistentKeys: Set<String>) -> Void) {
@@ -282,36 +340,6 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     private var didDeleteObjectKey: Void?
     private var didUpdateObjectKey: Void?
     
-    private init(context: NSManagedObjectContext, objectID: ObjectType.ObjectID) {
-        
-        let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
-        fetchRequest.entity = objectID.entity
-        fetchRequest.fetchLimit = 0
-        fetchRequest.resultType = .managedObjectResultType
-        fetchRequest.sortDescriptors = []
-        fetchRequest.includesPendingChanges = false
-        fetchRequest.shouldRefreshRefetchedObjects = true
-        
-        let fetchedResultsController = Internals.CoreStoreFetchedResultsController(
-            context: context,
-            fetchRequest: fetchRequest,
-            from: From<ObjectType>([objectID.persistentStore?.configurationName]),
-            applyFetchClauses: Where<ObjectType>("SELF", isEqualTo: objectID).applyToFetchRequest
-        )
-        
-        let fetchedResultsControllerDelegate = Internals.FetchedResultsControllerDelegate()
-        
-        self.objectID = objectID
-        self.fetchedResultsController = fetchedResultsController
-        self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
-        
-        fetchedResultsControllerDelegate.handler = self
-        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetchFromSpecifiedStores()
-        
-        self.lastCommittedAttributes = (self.object?.cs_toRaw().committedValues(forKeys: nil) as? [String: NSObject]) ?? [:]
-    }
-    
     private func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<ObjectType>) -> Void) {
         
         Internals.setAssociatedRetainedObject(
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 6fd7eb5..0f118d4 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -39,35 +39,66 @@ public protocol ObjectRepresentation {
     associatedtype ObjectType: DynamicObject
     
     /**
-     Used internally by CoreStore. Do not call directly.
+     The internal ID for the object.
      */
-    static func cs_fromRaw(object: NSManagedObject) -> Self
+    func objectID() -> ObjectType.ObjectID
     
     /**
-     Used internally by CoreStore. Do not call directly.
+     An instance that may be observed for object changes.
      */
-    func cs_id() -> ObjectType.ObjectID
+    func asLiveObject(in dataStack: DataStack) -> LiveObject<ObjectType>?
     
     /**
-     Used internally by CoreStore. Do not call directly.
+     An instance that may be mutated within a transaction.
      */
-    func cs_object() -> ObjectType?
+    func asEditable(in transaction: BaseDataTransaction) -> ObjectType?
     
     /**
-     Used internally by CoreStore. Do not call directly.
+     A thread-safe `struct` that is a full-copy of the object's properties
      */
-    func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject?
+    func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<ObjectType>?
+    
+    /**
+     A thread-safe `struct` that is a full-copy of the object's properties
+     */
+    func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<ObjectType>?
+    
+    /**
+     An instance that may be observed for property-specific changes.
+     */
+    func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<ObjectType>?
 }
 
-extension NSManagedObject: ObjectRepresentation {}
+extension LiveObject {
+    
+    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<O>? {
+        
+        return nil
+    }
+}
 
-extension CoreStoreObject: ObjectRepresentation {}
+extension ObjectMonitor {
+    
+    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<D>? {
+        
+        return nil
+    }
+}
+
+extension NSManagedObject: ObjectRepresentation {
+    
+    
+}
+
+extension CoreStoreObject: ObjectRepresentation {
+    
+}
 
 extension DynamicObject where Self: ObjectRepresentation {
     
-    public func cs_object() -> Self? {
+    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<Self>? {
         
-        return self
+        fatalError()
     }
     
     public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 11d7a66..765def5 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -37,16 +37,55 @@ import AppKit
 // MARK: - ObjectSnapshot
 
 @dynamicMemberLookup
-public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, Identifiable, Hashable {
+public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresentation, Hashable {
 
     // MARK: SnapshotResult
 
     public typealias ObjectType = O
-
-
-    // MARK: Identifiable
-
-    public let id: O.ObjectID
+    
+    
+    // MARK: ObjectRepresentation
+    
+    public func objectID() -> O.ObjectID {
+        
+        return self.id
+    }
+    
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
+        
+        let context = dataStack.unsafeContext()
+        return .init(objectID: self.id, context: context)
+    }
+    
+    public func asEditable(in transaction: BaseDataTransaction) -> O? {
+        
+        return self.context.fetchExisting(self.id)
+    }
+    
+    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
+        
+        let context = dataStack.unsafeContext()
+        if self.context == context {
+            
+            return self
+        }
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
+        
+        let context = transaction.unsafeContext()
+        if self.context == context {
+            
+            return self
+        }
+        return .init(id: self.id, context: context)
+    }
+    
+    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
+        
+        return .init(objectID: self.id, context: dataStack.unsafeContext())
+    }
 
 
     // MARK: Equatable
@@ -79,6 +118,7 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, Identifiable, Ha
 
     // MARK: Private
 
+    private let id: O.ObjectID
     private let context: NSManagedObjectContext
     private let values: NSDictionary
 }

From 64a02643540851ea6988f67d1138f5732ac82306 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Wed, 16 Oct 2019 14:01:25 +0900
Subject: [PATCH 16/58] DiffableDataSource.CollectionView implementation

---
 CoreStore.xcodeproj/project.pbxproj           |  10 +
 .../ListObserverDemoViewController.swift      |   2 +-
 .../ObjectObserverDemoViewController.swift    |   4 +-
 .../SwiftUI Demo/SwiftUIView.swift            |   2 +-
 Sources/BaseDataTransaction.swift             |   4 +-
 Sources/CoreStore+Observing.swift             |   2 +-
 Sources/DataStack+Observing.swift             |   4 +-
 .../DiffableDataSource.CollectionView.swift   | 291 ++++++++++++++++++
 Sources/LiveList.swift                        |   4 +-
 Sources/LiveObject.swift                      |  11 +-
 Sources/ObjectMonitor.swift                   |  52 +---
 Sources/ObjectRepresentation.swift            |  70 +++--
 Sources/ObjectSnapshot.swift                  |   8 +-
 Sources/UnsafeDataTransaction+Observing.swift |   9 +-
 14 files changed, 383 insertions(+), 90 deletions(-)
 create mode 100644 Sources/DiffableDataSource.CollectionView.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 35598f5..553a2d2 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -465,6 +465,10 @@
 		B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; };
 		B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
 		B56321B61BD6521C006C9394 /* Internals.WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */; };
+		B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
+		B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
+		B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
+		B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
 		B56507941D3930BC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507931D3930BC000596DA /* CoreData.framework */; };
 		B56507961D3930C1000596DA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507951D3930C1000596DA /* Foundation.framework */; };
 		B56507981D3930CC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507971D3930CC000596DA /* CoreData.framework */; };
@@ -977,6 +981,7 @@
 		B563216F1BD65082006C9394 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B56321791BD650DE006C9394 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B563217B1BD650E3006C9394 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.CollectionView.swift; sourceTree = "<group>"; };
 		B56507931D3930BC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B56507951D3930C1000596DA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		B56507971D3930CC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
@@ -1609,6 +1614,7 @@
 				B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */,
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
 				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */,
+				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -2151,6 +2157,7 @@
 				B5F335582348D75D00FD649F /* LiveResult.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
+				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
 				B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */,
 				B50E175223517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
@@ -2315,6 +2322,7 @@
 			files = (
 				82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */,
 				B5ECDBFB1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
+				B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
 				B5CA2B091F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E81C6E3A5D00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F61EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2539,6 +2547,7 @@
 			files = (
 				B5220E1E1D13080D009BC71E /* CSListMonitor.swift in Sources */,
 				B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
+				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
 				B5CA2B0B1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B56923F81EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
 				B52DD1BE1BE1F94300949AFE /* Progress+Convenience.swift in Sources */,
@@ -2763,6 +2772,7 @@
 			files = (
 				B56321A91BD65219006C9394 /* Progress+Convenience.swift in Sources */,
 				B5ECDBFC1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
+				B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
 				B5CA2B0A1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E91C6E3A5E00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F71EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 2a5e1b6..a2fc66b 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -183,7 +183,7 @@ class ListObserverDemoViewController: UITableViewController {
             ColorsDemo.stack.perform(
                 asynchronous: { (transaction) in
                     
-                    transaction.delete(palette?.object)
+                    transaction.delete(palette)
                 },
                 completion: { _ in }
             )
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
index 6f0d74b..b3ee95f 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
@@ -16,13 +16,13 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     func setPalette<O: ObjectRepresentation>(_ newValue: O?) where O.ObjectType == Palette {
         
-        guard self.monitor?.cs_id() != newValue?.cs_id() else {
+        guard self.monitor?.objectID() != newValue?.objectID() else {
             
             return
         }
         if let newValue = newValue {
             
-            self.monitor = ColorsDemo.stack.monitorObject(newValue)
+            self.monitor = newValue.asObjectMonitor(in: ColorsDemo.stack)
         }
         else {
             
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index ccad57d..e18bc3b 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -48,7 +48,7 @@ struct SwiftUIView: View {
                             )
                         }
                         .onDelete { itemIndices in
-                            let objectsToDelete = self.palettes[section: sectionID, itemIndices: itemIndices].map({ $0.object })
+                            let objectsToDelete = self.palettes[section: sectionID, itemIndices: itemIndices]
                             self.dataStack.perform(
                                 asynchronous: { transaction in
 
diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift
index 9353b8c..2d44fe4 100644
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -183,8 +183,8 @@ public /*abstract*/ class BaseDataTransaction {
         )
         let context = self.context
         objects.forEach {
-            
-            $0.cs_rawObject(in: context).map({ context.delete($0) })
+
+            $0.asEditable(in: self).map({ context.delete($0.cs_toRaw()) })
         }
     }
     
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index 79f9188..8de1b06 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -39,7 +39,7 @@ extension CoreStore {
      - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public static func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
+    public static func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
         
         return Shared.defaultStack.monitorObject(object)
     }
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index 852b135..3eb7e70 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -38,13 +38,13 @@ extension DataStack {
      - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
+    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."
         )
-        return ObjectMonitor(dataStack: self, object: object)
+        return .init(objectID: object.cs_id(), context: self.unsafeContext())
     }
     
     /**
diff --git a/Sources/DiffableDataSource.CollectionView.swift b/Sources/DiffableDataSource.CollectionView.swift
new file mode 100644
index 0000000..3d89081
--- /dev/null
+++ b/Sources/DiffableDataSource.CollectionView.swift
@@ -0,0 +1,291 @@
+//
+//  DiffableDataSource.CollectionView.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(UIKit)
+
+import UIKit
+import CoreData
+
+
+// MARK: - DiffableDataSource
+
+extension DiffableDataSource {
+
+    // MARK: - CollectionView
+
+    open class CollectionView<O: DynamicObject>: NSObject, UICollectionViewDataSource {
+
+        // MARK: Public
+
+        public typealias ObjectType = O
+
+        @nonobjc
+        public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, ObjectType) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) {
+
+            self.collectionView = collectionView
+            self.cellProvider = cellProvider
+            self.supplementaryViewProvider = supplementaryViewProvider
+            self.dataStack = dataStack
+
+            super.init()
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                self.rawDataSource = UITableViewDiffableDataSource<String, O.ObjectID>(
+//                    tableView: tableView,
+//                    cellProvider: { [weak self] (tableView, indexPath, objectID) -> UITableViewCell? in
+//
+//                        guard let self = self else {
+//
+//                            return nil
+//                        }
+//                        guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+//
+//                            return nil
+//                        }
+//                        return self.cellProvider(tableView, indexPath, object)
+//                    }
+//                )
+//            }
+//            else {
+
+                self.rawDataSource = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
+//            }
+
+            collectionView.dataSource = self
+        }
+
+        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
+
+            let diffableSnapshot = snapshot.diffableSnapshot
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                self.modernDataSource.apply(
+//                    diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
+//                    animatingDifferences: animatingDifferences,
+//                    completion: nil
+//                )
+//            }
+//            else {
+
+                self.legacyDataSource.apply(
+                    diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                    view: self.collectionView,
+                    animatingDifferences: animatingDifferences,
+                    performUpdates: { collectionView, changeset, setSections in
+
+                        collectionView.reload(
+                            using: changeset,
+                            setData: setSections
+                        )
+                    }
+                )
+//            }
+        }
+
+        public func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.itemIdentifier(for: indexPath)
+//            }
+//            else {
+
+                return self.legacyDataSource.itemIdentifier(for: indexPath)
+//            }
+        }
+
+        public func indexPath(for itemIdentifier: O.ObjectID) -> IndexPath? {
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.indexPath(for: itemIdentifier)
+//            }
+//            else {
+
+                return self.legacyDataSource.indexPath(for: itemIdentifier)
+//            }
+        }
+
+
+        // MARK: - UICollectionViewDataSource
+
+        @objc
+        public dynamic func numberOfSections(in collectionView: UICollectionView) -> Int {
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.numberOfSections(in: tableView)
+//            }
+//            else {
+
+                return self.legacyDataSource.numberOfSections()
+//            }
+        }
+
+        @objc
+        public dynamic func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.tableView(tableView, numberOfRowsInSection: section)
+//            }
+//            else {
+
+                return self.legacyDataSource.numberOfItems(inSection: section)
+//            }
+        }
+
+        @objc
+        open dynamic func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+
+//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
+//
+//                return self.modernDataSource.tableView(tableView, cellForRowAt: indexPath)
+//            }
+//            else {
+
+                guard let objectID = self.legacyDataSource.itemIdentifier(for: indexPath) else {
+
+                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
+                }
+                guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+
+                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
+                }
+                guard let cell = self.cellProvider(collectionView, indexPath, object) else {
+
+                    Internals.abort("\(Internals.typeName(UICollectionViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
+                }
+                return cell
+//            }
+        }
+
+        @objc
+        open dynamic func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+
+            guard let view = self.supplementaryViewProvider(collectionView, kind, indexPath) else {
+
+                return UICollectionReusableView()
+            }
+            return view
+        }
+
+
+        // MARK: Private
+
+        private weak var collectionView: UICollectionView?
+
+        private let dataStack: DataStack
+        private let cellProvider: (UICollectionView, IndexPath, ObjectType) -> UICollectionViewCell?
+        private let supplementaryViewProvider: (UICollectionView, String, IndexPath) -> UICollectionReusableView?
+        private var rawDataSource: Any!
+
+//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+//        private var modernDataSource: UITableViewDiffableDataSource<String, O.ObjectID> {
+//
+//            return self.rawDataSource as! UITableViewDiffableDataSource<String, O.ObjectID>
+//        }
+
+        private var legacyDataSource: Internals.DiffableDataUIDispatcher<O> {
+
+            return self.rawDataSource as! Internals.DiffableDataUIDispatcher<O>
+        }
+    }
+}
+
+
+// MARK: - UICollectionView
+
+extension UICollectionView {
+
+    // MARK: FilePrivate
+
+    @nonobjc
+    fileprivate func reload<C, O>(
+        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
+        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
+        setData: (C) -> Void
+    ) {
+
+        if case .none = window, let data = stagedChangeset.last?.data {
+
+            setData(data)
+            self.reloadData()
+            return
+        }
+        for changeset in stagedChangeset {
+
+            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
+
+                setData(data)
+                self.reloadData()
+                return
+            }
+            self.performBatchUpdates(
+                {
+                    setData(changeset.data)
+
+                    if !changeset.sectionDeleted.isEmpty {
+
+                        self.deleteSections(IndexSet(changeset.sectionDeleted))
+                    }
+                    if !changeset.sectionInserted.isEmpty {
+
+                        self.insertSections(IndexSet(changeset.sectionInserted))
+                    }
+                    if !changeset.sectionUpdated.isEmpty {
+
+                        self.reloadSections(IndexSet(changeset.sectionUpdated))
+                    }
+                    for (source, target) in changeset.sectionMoved {
+
+                        self.moveSection(source, toSection: target)
+                    }
+                    if !changeset.elementDeleted.isEmpty {
+
+                        self.deleteItems(at: changeset.elementDeleted.map { IndexPath(row: $0.element, section: $0.section) })
+                    }
+                    if !changeset.elementInserted.isEmpty {
+
+                        self.insertItems(at: changeset.elementInserted.map { IndexPath(row: $0.element, section: $0.section) })
+                    }
+                    if !changeset.elementUpdated.isEmpty {
+
+                        self.reloadItems(at: changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) })
+                    }
+                    for (source, target) in changeset.elementMoved {
+
+                        self.moveItem(at: IndexPath(row: source.element, section: source.section), to: IndexPath(row: target.element, section: target.section))
+                    }
+                },
+                completion: nil
+            )
+        }
+    }
+}
+
+
+#endif
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index f1537b2..905b052 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -152,12 +152,12 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
     public func section(containingItem item: LiveObject<O>) -> SectionID? {
 
-        return self.snapshot.sectionIdentifier(containingItem: item.cs_id())
+        return self.snapshot.sectionIdentifier(containingItem: item.objectID())
     }
 
     public func indexOfItem(_ item: LiveObject<O>) -> Int? {
 
-        return self.snapshot.indexOfItem(item.cs_id())
+        return self.snapshot.indexOfItem(item.objectID())
     }
 
     public func indexOfSection(_ identifier: SectionID) -> Int? {
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index 80d2cec..3ed1c10 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -101,7 +101,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
             
             return self.lazySnapshot
         }
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
     public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
@@ -111,7 +111,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
             
             return self.lazySnapshot
         }
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
     public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
@@ -150,7 +150,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         self.init(
             objectID: objectID,
             context: context,
-            initializer: ObjectSnapshot<O>.init(id:context:)
+            initializer: ObjectSnapshot<O>.init(objectID:context:)
         )
     }
 
@@ -192,6 +192,11 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         }
     }
 
+    fileprivate var object: O {
+
+        return self.context.fetchExisting(self.id)!
+    }
+
 
     // MARK: Private
     
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index 0641123..8dc109f 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -40,7 +40,7 @@ import CoreData
  Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
  */
 @available(macOS 10.12, *)
-public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equatable {
+public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equatable {
     
     /**
      Returns the `DynamicObject` instance being observed, or `nil` if the object was already deleted.
@@ -122,35 +122,35 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     
     // MARK: ObjectRepresentation
     
-    public func objectID() -> D.ObjectID {
+    public func objectID() -> O.ObjectID {
         
         return self.id
     }
     
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<D>? {
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
         
         let context = dataStack.unsafeContext()
         return .init(objectID: self.id, context: context)
     }
     
-    public func asEditable(in transaction: BaseDataTransaction) -> D? {
+    public func asEditable(in transaction: BaseDataTransaction) -> O? {
         
         return self.context.fetchExisting(self.id)
     }
     
-    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<D>? {
+    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
         
         let context = dataStack.unsafeContext()
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
-    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<D>? {
+    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
         
         let context = transaction.unsafeContext()
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
-    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<D>? {
+    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
         
         let context = dataStack.unsafeContext()
         if self.context == context {
@@ -160,31 +160,6 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
         return .init(objectID: self.id, context: dataStack.unsafeContext())
     }
     
-    public typealias ObjectType = D
-    
-    public static func cs_fromRaw(object: NSManagedObject) -> Self {
-        
-        return self.init(
-            context: object.managedObjectContext!,
-            objectID: object.objectID
-        )
-    }
-    
-    public func cs_id() -> ObjectType.ObjectID {
-        
-        return self.objectID
-    }
-    
-    public func cs_object() -> D? {
-        
-        return self.object
-    }
-    
-    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
-     
-        return context.fetchExisting(self.objectID)
-    }
-    
     
     // MARK: Equatable
     
@@ -238,7 +213,7 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
         
         let fetchedResultsControllerDelegate = Internals.FetchedResultsControllerDelegate()
         
-        self.objectID = objectID
+        self.id = objectID
         self.fetchedResultsController = fetchedResultsController
         self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
         
@@ -331,7 +306,7 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     
     // MARK: Private
     
-    private let objectID: ObjectType.ObjectID
+    private let id: O.ObjectID
     private let fetchedResultsController: Internals.CoreStoreFetchedResultsController
     private let fetchedResultsControllerDelegate: Internals.FetchedResultsControllerDelegate
     private var lastCommittedAttributes = [String: NSObject]()
@@ -339,6 +314,11 @@ public final class ObjectMonitor<D: DynamicObject>: ObjectRepresentation, Equata
     private var willChangeObjectKey: Void?
     private var didDeleteObjectKey: Void?
     private var didUpdateObjectKey: Void?
+
+    private var context: NSManagedObjectContext {
+
+        return self.fetchedResultsController.managedObjectContext
+    }
     
     private func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<ObjectType>) -> Void) {
         
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 0f118d4..f33899a 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -69,40 +69,50 @@ public protocol ObjectRepresentation {
     func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<ObjectType>?
 }
 
-extension LiveObject {
-    
-    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<O>? {
-        
-        return nil
-    }
-}
+extension NSManagedObject: ObjectRepresentation {}
 
-extension ObjectMonitor {
-    
-    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<D>? {
-        
-        return nil
-    }
-}
-
-extension NSManagedObject: ObjectRepresentation {
-    
-    
-}
-
-extension CoreStoreObject: ObjectRepresentation {
-    
-}
+extension CoreStoreObject: ObjectRepresentation {}
 
 extension DynamicObject where Self: ObjectRepresentation {
-    
-    public static func cs_object(in context: NSManagedObjectContext) -> LiveObject<Self>? {
-        
-        fatalError()
+
+    // MARK: ObjectRepresentation
+
+    public func objectID() -> Self.ObjectID {
+
+        return self.cs_id()
     }
-    
-    public func cs_rawObject(in context: NSManagedObjectContext) -> NSManagedObject? {
-        
+
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<Self>? {
+
+        let context = dataStack.unsafeContext()
+        return .init(objectID: self.cs_id(), context: context)
+    }
+
+    public func asEditable(in transaction: BaseDataTransaction) -> Self? {
+
+        let context = transaction.unsafeContext()
+        if self.cs_toRaw().managedObjectContext == context {
+
+            return self
+        }
         return context.fetchExisting(self.cs_id())
     }
+
+    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<Self>? {
+
+        let context = dataStack.unsafeContext()
+        return .init(objectID: self.cs_id(), context: context)
+    }
+
+    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<Self>? {
+
+        let context = transaction.unsafeContext()
+        return .init(objectID: self.cs_id(), context: context)
+    }
+
+    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<Self>? {
+
+        let context = dataStack.unsafeContext()
+        return .init(objectID: self.cs_id(), context: context)
+    }
 }
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 765def5..279bb77 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -69,7 +69,7 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
             
             return self
         }
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
     public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
@@ -79,7 +79,7 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
             
             return self
         }
-        return .init(id: self.id, context: context)
+        return .init(objectID: self.id, context: context)
     }
     
     public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
@@ -108,9 +108,9 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
 
     // MARK: Internal
 
-    internal init(id: ID, context: NSManagedObjectContext) {
+    internal init(objectID: O.ObjectID, context: NSManagedObjectContext) {
 
-        self.id = id
+        self.id = objectID
         self.context = context
         self.values = O.cs_snapshotDictionary(id: id, context: context) as NSDictionary
     }
diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift
index 7cedb7f..be8574d 100644
--- a/Sources/UnsafeDataTransaction+Observing.swift
+++ b/Sources/UnsafeDataTransaction+Observing.swift
@@ -38,12 +38,9 @@ extension UnsafeDataTransaction {
      - parameter object: the `ObjectRepresentation` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
-    public func monitorObject<O: ObjectRepresentation>(_ object: O) -> ObjectMonitor<O.ObjectType> {
-        
-        return ObjectMonitor(
-            unsafeTransaction: self,
-            object: object
-        )
+    public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
+
+        return .init(objectID: object.cs_id(), context: self.unsafeContext())
     }
     
     /**

From 2818a778a4c89f4e2ee43a142dd2d5cdd6cce70f Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Wed, 16 Oct 2019 19:20:11 +0900
Subject: [PATCH 17/58] Revert ObjectMonitor to previous implementation

---
 .../ObjectObserverDemoViewController.swift    |  4 +-
 .../Palette.swift                             | 25 ++++++-
 .../SwiftUI Demo/SwiftUIView.swift            | 32 ++++----
 .../DiffableDataSource.CollectionView.swift   |  6 +-
 Sources/DiffableDataSource.TableView.swift    |  6 +-
 Sources/LiveObject.swift                      | 20 ++---
 Sources/ObjectMonitor.swift                   | 74 +++++--------------
 Sources/ObjectRepresentation.swift            | 28 ++++---
 Sources/ObjectSnapshot.swift                  | 14 ++--
 9 files changed, 95 insertions(+), 114 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
index b3ee95f..6ab1fa2 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
@@ -16,13 +16,13 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     func setPalette<O: ObjectRepresentation>(_ newValue: O?) where O.ObjectType == Palette {
         
-        guard self.monitor?.objectID() != newValue?.objectID() else {
+        guard self.monitor?.object?.objectID() != newValue?.objectID() else {
             
             return
         }
         if let newValue = newValue {
             
-            self.monitor = newValue.asObjectMonitor(in: ColorsDemo.stack)
+            self.monitor = newValue.asReadOnly(in: ColorsDemo.stack).map(ColorsDemo.stack.monitorObject(_:))
         }
         else {
             
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift
index 73f44e0..98ddd76 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift	
@@ -73,9 +73,30 @@ extension Palette {
         
         return "H: \(self.hue.value)˚, S: \(round(self.saturation.value * 100.0))%, B: \(round(self.brightness.value * 100.0))%"
     }
-    
+}
+
+extension LiveObject where ObjectType == Palette {
+
+    var color: UIColor {
+
+        return UIColor(
+            hue: CGFloat(self.hue) / 360.0,
+            saturation: CGFloat(self.saturation),
+            brightness: CGFloat(self.brightness),
+            alpha: 1.0
+        )
+    }
+
+    var colorText: String {
+
+        return "H: \(self.hue)˚, S: \(round(self.saturation * 100.0))%, B: \(round(self.brightness * 100.0))%"
+    }
+}
+
+extension Palette {
+
     func setInitialValues(in transaction: BaseDataTransaction) {
-        
+
         self.hue .= Palette.randomHue()
         self.saturation .= Float(1.0)
         self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index e18bc3b..7b52c71 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -20,22 +20,6 @@ struct SwiftUIView: View {
     @ObservedObject
     var palettes: LiveList<Palette>
 
-    @available(iOS 13.0.0, *)
-    struct ColorCell: View {
-
-        @ObservedObject
-        var palette: LiveObject<Palette>
-
-        var body: some View {
-            HStack {
-                Color(palette.color)
-                    .cornerRadius(5)
-                    .frame(width: 30, height: 30, alignment: .leading)
-                Text(palette.colorText)
-            }
-        }
-    }
-
     var body: some View {
         NavigationView {
             List {
@@ -124,6 +108,22 @@ struct SwiftUIView: View {
     private var needsShowAlert = false
 }
 
+@available(iOS 13.0.0, *)
+struct ColorCell: View {
+
+    @ObservedObject
+    var palette: LiveObject<Palette>
+
+    var body: some View {
+        HStack {
+            Color(palette.color)
+                .cornerRadius(5)
+                .frame(width: 30, height: 30, alignment: .leading)
+            Text(palette.colorText)
+        }
+    }
+}
+
 @available(iOS 13.0.0, *)
 struct DetailView: View {
 
diff --git a/Sources/DiffableDataSource.CollectionView.swift b/Sources/DiffableDataSource.CollectionView.swift
index 3d89081..8b4fa93 100644
--- a/Sources/DiffableDataSource.CollectionView.swift
+++ b/Sources/DiffableDataSource.CollectionView.swift
@@ -42,7 +42,7 @@ extension DiffableDataSource {
         public typealias ObjectType = O
 
         @nonobjc
-        public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, ObjectType) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) {
+        public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, O) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) {
 
             self.collectionView = collectionView
             self.cellProvider = cellProvider
@@ -77,7 +77,7 @@ extension DiffableDataSource {
             collectionView.dataSource = self
         }
 
-        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
+        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
             let diffableSnapshot = snapshot.diffableSnapshot
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
@@ -199,7 +199,7 @@ extension DiffableDataSource {
         private weak var collectionView: UICollectionView?
 
         private let dataStack: DataStack
-        private let cellProvider: (UICollectionView, IndexPath, ObjectType) -> UICollectionViewCell?
+        private let cellProvider: (UICollectionView, IndexPath, O) -> UICollectionViewCell?
         private let supplementaryViewProvider: (UICollectionView, String, IndexPath) -> UICollectionReusableView?
         private var rawDataSource: Any!
 
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
index 19060f2..69976e8 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -48,7 +48,7 @@ extension DiffableDataSource {
         public typealias ObjectType = O
         
         @nonobjc
-        public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, ObjectType) -> UITableViewCell?) {
+        public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, O) -> UITableViewCell?) {
 
             self.tableView = tableView
             self.cellProvider = cellProvider
@@ -82,7 +82,7 @@ extension DiffableDataSource {
             tableView.dataSource = self
         }
 
-        public func apply(_ snapshot: ListSnapshot<ObjectType>, animatingDifferences: Bool = true) {
+        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
             let diffableSnapshot = snapshot.diffableSnapshot
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
@@ -221,7 +221,7 @@ extension DiffableDataSource {
         private weak var tableView: UITableView?
         
         private let dataStack: DataStack
-        private let cellProvider: (UITableView, IndexPath, ObjectType) -> UITableViewCell?
+        private let cellProvider: (UITableView, IndexPath, O) -> UITableViewCell?
         private var rawDataSource: Any!
         
 //        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index 3ed1c10..99034ae 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -88,10 +88,15 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         }
         return Self.init(objectID: self.id, context: context)
     }
+
+    public func asReadOnly(in dataStack: DataStack) -> O? {
+
+        return dataStack.unsafeContext().fetchExisting(self.id)
+    }
     
     public func asEditable(in transaction: BaseDataTransaction) -> O? {
         
-        return self.context.fetchExisting(self.id)
+        return transaction.unsafeContext().fetchExisting(self.id)
     }
     
     public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
@@ -113,11 +118,6 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         }
         return .init(objectID: self.id, context: context)
     }
-    
-    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
-        
-        return .init(objectID: self.id, context: dataStack.unsafeContext())
-    }
 
 
     // MARK: Equatable
@@ -354,12 +354,4 @@ extension LiveObject where O: CoreStoreObject {
 
         return self.snapshot[dynamicMember: member]
     }
-
-    /**
-     Returns the value for the property identified by a given key.
-     */
-    public subscript<T>(dynamicMember member: KeyPath<O, T>) -> T {
-
-        return self.object[keyPath: member]
-    }
 }
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index 8dc109f..9a9fa3a 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -40,17 +40,22 @@ import CoreData
  Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
  */
 @available(macOS 10.12, *)
-public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equatable {
+public final class ObjectMonitor<O: DynamicObject>: Equatable {
+
+    /**
+     The object type represented by this `ObjectMonitor`
+     */
+    public typealias ObjectType = O
     
     /**
      Returns the `DynamicObject` instance being observed, or `nil` if the object was already deleted.
      */
-    public var object: ObjectType? {
+    public var object: O? {
         
         return self.fetchedResultsController
             .fetchedObjects?
             .first
-            .flatMap({ ObjectType.cs_fromRaw(object: $0) })
+            .flatMap({ O.cs_fromRaw(object: $0) })
     }
     
     /**
@@ -72,7 +77,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
      
      - parameter observer: an `ObjectObserver` to send change notifications to
      */
-    public func addObserver<U: ObjectObserver>(_ observer: U) where U.ObjectEntityType == ObjectType {
+    public func addObserver<U: ObjectObserver>(_ observer: U) where U.ObjectEntityType == O {
         
         self.unregisterObserver(observer)
         self.registerObserver(
@@ -99,7 +104,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
      
      - parameter observer: an `ObjectObserver` to unregister notifications to
      */
-    public func removeObserver<U: ObjectObserver>(_ observer: U) where U.ObjectEntityType == ObjectType {
+    public func removeObserver<U: ObjectObserver>(_ observer: U) where U.ObjectEntityType == O {
         
         self.unregisterObserver(observer)
     }
@@ -120,50 +125,9 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
     public let userInfo = UserInfo()
     
     
-    // MARK: ObjectRepresentation
-    
-    public func objectID() -> O.ObjectID {
-        
-        return self.id
-    }
-    
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
-        
-        let context = dataStack.unsafeContext()
-        return .init(objectID: self.id, context: context)
-    }
-    
-    public func asEditable(in transaction: BaseDataTransaction) -> O? {
-        
-        return self.context.fetchExisting(self.id)
-    }
-    
-    public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
-        
-        let context = dataStack.unsafeContext()
-        return .init(objectID: self.id, context: context)
-    }
-    
-    public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
-        
-        let context = transaction.unsafeContext()
-        return .init(objectID: self.id, context: context)
-    }
-    
-    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
-        
-        let context = dataStack.unsafeContext()
-        if self.context == context {
-            
-            return self
-        }
-        return .init(objectID: self.id, context: dataStack.unsafeContext())
-    }
-    
-    
     // MARK: Equatable
     
-    public static func == (lhs: ObjectMonitor<ObjectType>, rhs: ObjectMonitor<ObjectType>) -> Bool {
+    public static func == (lhs: ObjectMonitor<O>, rhs: ObjectMonitor<O>) -> Bool {
         
         return lhs === rhs
     }
@@ -173,7 +137,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
         return lhs.fetchedResultsController === rhs.fetchedResultsController
     }
     
-    public static func ~= (lhs: ObjectMonitor<ObjectType>, rhs: ObjectMonitor<ObjectType>) -> Bool {
+    public static func ~= (lhs: ObjectMonitor<O>, rhs: ObjectMonitor<O>) -> Bool {
         
         return lhs === rhs
     }
@@ -194,7 +158,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
     
     // MARK: Internal
     
-    internal init(objectID: ObjectType.ObjectID, context: NSManagedObjectContext) {
+    internal init(objectID: O.ObjectID, context: NSManagedObjectContext) {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         fetchRequest.entity = objectID.entity
@@ -207,8 +171,8 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
         let fetchedResultsController = Internals.CoreStoreFetchedResultsController(
             context: context,
             fetchRequest: fetchRequest,
-            from: From<ObjectType>([objectID.persistentStore?.configurationName]),
-            applyFetchClauses: Where<ObjectType>("SELF", isEqualTo: objectID).applyToFetchRequest
+            from: From<O>([objectID.persistentStore?.configurationName]),
+            applyFetchClauses: Where<O>("SELF", isEqualTo: objectID).applyToFetchRequest
         )
         
         let fetchedResultsControllerDelegate = Internals.FetchedResultsControllerDelegate()
@@ -224,7 +188,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
         self.lastCommittedAttributes = (self.object?.cs_toRaw().committedValues(forKeys: nil) as? [String: NSObject]) ?? [:]
     }
     
-    internal func registerObserver<U: AnyObject>(_ observer: U, willChangeObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType, _ changedPersistentKeys: Set<String>) -> Void) {
+    internal func registerObserver<U: AnyObject>(_ observer: U, willChangeObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<O>, _ object: O) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<O>, _ object: O) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ObjectMonitor<O>, _ object: O, _ changedPersistentKeys: Set<String>) -> Void) {
         
         Internals.assert(
             Thread.isMainThread,
@@ -320,7 +284,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
         return self.fetchedResultsController.managedObjectContext
     }
     
-    private func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<ObjectType>) -> Void) {
+    private func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<O>) -> Void) {
         
         Internals.setAssociatedRetainedObject(
             Internals.NotificationObserver(
@@ -340,7 +304,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
         )
     }
     
-    private func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<ObjectType>, _ object: ObjectType) -> Void) {
+    private func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ObjectMonitor<O>, _ object: O) -> Void) {
         
         Internals.setAssociatedRetainedObject(
             Internals.NotificationObserver(
@@ -354,7 +318,7 @@ public final class ObjectMonitor<O: DynamicObject>: ObjectRepresentation, Equata
                             
                             return
                     }
-                    callback(self, ObjectType.cs_fromRaw(object: object))
+                    callback(self, O.cs_fromRaw(object: object))
                 }
             ),
             forKey: notificationKey,
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index f33899a..85fba5d 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -47,9 +47,14 @@ public protocol ObjectRepresentation {
      An instance that may be observed for object changes.
      */
     func asLiveObject(in dataStack: DataStack) -> LiveObject<ObjectType>?
+
+    /**
+     A read-only instance in the `DataStack`.
+     */
+    func asReadOnly(in dataStack: DataStack) -> ObjectType?
     
     /**
-     An instance that may be mutated within a transaction.
+     An instance that may be mutated within a `BaseDataTransaction`.
      */
     func asEditable(in transaction: BaseDataTransaction) -> ObjectType?
     
@@ -62,11 +67,6 @@ public protocol ObjectRepresentation {
      A thread-safe `struct` that is a full-copy of the object's properties
      */
     func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<ObjectType>?
-    
-    /**
-     An instance that may be observed for property-specific changes.
-     */
-    func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<ObjectType>?
 }
 
 extension NSManagedObject: ObjectRepresentation {}
@@ -88,6 +88,16 @@ extension DynamicObject where Self: ObjectRepresentation {
         return .init(objectID: self.cs_id(), context: context)
     }
 
+    public func asReadOnly(in dataStack: DataStack) -> Self? {
+
+        let context = dataStack.unsafeContext()
+        if self.cs_toRaw().managedObjectContext == context {
+
+            return self
+        }
+        return context.fetchExisting(self.cs_id())
+    }
+
     public func asEditable(in transaction: BaseDataTransaction) -> Self? {
 
         let context = transaction.unsafeContext()
@@ -109,10 +119,4 @@ extension DynamicObject where Self: ObjectRepresentation {
         let context = transaction.unsafeContext()
         return .init(objectID: self.cs_id(), context: context)
     }
-
-    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<Self>? {
-
-        let context = dataStack.unsafeContext()
-        return .init(objectID: self.cs_id(), context: context)
-    }
 }
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 279bb77..a6be1be 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -56,10 +56,15 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
         let context = dataStack.unsafeContext()
         return .init(objectID: self.id, context: context)
     }
+
+    public func asReadOnly(in dataStack: DataStack) -> O? {
+
+        return dataStack.unsafeContext().fetchExisting(self.id)
+    }
     
     public func asEditable(in transaction: BaseDataTransaction) -> O? {
         
-        return self.context.fetchExisting(self.id)
+        return transaction.unsafeContext().fetchExisting(self.id)
     }
     
     public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
@@ -81,11 +86,6 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
         }
         return .init(objectID: self.id, context: context)
     }
-    
-    public func asObjectMonitor(in dataStack: DataStack) -> ObjectMonitor<O>? {
-        
-        return .init(objectID: self.id, context: dataStack.unsafeContext())
-    }
 
 
     // MARK: Equatable
@@ -112,7 +112,7 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
 
         self.id = objectID
         self.context = context
-        self.values = O.cs_snapshotDictionary(id: id, context: context) as NSDictionary
+        self.values = O.cs_snapshotDictionary(id: objectID, context: context) as NSDictionary
     }
 
 

From 1b8e517b5a1d6edb5fa4812c161fd921cb09406d Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 17 Oct 2019 07:40:15 +0900
Subject: [PATCH 18/58] WIP: update demo app

---
 .../CoreStoreDemo.xcodeproj/project.pbxproj   |  4 +
 .../ColorsDemo.swift                          | 86 +++++++++++++++++++
 .../ListObserverDemoViewController.swift      | 74 ----------------
 CoreStoreTests/DynamicModelTests.swift        | 22 ++---
 Sources/CoreStoreObject.swift                 |  4 +-
 5 files changed, 103 insertions(+), 87 deletions(-)
 create mode 100644 CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift

diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
index ebcc953..9492763 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
 		B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; };
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
+		B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
 		B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
 		B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -95,6 +96,7 @@
 		B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = "<group>"; };
 		B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = "<group>"; };
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
+		B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsDemo.swift; sourceTree = "<group>"; };
 		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
@@ -133,6 +135,7 @@
 		B503FADA1AFDC71700F90881 /* List and Object Observers Demo */ = {
 			isa = PBXGroup;
 			children = (
+				B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */,
 				B52977D81B120B80003D50A5 /* ObserversViewController.swift */,
 				B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */,
 				B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */,
@@ -354,6 +357,7 @@
 				B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */,
 				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
 				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
+				B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */,
 				B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */,
 				B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */,
 				B50132242344E24300FC238B /* SwiftUIView.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
new file mode 100644
index 0000000..7866298
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -0,0 +1,86 @@
+//
+//  ColorsDemo.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/17.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreStore
+
+
+// MARK: - ColorsDemo
+
+struct ColorsDemo {
+    
+    enum Filter: String {
+        
+        case all = "All Colors"
+        case light = "Light Colors"
+        case dark = "Dark Colors"
+        
+        func next() -> Filter {
+            
+            switch self {
+                
+            case .all: return .light
+            case .light: return .dark
+            case .dark: return .all
+            }
+        }
+        
+        func whereClause() -> Where<Palette> {
+            
+            switch self {
+                
+            case .all: return .init()
+            case .light: return (\Palette.brightness >= 0.9)
+            case .dark: return (\Palette.brightness <= 0.4)
+            }
+        }
+    }
+    
+    static var filter = Filter.all {
+        
+        didSet {
+            
+//            self.palettes.refetch(
+//                self.filter.whereClause(),
+//                OrderBy<Palette>(.ascending(\.hue))
+//            )
+        }
+    }
+    
+    static let stack: DataStack = {
+     
+        let dataStack = DataStack(
+            CoreStoreSchema(
+                modelVersion: "ColorsDemo",
+                entities: [
+                    Entity<Palette>("Palette"),
+                ],
+                versionLock: [
+                    "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f]
+                ]
+            )
+        )
+
+        try! dataStack.addStorageAndWait(
+            SQLiteStore(
+                fileName: "ColorsDemo.sqlite",
+                localStorageOptions: .recreateStoreOnModelMismatch
+            )
+        )
+        return dataStack
+    }()
+    
+    static let palettes: LiveList<Palette> = {
+
+        return ColorsDemo.stack.liveList(
+            From<Palette>()
+                .sectionBy(\.colorName)
+                .orderBy(.ascending(\.hue))
+        )
+    }()
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index a2fc66b..cd3d3dc 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -10,80 +10,6 @@ import UIKit
 import CoreStore
 
 
-struct ColorsDemo {
-    
-    enum Filter: String {
-        
-        case all = "All Colors"
-        case light = "Light Colors"
-        case dark = "Dark Colors"
-        
-        func next() -> Filter {
-            
-            switch self {
-                
-            case .all: return .light
-            case .light: return .dark
-            case .dark: return .all
-            }
-        }
-        
-        func whereClause() -> Where<Palette> {
-            
-            switch self {
-                
-            case .all: return .init()
-            case .light: return (\Palette.brightness >= 0.9)
-            case .dark: return (\Palette.brightness <= 0.4)
-            }
-        }
-    }
-    
-    static var filter = Filter.all {
-        
-        didSet {
-            
-//            self.palettes.refetch(
-//                self.filter.whereClause(),
-//                OrderBy<Palette>(.ascending(\.hue))
-//            )
-        }
-    }
-    
-    static let stack: DataStack = {
-     
-        let dataStack = DataStack(
-            CoreStoreSchema(
-                modelVersion: "ColorsDemo",
-                entities: [
-                    Entity<Palette>("Palette"),
-                ],
-                versionLock: [
-                    "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f]
-                ]
-            )
-        )
-
-        try! dataStack.addStorageAndWait(
-            SQLiteStore(
-                fileName: "ColorsDemo.sqlite",
-                localStorageOptions: .recreateStoreOnModelMismatch
-            )
-        )
-        return dataStack
-    }()
-    
-    static let palettes: LiveList<Palette> = {
-
-        return ColorsDemo.stack.liveList(
-            From<Palette>()
-                .sectionBy(\.colorName)
-                .orderBy(.ascending(\.hue))
-        )
-    }()
-}
-
-
 // MARK: - ListObserverDemoViewController
 
 class ListObserverDemoViewController: UITableViewController {
diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift
index 1147710..2f8d94f 100644
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -292,22 +292,22 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTAssertEqual(person.name.value, "John")
                     XCTAssertEqual(person.displayName.value, "Mr. John") // Custom getter
                     
-//                    let personSnapshot1 = person.createSnapshot()
-//                    XCTAssertEqual(person.name.value, personSnapshot1.name)
-//                    XCTAssertEqual(person.title.value, personSnapshot1.title)
-//                    XCTAssertEqual(person.displayName.value, personSnapshot1.displayName)
+                    let personSnapshot1 = person.asSnapshot(in: transaction)
+                    XCTAssertEqual(person.name.value, personSnapshot1?.name)
+                    XCTAssertEqual(person.title.value, personSnapshot1?.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot1?.displayName)
                     
                     person.title .= "Sir"
                     XCTAssertEqual(person.displayName.value, "Sir John")
                     
-//                    XCTAssertEqual(personSnapshot1.name, "John")
-//                    XCTAssertEqual(personSnapshot1.title, "Mr.")
-//                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot1?.name, "John")
+                    XCTAssertEqual(personSnapshot1?.title, "Mr.")
+                    XCTAssertEqual(personSnapshot1?.displayName, "Mr. John")
                     
-//                    let personSnapshot2 = person.createSnapshot()
-//                    XCTAssertEqual(person.name.value, personSnapshot2.name)
-//                    XCTAssertEqual(person.title.value, personSnapshot2.title)
-//                    XCTAssertEqual(person.displayName.value, personSnapshot2.displayName)
+                    let personSnapshot2 = person.asSnapshot(in: transaction)
+                    XCTAssertEqual(person.name.value, personSnapshot2?.name)
+                    XCTAssertEqual(person.title.value, personSnapshot2?.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot2?.displayName)
                     
                     person.pets.value.insert(dog)
                     XCTAssertEqual(person.pets.count, 1)
diff --git a/Sources/CoreStoreObject.swift b/Sources/CoreStoreObject.swift
index 43d73f3..01dd8d2 100644
--- a/Sources/CoreStoreObject.swift
+++ b/Sources/CoreStoreObject.swift
@@ -63,7 +63,7 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
     
     /**
      Do not call this directly. This is exposed as public only as a required initializer.
-     - Important: subclasses that need a custom initializer should override both `init(_:)` and `init(asMeta:)`, and to call their corresponding super implementations.
+     - Important: subclasses that need a custom initializer should override both `init(rawObject:)` and `init(asMeta:)`, and to call their corresponding super implementations.
      */
     public required init(rawObject: NSManagedObject) {
         
@@ -77,7 +77,7 @@ open /*abstract*/ class CoreStoreObject: DynamicObject, Hashable {
     
     /**
      Do not call this directly. This is exposed as public only as a required initializer.
-     - Important: subclasses that need a custom initializer should override both `init(_:)` and `init(asMeta:)`, and to call their corresponding super implementations.
+     - Important: subclasses that need a custom initializer should override both `init(rawObject:)` and `init(asMeta:)`, and to call their corresponding super implementations.
      */
     public required init(asMeta: Void) {
         

From 0c19c878c5bed69df3fc813a97a7cc5607df624b Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 17 Oct 2019 11:39:29 +0900
Subject: [PATCH 19/58] LiveList refetch

---
 CoreStore.xcodeproj/project.pbxproj           |   2 +
 .../CoreStoreDemo.xcodeproj/project.pbxproj   |  12 ++
 .../CoreStoreDemo/Base.lproj/Main.storyboard  | 131 ++++++++++----
 .../CollectionViewDemoViewController.swift    | 169 ++++++++++++++++++
 .../ColorsDemo.swift                          |   8 +-
 .../ListObserverDemoViewController.swift      |   1 +
 .../PaletteCollectionSectionHeaderView.swift  |  17 ++
 .../PaletteCollectionViewCell.swift           |  18 ++
 .../PaletteTableViewCell.swift                |   5 +-
 Sources/Info.plist                            |   2 +-
 Sources/LiveList.swift                        |  84 ++++++++-
 11 files changed, 408 insertions(+), 41 deletions(-)
 create mode 100644 CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
 create mode 100644 CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift
 create mode 100644 CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 553a2d2..8476d39 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -3123,6 +3123,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 7.0.0;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3141,6 +3142,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 7.0.0;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
index 9492763..4da2f9f 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
 		B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */; };
 		B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */; };
 		B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */; };
+		B5635D192357F9F700B80E6B /* CollectionViewDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */; };
+		B5635D1B2357FA4B00B80E6B /* PaletteCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */; };
 		B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */; };
 		B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3311B11DF3200F4F0C6 /* UserAccount.swift */; };
 		B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */; };
@@ -38,6 +40,7 @@
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
 		B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */; };
+		B5C37EE52357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
 		B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
 		B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -85,6 +88,8 @@
 		B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2ToV3MigrationPolicy.swift; sourceTree = "<group>"; };
+		B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionViewDemoViewController.swift; sourceTree = "<group>"; };
+		B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionViewCell.swift; sourceTree = "<group>"; };
 		B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackSetupDemoViewController.swift; sourceTree = "<group>"; };
 		B566E3311B11DF3200F4F0C6 /* UserAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAccount.swift; sourceTree = "<group>"; };
 		B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomLoggerViewController.swift; sourceTree = "<group>"; };
@@ -98,6 +103,7 @@
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
 		B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorsDemo.swift; sourceTree = "<group>"; };
 		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaletteCollectionSectionHeaderView.swift; sourceTree = "<group>"; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
@@ -138,9 +144,12 @@
 				B5AA37EE2357D30300FFD4B9 /* ColorsDemo.swift */,
 				B52977D81B120B80003D50A5 /* ObserversViewController.swift */,
 				B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */,
+				B5635D182357F9F700B80E6B /* CollectionViewDemoViewController.swift */,
 				B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */,
 				B503FADD1AFDC71700F90881 /* Palette.swift */,
 				B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */,
+				B5635D1A2357FA4B00B80E6B /* PaletteCollectionViewCell.swift */,
+				B5C37EE42357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift */,
 			);
 			path = "List and Object Observers Demo";
 			sourceTree = "<group>";
@@ -333,6 +342,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */,
+				B5C37EE52357FEBE0035A20D /* PaletteCollectionSectionHeaderView.swift in Sources */,
 				B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */,
 				B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */,
 				B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */,
@@ -344,6 +354,7 @@
 				B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */,
 				B52977D91B120B80003D50A5 /* ObserversViewController.swift in Sources */,
 				B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */,
+				B5635D192357F9F700B80E6B /* CollectionViewDemoViewController.swift in Sources */,
 				B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */,
 				B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */,
 				B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */,
@@ -355,6 +366,7 @@
 				B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */,
 				B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */,
 				B50132282344E5E900FC238B /* SwiftUIContainerViewController.swift in Sources */,
+				B5635D1B2357FA4B00B80E6B /* PaletteCollectionViewCell.swift in Sources */,
 				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
 				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
 				B5AA37EF2357D30300FFD4B9 /* ColorsDemo.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index f71eda2..71b7f7d 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -623,7 +624,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="49t-Sy-Rq7" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="5864" y="1324.5"/>
+            <point key="canvasLocation" x="6316" y="1267"/>
         </scene>
         <!--Colors-->
         <scene sceneID="3lD-lX-hIc">
@@ -649,7 +650,7 @@
                                     <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
                                         <rect key="frame" x="0.0" y="311.5" width="375" height="311.5"/>
                                         <connections>
-                                            <segue destination="bLr-DM-i2t" kind="embed" id="OdS-gZ-CUA"/>
+                                            <segue destination="Rdw-NU-NaK" kind="embed" id="3Ob-Bj-yvz"/>
                                         </connections>
                                     </containerView>
                                 </subviews>
@@ -713,7 +714,7 @@
             </objects>
             <point key="canvasLocation" x="1822" y="2013"/>
         </scene>
-        <!--List Observer-->
+        <!--LiveList-->
         <scene sceneID="gkX-bd-Rel">
             <objects>
                 <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
@@ -764,14 +765,14 @@
                         </connections>
                     </tableView>
                     <extendedEdge key="edgesForExtendedLayout" top="YES"/>
-                    <navigationItem key="navigationItem" title="List Observer" id="JjF-x3-ixG"/>
+                    <navigationItem key="navigationItem" title="LiveList" id="5kj-jr-HoL"/>
                     <connections>
                         <segue destination="dX3-kR-CYC" kind="show" identifier="ObjectObserverDemoViewController" id="hyN-De-zte"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="P5L-49-pOr" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="5085" y="1144.5"/>
+            <point key="canvasLocation" x="5156" y="1144"/>
         </scene>
         <!--Placemarks-->
         <scene sceneID="LRD-q1-hw1">
@@ -878,8 +879,8 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="wJo-mp-1pS">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <color key="tintColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <color key="barTintColor" red="0.13079629838466644" green="0.184075728058815" blue="0.24594299495220184" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="tintColor" red="0.68627450980392157" green="0.71372549019607845" blue="0.73333333333333328" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.12941176470588234" green="0.18431372549019609" blue="0.24705882352941178" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
                             <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="20"/>
                             <color key="textColor" red="0.68773996829986572" green="0.71417498588562012" blue="0.73246318101882935" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -894,36 +895,76 @@
             </objects>
             <point key="canvasLocation" x="4404" y="1144.5"/>
         </scene>
-        <!--SwiftUI Container View Controller-->
-        <scene sceneID="nAz-oS-mGy">
+        <!--LiveList-->
+        <scene sceneID="CXQ-vG-dtK">
             <objects>
-                <viewController id="bLr-DM-i2t" customClass="SwiftUIContainerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="3nJ-WH-imr"/>
-                        <viewControllerLayoutGuide type="bottom" id="Q1w-Zn-fPm"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="kof-sr-Xm1">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
+                <collectionViewController id="EKY-1g-ALK" customClass="CollectionViewDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="hx3-j3-Q80">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="SwiftUI is not supported on this device/OS version" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M6C-fv-74B">
-                                <rect key="frame" x="16" y="126" width="343" height="60"/>
-                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="25"/>
-                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstAttribute="trailingMargin" secondItem="M6C-fv-74B" secondAttribute="trailing" id="68e-4i-uHt"/>
-                            <constraint firstItem="M6C-fv-74B" firstAttribute="centerY" secondItem="kof-sr-Xm1" secondAttribute="centerY" id="W80-DR-xpp"/>
-                            <constraint firstItem="M6C-fv-74B" firstAttribute="leading" secondItem="kof-sr-Xm1" secondAttribute="leadingMargin" id="nQs-sh-4BY"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="m7Z-UU-Jc8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="X6n-f9-yEl">
+                            <size key="itemSize" width="50" height="50"/>
+                            <size key="headerReferenceSize" width="50" height="50"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionViewCell" id="x2U-Yq-KAx" customClass="PaletteCollectionViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="50" width="50" height="50"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="Alc-Is-Hc1">
+                                    <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NxF-xt-nas">
+                                            <rect key="frame" x="2" y="2" width="46" height="46"/>
+                                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        </view>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="NxF-xt-nas" firstAttribute="leading" secondItem="Alc-Is-Hc1" secondAttribute="leading" constant="2" id="Hjb-0k-4HP"/>
+                                        <constraint firstAttribute="trailing" secondItem="NxF-xt-nas" secondAttribute="trailing" constant="2" id="fKI-q8-bbI"/>
+                                        <constraint firstItem="NxF-xt-nas" firstAttribute="top" secondItem="Alc-Is-Hc1" secondAttribute="top" constant="2" id="qS6-eD-5T1"/>
+                                        <constraint firstAttribute="bottom" secondItem="NxF-xt-nas" secondAttribute="bottom" constant="2" id="uWP-o0-nzA"/>
+                                    </constraints>
+                                </collectionViewCellContentView>
+                                <connections>
+                                    <outlet property="colorView" destination="NxF-xt-nas" id="ywq-kB-ycp"/>
+                                </connections>
+                            </collectionViewCell>
+                        </cells>
+                        <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PaletteCollectionSectionHeaderView" id="bRa-K0-IUz" customClass="PaletteCollectionSectionHeaderView" customModule="CoreStoreDemo" customModuleProvider="target">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KHu-XO-jxd">
+                                    <rect key="frame" x="10" y="2" width="363" height="46"/>
+                                    <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="17"/>
+                                    <nil key="textColor"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <constraints>
+                                <constraint firstAttribute="trailing" secondItem="KHu-XO-jxd" secondAttribute="trailing" constant="2" id="Meb-ZG-6uP"/>
+                                <constraint firstAttribute="bottom" secondItem="KHu-XO-jxd" secondAttribute="bottom" constant="2" id="SL5-cA-7nf"/>
+                                <constraint firstItem="KHu-XO-jxd" firstAttribute="top" secondItem="bRa-K0-IUz" secondAttribute="top" constant="2" id="VFE-35-4gg"/>
+                                <constraint firstItem="KHu-XO-jxd" firstAttribute="leading" secondItem="bRa-K0-IUz" secondAttribute="leading" constant="10" id="pzx-h0-rZd"/>
+                            </constraints>
+                            <connections>
+                                <outlet property="label" destination="KHu-XO-jxd" id="qqK-Rm-eww"/>
+                            </connections>
+                        </collectionReusableView>
+                        <connections>
+                            <outlet property="dataSource" destination="EKY-1g-ALK" id="way-Q8-Xhb"/>
+                            <outlet property="delegate" destination="EKY-1g-ALK" id="r9k-Fz-mWc"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" title="LiveList" id="goy-Zu-94A"/>
+                </collectionViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Fmi-gN-RXz" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4404" y="1483.3583208395803"/>
+            <point key="canvasLocation" x="5156" y="1484"/>
         </scene>
         <!--Time Zones-->
         <scene sceneID="nFT-bo-7y9">
@@ -1101,6 +1142,30 @@
             </objects>
             <point key="canvasLocation" x="4404" y="3055"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="s0N-is-CU8">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Rdw-NU-NaK" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="clN-r9-yIR">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="0.68627450980000004" green="0.71372549019999998" blue="0.73333333329999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.12941176469999999" green="0.1840757281" blue="0.245942995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <textAttributes key="titleTextAttributes">
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="21"/>
+                            <color key="textColor" red="0.68627450980000004" green="0.71372549019999998" blue="0.73333333329999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </textAttributes>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="EKY-1g-ALK" kind="relationship" relationship="rootViewController" id="CG7-LF-MHV"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="qAN-O1-Rn4" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4404" y="1484"/>
+        </scene>
     </scenes>
     <resources>
         <image name="second" width="30" height="30"/>
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
new file mode 100644
index 0000000..7a4175c
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
@@ -0,0 +1,169 @@
+//
+//  CollectionViewDemoViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Estropia on 2019/10/17.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+
+
+// MARK: - CollectionViewDemoViewController
+
+final class CollectionViewDemoViewController: UICollectionViewController {
+
+    // MARK: UIViewController
+
+    override func viewDidLoad() {
+
+        super.viewDidLoad()
+
+        let navigationItem = self.navigationItem
+        navigationItem.leftBarButtonItems = [
+            self.editButtonItem,
+            UIBarButtonItem(
+                barButtonSystemItem: .trash,
+                target: self,
+                action: #selector(self.resetBarButtonItemTouched(_:))
+            )
+        ]
+
+        let filterBarButton = UIBarButtonItem(
+            title: ColorsDemo.filter.rawValue,
+            style: .plain,
+            target: self,
+            action: #selector(self.filterBarButtonItemTouched(_:))
+        )
+        navigationItem.rightBarButtonItems = [
+            UIBarButtonItem(
+                barButtonSystemItem: .add,
+                target: self,
+                action: #selector(self.addBarButtonItemTouched(_:))
+            ),
+            UIBarButtonItem(
+                barButtonSystemItem: .refresh,
+                target: self,
+                action: #selector(self.shuffleBarButtonItemTouched(_:))
+            ),
+            filterBarButton
+        ]
+        self.filterBarButton = filterBarButton
+
+        self.dataSource = DiffableDataSource.CollectionView<Palette>(
+            collectionView: self.collectionView,
+            dataStack: ColorsDemo.stack,
+            cellProvider: { (collectionView, indexPath, palette) in
+
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PaletteCollectionViewCell", for: indexPath) as! PaletteCollectionViewCell
+                cell.colorView?.backgroundColor = palette.color
+                cell.label?.text = palette.colorText
+                return cell
+            },
+            supplementaryViewProvider: { (collectionView, kind, indexPath) in
+
+                switch kind {
+
+                case UICollectionView.elementKindSectionHeader:
+                    let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "PaletteCollectionSectionHeaderView", for: indexPath) as! PaletteCollectionSectionHeaderView
+                    view.label?.text = ColorsDemo.palettes.sectionIdentifiers[indexPath.section]
+                    return view
+
+                default:
+                    return nil
+                }
+            }
+        )
+        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList) in
+
+            guard let self = self else {
+
+                return
+            }
+            self.filterBarButton?.title = ColorsDemo.filter.rawValue
+            self.dataSource?.apply(liveList.snapshot, animatingDifferences: true)
+        }
+        self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
+    }
+
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+
+        super.prepare(for: segue, sender: sender)
+
+        switch (segue.identifier, segue.destination, sender) {
+
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as LiveObject<Palette>):
+            destinationViewController.setPalette(palette)
+
+        default:
+            break
+        }
+    }
+
+
+    // MARK: UICollectionViewDelegate
+
+    override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+
+        collectionView.deselectItem(at: indexPath, animated: true)
+
+        self.performSegue(
+            withIdentifier: "ObjectObserverDemoViewController",
+            sender: ColorsDemo.palettes[indexPath: indexPath]
+        )
+    }
+
+
+    // MARK: Private
+
+    private var filterBarButton: UIBarButtonItem?
+    private var dataSource: DiffableDataSource.CollectionView<Palette>?
+
+    deinit {
+
+        ColorsDemo.palettes.removeObserver(self)
+    }
+
+    @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
+
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                try transaction.deleteAll(From<Palette>())
+            },
+            completion: { _ in }
+        )
+    }
+
+    @IBAction private dynamic func filterBarButtonItemTouched(_ sender: AnyObject?) {
+
+        ColorsDemo.filter = ColorsDemo.filter.next()
+    }
+
+    @IBAction private dynamic func addBarButtonItemTouched(_ sender: AnyObject?) {
+
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                let palette = transaction.create(Into<Palette>())
+                palette.setInitialValues(in: transaction)
+            },
+            completion: { _ in }
+        )
+    }
+
+    @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                for palette in try transaction.fetchAll(From<Palette>()) {
+
+                    palette.hue .= Palette.randomHue()
+                    palette.colorName .= nil
+                }
+            },
+            completion: { _ in }
+        )
+    }
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
index 7866298..d012c15 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -45,10 +45,10 @@ struct ColorsDemo {
         
         didSet {
             
-//            self.palettes.refetch(
-//                self.filter.whereClause(),
-//                OrderBy<Palette>(.ascending(\.hue))
-//            )
+            self.palettes.refetch(
+                self.filter.whereClause(),
+                OrderBy<Palette>(.ascending(\.hue))
+            )
         }
     }
     
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index cd3d3dc..9eb2555 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -68,6 +68,7 @@ class ListObserverDemoViewController: UITableViewController {
                 
                 return
             }
+            self.filterBarButton?.title = ColorsDemo.filter.rawValue
             self.dataSource?.apply(liveList.snapshot, animatingDifferences: true)
         }
         self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift
new file mode 100644
index 0000000..b2fa540
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionSectionHeaderView.swift	
@@ -0,0 +1,17 @@
+//
+//  PaletteCollectionSectionHeaderView.swift
+//  CoreStoreDemo
+//
+//  Created by John Estropia on 2019/10/17.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+
+// MARK: - PaletteCollectionSectionHeaderView
+
+final class PaletteCollectionSectionHeaderView: UICollectionReusableView {
+
+    @IBOutlet weak var label: UILabel?
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift
new file mode 100644
index 0000000..156ccf2
--- /dev/null
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteCollectionViewCell.swift	
@@ -0,0 +1,18 @@
+//
+//  PaletteCollectionViewCell.swift
+//  CoreStoreDemo
+//
+//  Created by John Estropia on 2019/10/17.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+
+// MARK: - PaletteCollectionViewCell
+
+final class PaletteCollectionViewCell: UICollectionViewCell {
+
+    @IBOutlet weak var colorView: UIView?
+    @IBOutlet weak var label: UILabel?
+}
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift
index eeb1b1f..efdeafa 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/PaletteTableViewCell.swift	
@@ -8,7 +8,10 @@
 
 import UIKit
 
-class PaletteTableViewCell: UITableViewCell {
+
+// MARK: - PaletteTableViewCell
+
+final class PaletteTableViewCell: UITableViewCell {
     
     @IBOutlet weak var colorView: UIView?
     @IBOutlet weak var label: UILabel?
diff --git a/Sources/Info.plist b/Sources/Info.plist
index da1d595..ca23c84 100644
--- a/Sources/Info.plist
+++ b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index 905b052..fdce498 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -178,11 +178,53 @@ public final class LiveList<O: DynamicObject>: Hashable {
         self.observers.removeObject(forKey: observer)
     }
 
-    deinit {
 
-        self.observers.removeAllObjects()
+    // MARK: Public (Refetching)
+
+    /**
+     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+
+     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
+
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`.
+     */
+    public func refetch(_ fetchClauses: FetchClause...) {
+
+        self.refetch(fetchClauses)
     }
 
+    /**
+     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+
+     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
+
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`.
+     */
+    public func refetch(_ fetchClauses: [FetchClause]) {
+
+        self.refetch { (fetchRequest) in
+
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+        }
+    }
+
+
+    // MARK: Public (3rd Party Utilities)
+
+    /**
+     Allow external libraries to store custom data in the `ListMonitor`. App code should rarely have a need for this.
+     ```
+     enum Static {
+         static var myDataKey: Void?
+     }
+     monitor.userInfo[&Static.myDataKey] = myObject
+     ```
+     - Important: Do not use this method to store thread-sensitive data.
+     */
+    public let userInfo = UserInfo()
+
 
     // MARK: Equatable
 
@@ -253,6 +295,44 @@ public final class LiveList<O: DynamicObject>: Hashable {
         )
     }
 
+    internal func refetch(_ applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+
+        self.applyFetchClauses = applyFetchClauses
+
+        DispatchQueue.main.async { [weak self] () -> Void in
+
+            guard let `self` = self else {
+
+                return
+            }
+
+            let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
+                context: self.fetchedResultsController.managedObjectContext,
+                from: self.from,
+                sectionBy: self.sectionBy,
+                applyFetchClauses: self.applyFetchClauses
+            )
+            newFetchedResultsControllerDelegate.handler = self
+
+            do {
+
+                try newFetchedResultsController.performFetchFromSpecifiedStores()
+            }
+            catch {
+
+                // DataStack may have been deallocated
+                return
+            }
+            (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = (newFetchedResultsController, newFetchedResultsControllerDelegate)
+        }
+    }
+
+    deinit {
+
+        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
+        self.observers.removeAllObjects()
+    }
+
 
     // MARK: FilePrivate
 

From 9764f33086d3f6aa0149eccaf20fd83da4229ed7 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 17 Oct 2019 12:32:47 +0900
Subject: [PATCH 20/58] update demo app

---
 .../CoreStoreDemo/Base.lproj/Main.storyboard  | 11 ++++-
 .../ListObserverDemoViewController.swift      | 48 +++++++++++--------
 .../ObserversViewController.swift             | 23 +++++++--
 Sources/DiffableDataSource.TableView.swift    | 15 ++++++
 4 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index 71b7f7d..3805cbc 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -682,6 +682,9 @@
                     <nil key="simulatedBottomBarMetrics"/>
                     <connections>
                         <outlet property="bottomContainerView" destination="6So-f3-4Gp" id="C7O-e2-k0l"/>
+                        <outlet property="stackView" destination="cce-yT-4dn" id="r5B-BT-mUM"/>
+                        <outlet property="toggleBottomBarButtonItem" destination="aPM-OC-EB8" id="kEV-gg-XOX"/>
+                        <outlet property="toggleTopBarButtonItem" destination="6q3-Zk-A9p" id="usC-Zu-DQm"/>
                         <outlet property="topContainerView" destination="L5f-tW-lXf" id="DRV-mm-rBY"/>
                     </connections>
                 </viewController>
@@ -900,7 +903,7 @@
             <objects>
                 <collectionViewController id="EKY-1g-ALK" customClass="CollectionViewDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="hx3-j3-Q80">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="311"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="311.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="X6n-f9-yEl">
@@ -961,6 +964,9 @@
                         </connections>
                     </collectionView>
                     <navigationItem key="navigationItem" title="LiveList" id="goy-Zu-94A"/>
+                    <connections>
+                        <segue destination="dX3-kR-CYC" kind="show" identifier="ObjectObserverDemoViewController" id="k4E-dJ-1lz"/>
+                    </connections>
                 </collectionViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Fmi-gN-RXz" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -1170,4 +1176,7 @@
     <resources>
         <image name="second" width="30" height="30"/>
     </resources>
+    <inferredMetricsTieBreakers>
+        <segue reference="k4E-dJ-1lz"/>
+    </inferredMetricsTieBreakers>
 </document>
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 9eb2555..72daae2 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -12,7 +12,32 @@ import CoreStore
 
 // MARK: - ListObserverDemoViewController
 
-class ListObserverDemoViewController: UITableViewController {
+final class ListObserverDemoViewController: UITableViewController {
+
+    // MARK: - EditableDataSource
+
+    final class EditableDataSource: DiffableDataSource.TableView<Palette> {
+
+        override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
+
+            switch editingStyle {
+
+            case .delete:
+                let palette = ColorsDemo.palettes[indexPath: indexPath]
+                ColorsDemo.stack.perform(
+                    asynchronous: { (transaction) in
+
+                        transaction.delete(palette)
+                    },
+                    completion: { _ in }
+                )
+
+            default:
+                break
+            }
+        }
+    }
+
     
     // MARK: UIViewController
 
@@ -51,7 +76,7 @@ class ListObserverDemoViewController: UITableViewController {
         ]
         self.filterBarButton = filterBarButton
 
-        self.dataSource = DiffableDataSource.TableView<Palette>(
+        self.dataSource = EditableDataSource(
             tableView: self.tableView,
             dataStack: ColorsDemo.stack,
             cellProvider: { (tableView, indexPath, palette) in
@@ -101,25 +126,6 @@ class ListObserverDemoViewController: UITableViewController {
         )
     }
     
-    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
-        
-        switch editingStyle {
-            
-        case .delete:
-            let palette = ColorsDemo.palettes[indexPath: indexPath]
-            ColorsDemo.stack.perform(
-                asynchronous: { (transaction) in
-                    
-                    transaction.delete(palette)
-                },
-                completion: { _ in }
-            )
-            
-        default:
-            break
-        }
-    }
-    
     
     // MARK: Private
     
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift
index cbaa477..9731e94 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObserversViewController.swift	
@@ -30,17 +30,30 @@ class ObserversViewController: UIViewController {
     
     
     // MARK: Private
-    
+
+    @IBOutlet private dynamic weak var toggleTopBarButtonItem: UIBarButtonItem?
+    @IBOutlet private dynamic weak var toggleBottomBarButtonItem: UIBarButtonItem?
+    @IBOutlet private dynamic weak var stackView: UIStackView?
     @IBOutlet private dynamic weak var topContainerView: UIView?
     @IBOutlet private dynamic weak var bottomContainerView: UIView?
     
     @IBAction private dynamic func toggleTopContainerView() {
-        
-        self.topContainerView?.isHidden.toggle()
+
+        UIView.animate(withDuration: 0.2) {
+
+            self.topContainerView!.isHidden.toggle()
+        }
+        self.toggleTopBarButtonItem!.isEnabled = !self.bottomContainerView!.isHidden
+        self.toggleBottomBarButtonItem!.isEnabled = !self.topContainerView!.isHidden
     }
     
     @IBAction private dynamic func toggleBottomContainerView() {
-        
-        self.bottomContainerView?.isHidden.toggle()
+
+        UIView.animate(withDuration: 0.2) {
+
+            self.bottomContainerView!.isHidden.toggle()
+        }
+        self.toggleTopBarButtonItem!.isEnabled = !self.bottomContainerView!.isHidden
+        self.toggleBottomBarButtonItem!.isEnabled = !self.topContainerView!.isHidden
     }
 }
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
index 69976e8..eedc726 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -215,6 +215,21 @@ extension DiffableDataSource {
 //            }
         }
 
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
+
+            return true
+        }
+
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {
+
+            return .delete
+        }
+
+        @objc
+        open dynamic func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {}
+
 
         // MARK: Private
 

From bd066f0cef4745f62b8d9c62ea6327925e1db05a Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 17 Oct 2019 16:59:00 +0900
Subject: [PATCH 21/58] delete unused files

---
 Sources/Functions.swift | 111 ----------------------------------------
 1 file changed, 111 deletions(-)
 delete mode 100644 Sources/Functions.swift

diff --git a/Sources/Functions.swift b/Sources/Functions.swift
deleted file mode 100644
index 0bfc8cd..0000000
--- a/Sources/Functions.swift
+++ /dev/null
@@ -1,111 +0,0 @@
-//
-//  Functions.swift
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-import Foundation
-
-// MARK: Associated Objects
-
-@inline(__always)
-internal func cs_getAssociatedObjectForKey<T: AnyObject>(_ key: UnsafeRawPointer, inObject object: Any) -> T? {
-    
-    switch objc_getAssociatedObject(object, key) {
-        
-    case let associatedObject as T:
-        return associatedObject
-        
-    case let associatedObject as WeakObject:
-        return associatedObject.object as? T
-        
-    default:
-        return nil
-    }
-}
-
-@inline(__always)
-internal func cs_setAssociatedRetainedObject<T: AnyObject>(_ associatedObject: T?, forKey key: UnsafeRawPointer, inObject object: Any) {
-    
-    objc_setAssociatedObject(object, key, associatedObject, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-}
-
-@inline(__always)
-internal func cs_setAssociatedCopiedObject<T: AnyObject>(_ associatedObject: T?, forKey key: UnsafeRawPointer, inObject object: Any) {
-    
-    objc_setAssociatedObject(object, key, associatedObject, .OBJC_ASSOCIATION_COPY_NONATOMIC)
-}
-
-@inline(__always)
-internal func cs_setAssociatedWeakObject<T: AnyObject>(_ associatedObject: T?, forKey key: UnsafeRawPointer, inObject object: Any) {
-    
-    if let associatedObject = associatedObject {
-        
-        objc_setAssociatedObject(object, key, WeakObject(associatedObject), .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-    }
-    else {
-        
-        objc_setAssociatedObject(object, key, nil, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-    }
-}
-
-
-// MARK: Printing Utilities
-
-@inline(__always)
-internal func cs_typeName<T>(_ value: T) -> String {
-    
-    return "'\(String(reflecting: type(of: value)))'"
-}
-
-@inline(__always)
-internal func cs_typeName<T>(_ value: T.Type) -> String {
-    
-    return "'\(value)'"
-}
-
-@inline(__always)
-internal func cs_typeName(_ value: AnyClass) -> String {
-    
-    return "'\(value)'"
-}
-
-@inline(__always)
-internal func cs_typeName(_ name: String) -> String {
-    
-    return "<\(name)>"
-}
-
-@inline(__always)
-internal func cs_typeName(_ name: String?) -> String {
-    
-    return "<\(name ?? "unknown")>"
-}
-
-
-// MARK: Functional
-
-@inline(__always)
-internal func cs_lazy<T>(_ closure: () -> T) -> T {
-    
-    return closure()
-}

From 6e3e540d0a0761534b5df4d8415de926b9e87cc6 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 17 Oct 2019 19:27:03 +0900
Subject: [PATCH 22/58] Improve handling in LiveObject and ObjectSnapshot when
 objects are deleted

---
 .../Palette.swift                             |  18 ---
 .../SwiftUI Demo/SwiftUIView.swift            |  14 +-
 CoreStoreTests/DynamicModelTests.swift        |  32 +++--
 Sources/DynamicObject.swift                   |  25 +++-
 Sources/LiveObject.swift                      |  71 ++++++----
 .../NSManagedObjectContext+CoreStore.swift    |   9 +-
 Sources/ObjectRepresentation.swift            |  10 +-
 Sources/ObjectSnapshot.swift                  | 127 +++++++++++++-----
 Sources/Relationship.swift                    |   6 +-
 9 files changed, 194 insertions(+), 118 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift
index 98ddd76..688b1ee 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/Palette.swift	
@@ -75,24 +75,6 @@ extension Palette {
     }
 }
 
-extension LiveObject where ObjectType == Palette {
-
-    var color: UIColor {
-
-        return UIColor(
-            hue: CGFloat(self.hue) / 360.0,
-            saturation: CGFloat(self.saturation),
-            brightness: CGFloat(self.brightness),
-            alpha: 1.0
-        )
-    }
-
-    var colorText: String {
-
-        return "H: \(self.hue)˚, S: \(round(self.saturation * 100.0))%, B: \(round(self.brightness * 100.0))%"
-    }
-}
-
 extension Palette {
 
     func setInitialValues(in transaction: BaseDataTransaction) {
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 7b52c71..5c2ab8c 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -116,10 +116,10 @@ struct ColorCell: View {
 
     var body: some View {
         HStack {
-            Color(palette.color)
+            Color(palette.color ?? UIColor.clear)
                 .cornerRadius(5)
                 .frame(width: 30, height: 30, alignment: .leading)
-            Text(palette.colorText)
+            Text(palette.colorText ?? "<Deleted>")
         }
     }
 }
@@ -140,18 +140,18 @@ struct DetailView: View {
     init(palette: LiveObject<Palette>) {
 
         self.palette = palette
-        self.hue = Float(palette.hue)
-        self.saturation = palette.saturation
-        self.brightness = palette.brightness
+        self.hue = Float(palette.hue ?? 0)
+        self.saturation = palette.saturation ?? 0
+        self.brightness = palette.brightness ?? 0
     }
 
     var body: some View {
         ZStack {
-            Color(palette.color)
+            Color(palette.color ?? UIColor.clear)
                 .cornerRadius(20)
                 .padding(20)
             VStack {
-                Text(palette.colorText)
+                Text(palette.colorText ?? "<Deleted>")
                     .navigationBarTitle(Text("Color"))
                 Slider(value: $hue, in: 0.0 ... 359.0 as ClosedRange<Float>)
                 Slider(value: $saturation, in: 0.0 ... 1.0 as ClosedRange<Float>)
diff --git a/CoreStoreTests/DynamicModelTests.swift b/CoreStoreTests/DynamicModelTests.swift
index 2f8d94f..2b40a97 100644
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -292,22 +292,32 @@ class DynamicModelTests: BaseTestDataTestCase {
                     XCTAssertEqual(person.name.value, "John")
                     XCTAssertEqual(person.displayName.value, "Mr. John") // Custom getter
                     
-                    let personSnapshot1 = person.asSnapshot(in: transaction)
-                    XCTAssertEqual(person.name.value, personSnapshot1?.name)
-                    XCTAssertEqual(person.title.value, personSnapshot1?.title)
-                    XCTAssertEqual(person.displayName.value, personSnapshot1?.displayName)
+                    let personSnapshot1 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name.value, personSnapshot1.name)
+                    XCTAssertEqual(person.title.value, personSnapshot1.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot1.displayName)
                     
                     person.title .= "Sir"
                     XCTAssertEqual(person.displayName.value, "Sir John")
                     
-                    XCTAssertEqual(personSnapshot1?.name, "John")
-                    XCTAssertEqual(personSnapshot1?.title, "Mr.")
-                    XCTAssertEqual(personSnapshot1?.displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot1.name, "John")
+                    XCTAssertEqual(personSnapshot1.title, "Mr.")
+                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
                     
-                    let personSnapshot2 = person.asSnapshot(in: transaction)
-                    XCTAssertEqual(person.name.value, personSnapshot2?.name)
-                    XCTAssertEqual(person.title.value, personSnapshot2?.title)
-                    XCTAssertEqual(person.displayName.value, personSnapshot2?.displayName)
+                    let personSnapshot2 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name.value, personSnapshot2.name)
+                    XCTAssertEqual(person.title.value, personSnapshot2.title)
+                    XCTAssertEqual(person.displayName.value, personSnapshot2.displayName)
+
+                    var personSnapshot3 = personSnapshot2
+                    personSnapshot3.name = "James"
+                    XCTAssertEqual(personSnapshot1.name, "John")
+                    XCTAssertEqual(personSnapshot1.displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot2.name, "John")
+                    XCTAssertEqual(personSnapshot2.displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot3.name, "James")
+                    XCTAssertEqual(personSnapshot3.displayName, "Sir John")
+
                     
                     person.pets.value.insert(dog)
                     XCTAssertEqual(person.pets.count, 1)
diff --git a/Sources/DynamicObject.swift b/Sources/DynamicObject.swift
index c4231f6..f3fb9ef 100644
--- a/Sources/DynamicObject.swift
+++ b/Sources/DynamicObject.swift
@@ -46,7 +46,7 @@ public protocol DynamicObject: AnyObject {
     /**
      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.
@@ -97,11 +97,19 @@ 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]? {
 
-        let object = context.fetchExisting(id)! as Self
+        guard let object = context.fetchExisting(id) as NSManagedObject? else {
+
+            return nil
+        }
         let rawObject = object.cs_toRaw()
-        return rawObject.dictionaryWithValues(forKeys: rawObject.entity.properties.map({ $0.name }))
+        var dictionary = rawObject.dictionaryWithValues(forKeys: Array(rawObject.entity.attributesByName.keys))
+        for case (let key, let target as NSManagedObject) in rawObject.dictionaryWithValues(forKeys: Array(rawObject.entity.relationshipsByName.keys)) {
+
+            dictionary[key] = target.objectID
+        }
+        return dictionary
     }
     
     public class func cs_fromRaw(object: NSManagedObject) -> Self {
@@ -143,7 +151,7 @@ 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]? {
 
         func initializeAttributes(mirror: Mirror, object: Self, into attributes: inout [KeyPathString: Any]) {
 
@@ -170,11 +178,14 @@ extension CoreStoreObject {
                 }
             }
         }
-        let object = context.fetchExisting(id)! as Self
+        guard let object = context.fetchExisting(id) as CoreStoreObject? else {
+
+            return nil
+        }
         var values: [KeyPathString: Any] = [:]
         initializeAttributes(
             mirror: Mirror(reflecting: object),
-            object: object,
+            object: object as! Self,
             into: &values
         )
         return values
diff --git a/Sources/LiveObject.swift b/Sources/LiveObject.swift
index 99034ae..4ca4f2e 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/LiveObject.swift
@@ -46,10 +46,12 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
     public typealias SectionID = String
     public typealias ItemID = O.ObjectID
 
-    public var snapshot: SnapshotType {
+    public var snapshot: ObjectSnapshot<O>? {
 
         return self.lazySnapshot
     }
+
+    public lazy var object: O? = self.context.fetchExisting(self.id)
     
     public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveObject<O>) -> Void) {
         
@@ -79,7 +81,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         return self.id
     }
     
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O> {
         
         let context = dataStack.unsafeContext()
         if self.context == context {
@@ -106,7 +108,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
             
             return self.lazySnapshot
         }
-        return .init(objectID: self.id, context: context)
+        return ObjectSnapshot<O>(objectID: self.id, context: context)
     }
     
     public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
@@ -116,7 +118,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
             
             return self.lazySnapshot
         }
-        return .init(objectID: self.id, context: context)
+        return ObjectSnapshot<O>(objectID: self.id, context: context)
     }
 
 
@@ -159,7 +161,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     fileprivate let rawObjectWillChange: Any?
 
-    fileprivate init(objectID: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>) {
+    fileprivate init(objectID: O.ObjectID, context: NSManagedObjectContext, initializer: @escaping (NSManagedObjectID, NSManagedObjectContext) -> ObjectSnapshot<O>?) {
 
         self.id = objectID
         self.context = context
@@ -179,24 +181,31 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         }
         self.$lazySnapshot.initialize({ initializer(objectID, context) })
         
-        context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (objectIDs) in
+        context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (updatedIDs, deletedIDs) in
 
             guard let self = self else {
 
                 return
             }
-            self.willChange()
-            self.$lazySnapshot.reset({ initializer(objectID, context) })
-            self.notifyObservers()
-            self.didChange()
+            if deletedIDs.contains(objectID) {
+
+                self.object = nil
+
+                self.willChange()
+                self.$lazySnapshot.reset({ nil })
+                self.notifyObservers()
+                self.didChange()
+            }
+            else if updatedIDs.contains(objectID) {
+
+                self.willChange()
+                self.$lazySnapshot.reset({ initializer(objectID, context) })
+                self.notifyObservers()
+                self.didChange()
+            }
         }
     }
 
-    fileprivate var object: O {
-
-        return self.context.fetchExisting(self.id)!
-    }
-
 
     // MARK: Private
     
@@ -204,7 +213,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
     private let context: NSManagedObjectContext
 
     @Internals.LazyNonmutating(uninitialized: ())
-    private var lazySnapshot: ObjectSnapshot<O>
+    private var lazySnapshot: ObjectSnapshot<O>?
     
     private lazy var observers: NSMapTable<AnyObject, Internals.Closure<LiveObject<O>, Void>> = .weakToStrongObjects()
 
@@ -302,9 +311,9 @@ extension LiveObject where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V {
+    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
@@ -312,15 +321,15 @@ extension LiveObject where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V {
+    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
@@ -328,7 +337,7 @@ extension LiveObject where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
@@ -336,22 +345,30 @@ extension LiveObject where O: CoreStoreObject {
      */
     public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D] {
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D]? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D> {
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D>? {
 
-        return self.snapshot[dynamicMember: member]
+        return self.object?[keyPath: member].value
+    }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public subscript<V>(dynamicMember member: KeyPath<O, V>) -> V? {
+
+        return self.object?[keyPath: member]
     }
 }
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 28a54e9..589e99b 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -106,7 +106,7 @@ extension NSManagedObjectContext {
     }
 
     @nonobjc
-    internal func objectsDidChangeObserver<U: AnyObject>(for observer: U) -> Internals.SharedNotificationObserver<Set<NSManagedObjectID>> {
+    internal func objectsDidChangeObserver<U: AnyObject>(for observer: U) -> Internals.SharedNotificationObserver<(updated: Set<NSManagedObjectID>, deleted: Set<NSManagedObjectID>)> {
 
         return self.userInfo(for: .objectsChangeObserver(U.self)) { [unowned self] in
 
@@ -114,11 +114,11 @@ extension NSManagedObjectContext {
                 notificationName: .NSManagedObjectContextObjectsDidChange,
                 object: self,
                 queue: .main,
-                sharedValue: { (notification) -> Set<NSManagedObjectID> in
+                sharedValue: { (notification) -> (updated: Set<NSManagedObjectID>, deleted: Set<NSManagedObjectID>) in
 
                     guard let userInfo = notification.userInfo else {
 
-                        return []
+                        return (updated: [], deleted: [])
                     }
                     var updatedObjectIDs: Set<NSManagedObjectID> = []
                     if let updatedObjects = userInfo[NSUpdatedObjectsKey] as? Set<NSManagedObjectID> {
@@ -129,7 +129,8 @@ extension NSManagedObjectContext {
 
                         updatedObjectIDs.formUnion(mergedObjects)
                     }
-                    return updatedObjectIDs
+                    let deletedObjectIDs: Set<NSManagedObjectID> = (userInfo[NSDeletedObjectsKey] as? Set<NSManagedObjectID>) ?? []
+                    return (updated: updatedObjectIDs, deleted: deletedObjectIDs)
                 }
             )
         }
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 85fba5d..8f88c1f 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -46,7 +46,7 @@ public protocol ObjectRepresentation {
     /**
      An instance that may be observed for object changes.
      */
-    func asLiveObject(in dataStack: DataStack) -> LiveObject<ObjectType>?
+    func asLiveObject(in dataStack: DataStack) -> LiveObject<ObjectType>
 
     /**
      A read-only instance in the `DataStack`.
@@ -82,10 +82,10 @@ extension DynamicObject where Self: ObjectRepresentation {
         return self.cs_id()
     }
 
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<Self>? {
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<Self> {
 
         let context = dataStack.unsafeContext()
-        return .init(objectID: self.cs_id(), context: context)
+        return LiveObject<Self>(objectID: self.cs_id(), context: context)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> Self? {
@@ -111,12 +111,12 @@ extension DynamicObject where Self: ObjectRepresentation {
     public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<Self>? {
 
         let context = dataStack.unsafeContext()
-        return .init(objectID: self.cs_id(), context: context)
+        return ObjectSnapshot<Self>(objectID: self.cs_id(), context: context)
     }
 
     public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<Self>? {
 
         let context = transaction.unsafeContext()
-        return .init(objectID: self.cs_id(), context: context)
+        return ObjectSnapshot<Self>(objectID: self.cs_id(), context: context)
     }
 }
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index a6be1be..5c2dd3d 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -51,10 +51,10 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
         return self.id
     }
     
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O>? {
+    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O> {
         
         let context = dataStack.unsafeContext()
-        return .init(objectID: self.id, context: context)
+        return LiveObject<O>(objectID: self.id, context: context)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> O? {
@@ -70,21 +70,13 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
     public func asSnapshot(in dataStack: DataStack) -> ObjectSnapshot<O>? {
         
         let context = dataStack.unsafeContext()
-        if self.context == context {
-            
-            return self
-        }
-        return .init(objectID: self.id, context: context)
+        return ObjectSnapshot<O>(objectID: self.id, context: context)
     }
     
     public func asSnapshot(in transaction: BaseDataTransaction) -> ObjectSnapshot<O>? {
         
         let context = transaction.unsafeContext()
-        if self.context == context {
-            
-            return self
-        }
-        return .init(objectID: self.id, context: context)
+        return ObjectSnapshot<O>(objectID: self.id, context: context)
     }
 
 
@@ -93,7 +85,7 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
     public static func == (_ lhs: Self, _ rhs: Self) -> Bool {
 
         return lhs.id == rhs.id
-            && lhs.values == rhs.values
+            && lhs.valuesRef == rhs.valuesRef
     }
 
 
@@ -102,25 +94,32 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
     public func hash(into hasher: inout Hasher) {
 
         hasher.combine(self.id)
-        hasher.combine(self.values)
+        hasher.combine(self.valuesRef)
     }
 
 
     // MARK: Internal
 
-    internal init(objectID: O.ObjectID, context: NSManagedObjectContext) {
+    internal init?(objectID: O.ObjectID, context: NSManagedObjectContext) {
 
+        guard let values = O.cs_snapshotDictionary(id: objectID, context: context) else {
+
+            return nil
+        }
         self.id = objectID
-        self.context = context
-        self.values = O.cs_snapshotDictionary(id: objectID, context: context) as NSDictionary
+        self.values = values
     }
 
 
     // MARK: Private
 
     private let id: O.ObjectID
-    private let context: NSManagedObjectContext
-    private let values: NSDictionary
+    private var values: [String: Any]
+
+    private var valuesRef: NSDictionary {
+
+        return self.values as NSDictionary
+    }
 }
 
 
@@ -149,8 +148,16 @@ extension ObjectSnapshot where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! V
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! V
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
@@ -158,8 +165,16 @@ extension ObjectSnapshot where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! V?
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! V?
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
@@ -167,8 +182,16 @@ extension ObjectSnapshot where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! V
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! V
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
@@ -176,34 +199,66 @@ extension ObjectSnapshot where O: CoreStoreObject {
      */
     public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! V?
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! V?
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D? {
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D.ObjectID? {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! D?
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! D.ObjectID?
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D] {
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D.ObjectID] {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! [D]
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! [D.ObjectID]
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D> {
+    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D.ObjectID> {
 
-        let key = String(keyPath: member)
-        return self.values[key] as! Set<D>
+        get {
+
+            let key = String(keyPath: member)
+            return self.values[key] as! Set<D.ObjectID>
+        }
+        set {
+
+            let key = String(keyPath: member)
+            self.values[key] = newValue
+        }
     }
 }
diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift
index 4243db4..120a799 100644
--- a/Sources/Relationship.swift
+++ b/Sources/Relationship.swift
@@ -315,7 +315,7 @@ public enum RelationshipContainer<O: CoreStoreObject> {
 
         internal var valueForSnapshot: Any {
 
-            return self.value as Any
+            return self.value?.objectID() as Any
         }
         
         
@@ -611,7 +611,7 @@ public enum RelationshipContainer<O: CoreStoreObject> {
 
         internal var valueForSnapshot: Any {
 
-            return self.value as Any
+            return self.value.map({ $0.objectID() }) as Any
         }
         
         
@@ -912,7 +912,7 @@ public enum RelationshipContainer<O: CoreStoreObject> {
 
         internal var valueForSnapshot: Any {
 
-            return self.value as Any
+            return Set(self.value.map({ $0.objectID() })) as Any
         }
         
         

From ddf599ba859a216e83294f02df26a25ea7955f11 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 18 Oct 2019 08:19:55 +0900
Subject: [PATCH 23/58] WIP: documentation

---
 CoreStore.xcodeproj/project.pbxproj           |  30 +--
 Sources/CoreStore+Observing.swift             |   4 +-
 Sources/DataStack+DataSources.swift           |  11 ++
 Sources/DataStack+Observing.swift             |   4 +-
 ...ft => EnvironmentValues+DataSources.swift} |  44 +++--
 Sources/LiveList.swift                        |  31 ++++
 Sources/LiveQuery.swift                       | 173 ------------------
 Sources/UnsafeDataTransaction+Observing.swift |   4 +-
 8 files changed, 85 insertions(+), 216 deletions(-)
 rename Sources/{EnvironmentKeys.swift => EnvironmentValues+DataSources.swift} (70%)
 delete mode 100644 Sources/LiveQuery.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 8476d39..96cc302 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -408,10 +408,10 @@
 		B55BB4D5235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
 		B55BB4D6235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
 		B55BB4D7235012AE00C33E34 /* ObjectRepresentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */; };
-		B55BB4D823503B9500C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B55BB4D923503B9600C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B55BB4DA23503B9600C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
-		B55BB4DB23503B9700C33E34 /* EnvironmentKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentKeys.swift */; };
+		B55BB4D823503B9500C33E34 /* EnvironmentValues+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */; };
+		B55BB4D923503B9600C33E34 /* EnvironmentValues+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */; };
+		B55BB4DA23503B9600C33E34 /* EnvironmentValues+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */; };
+		B55BB4DB23503B9700C33E34 /* EnvironmentValues+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */; };
 		B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; };
 		B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; };
 		B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; };
@@ -822,10 +822,6 @@
 		B5F335592348D76300FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
 		B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
 		B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
-		B5F3355C2348D93700FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
-		B5F3355D2348D93800FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
-		B5F3355E2348D93900FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
-		B5F3355F2348D93900FD649F /* LiveQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F84966234887EB0029D57B /* LiveQuery.swift */; };
 		B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496D234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496E234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
@@ -1120,9 +1116,8 @@
 		B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableObject.swift; sourceTree = "<group>"; };
 		B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableUniqueObject.swift; sourceTree = "<group>"; };
 		B5F335572348D75D00FD649F /* LiveResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveResult.swift; sourceTree = "<group>"; };
-		B5F84966234887EB0029D57B /* LiveQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveQuery.swift; sourceTree = "<group>"; };
 		B5F8496B234898240029D57B /* ListSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListSnapshot.swift; sourceTree = "<group>"; };
-		B5F849702348A6690029D57B /* EnvironmentKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentKeys.swift; sourceTree = "<group>"; };
+		B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EnvironmentValues+DataSources.swift"; sourceTree = "<group>"; };
 		B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Progress+Convenience.swift"; sourceTree = "<group>"; };
 		B5FAD6AB1B51285300714891 /* Internals.MigrationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.MigrationManager.swift; sourceTree = "<group>"; };
 		B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "CoreStore+Migration.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
@@ -1601,8 +1596,7 @@
 		B5E5FA4C22D15D3C00330931 /* DataSources */ = {
 			isa = PBXGroup;
 			children = (
-				B5F849702348A6690029D57B /* EnvironmentKeys.swift */,
-				B5F84966234887EB0029D57B /* LiveQuery.swift */,
+				B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */,
 				B50132292344ECB500FC238B /* LiveList.swift */,
 				B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */,
 				B5F8496B234898240029D57B /* ListSnapshot.swift */,
@@ -2095,7 +2089,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B5DE5230230BDA1300A22534 /* Shared.swift in Sources */,
-				B55BB4DB23503B9700C33E34 /* EnvironmentKeys.swift in Sources */,
+				B55BB4DB23503B9700C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
 				B5CA2B081F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
@@ -2276,7 +2270,6 @@
 				B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */,
 				B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */,
 				B501322A2344ECB500FC238B /* LiveList.swift in Sources */,
-				B5F3355C2348D93700FD649F /* LiveQuery.swift in Sources */,
 				B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2374,7 +2367,7 @@
 				B509C7F51E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */,
 				B50EE14323473C96009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
-				B55BB4DA23503B9600C33E34 /* EnvironmentKeys.swift in Sources */,
+				B55BB4DA23503B9600C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
 				B5E1B5951CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				18166887232B9ED60097C275 /* String+KeyPaths.swift in Sources */,
 				B5ECDC2B1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
@@ -2409,7 +2402,6 @@
 				B5E41EC11EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
 				B501FDE41CA8D1F500BE22EF /* CSListMonitor.swift in Sources */,
 				B5A1DAC91F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
-				B5F3355D2348D93800FD649F /* LiveQuery.swift in Sources */,
 				B5FE4DA31C8481E100FA6A91 /* StorageInterface.swift in Sources */,
 				B5ECDC131CA816E500C7F112 /* CSTweak.swift in Sources */,
 				B56923C51EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
@@ -2599,7 +2591,7 @@
 				B509C7F71E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5220E1F1D130810009BC71E /* CSListObserver.swift in Sources */,
 				B50EE14523473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
-				B55BB4D823503B9500C33E34 /* EnvironmentKeys.swift in Sources */,
+				B55BB4D823503B9500C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
 				B52DD1941BE1F92500949AFE /* CoreStore.swift in Sources */,
 				18166889232B9ED80097C275 /* String+KeyPaths.swift in Sources */,
 				B52DD1A61BE1F92F00949AFE /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2634,7 +2626,6 @@
 				B5220E131D1305ED009BC71E /* SectionBy.swift in Sources */,
 				B559CD4D1CAA8C6D00E4D58B /* CSStorageInterface.swift in Sources */,
 				B5E41EC31EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
-				B5F3355F2348D93900FD649F /* LiveQuery.swift in Sources */,
 				B5ECDBE91CA6BEA300C7F112 /* CSClauseTypes.swift in Sources */,
 				B5A1DACB1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B52DD1B81BE1F94000949AFE /* DataStack+Migration.swift in Sources */,
@@ -2824,7 +2815,7 @@
 				B509C7F61E54511B0061C547 /* ImportableAttributeType.swift in Sources */,
 				B5E1B5961CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */,
 				B50EE14423473C97009B8C47 /* CoreStoreObject+DataSources.swift in Sources */,
-				B55BB4D923503B9600C33E34 /* EnvironmentKeys.swift in Sources */,
+				B55BB4D923503B9600C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
 				B5ECDC2C1CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				18166888232B9ED70097C275 /* String+KeyPaths.swift in Sources */,
 				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
@@ -2859,7 +2850,6 @@
 				B501FDEA1CA8D20500BE22EF /* CSListObserver.swift in Sources */,
 				B501FDE51CA8D1F500BE22EF /* CSListMonitor.swift in Sources */,
 				B5E41EC21EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */,
-				B5F3355E2348D93900FD649F /* LiveQuery.swift in Sources */,
 				B5ECDC141CA816E500C7F112 /* CSTweak.swift in Sources */,
 				B5A1DACA1F111BFA003CF369 /* KeyPath+Querying.swift in Sources */,
 				B56321AE1BD6521C006C9394 /* Internals.NotificationObserver.swift in Sources */,
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index 8de1b06..02bfa1e 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -34,9 +34,9 @@ import CoreData
 extension CoreStore {
     
     /**
-     Using the `defaultStack`, creates an `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Using the `defaultStack`, creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `ObjectRepresentation` to observe changes from
+     - parameter object: the `DynamicObject` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
     public static func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 2f1895f..827bfc7 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -32,6 +32,17 @@ import CoreData
 // MARK: - DataStack
 
 extension DataStack {
+    
+    /**
+     Creates a `LiveObject` for the specified `DynamicObject`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
+     
+     - parameter object: the `DynamicObject` to observe changes from
+     - returns: a `LiveObject` that broadcasts changes to `object`
+     */
+    public func liveObject<O: DynamicObject>(_ object: O) -> LiveObject<O> {
+
+        return LiveObject<O>(objectID: object.cs_id(), context: self.unsafeContext())
+    }
 
     public func liveList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
 
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index 3eb7e70..f111ee0 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -33,9 +33,9 @@ import CoreData
 extension DataStack {
     
     /**
-     Creates an `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `ObjectRepresentation` to observe changes from
+     - parameter object: the `DynamicObject` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
     public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
diff --git a/Sources/EnvironmentKeys.swift b/Sources/EnvironmentValues+DataSources.swift
similarity index 70%
rename from Sources/EnvironmentKeys.swift
rename to Sources/EnvironmentValues+DataSources.swift
index 882e012..ebc55a2 100644
--- a/Sources/EnvironmentKeys.swift
+++ b/Sources/EnvironmentValues+DataSources.swift
@@ -1,5 +1,5 @@
 //
-//  EnvironmentKeys.swift
+//  EnvironmentValues+DataSources.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -28,20 +28,6 @@
 import SwiftUI
 
 
-// MARK: - DataStackEnvironmentKey
-
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-public struct DataStackEnvironmentKey: EnvironmentKey {
-
-    // MARK: Public
-    
-    public static var defaultValue: DataStack {
-        
-        return Shared.defaultStack
-    }
-}
-
-
 // MARK: - EnvironmentValues
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
@@ -49,12 +35,36 @@ extension EnvironmentValues {
 
     // MARK: Public
 
+    /**
+     The `DataStack` instance injected to `self`:
+     ```
+     @Environment(\.dataStack)
+     var dataStack: DataStack
+     ```
+     */
     public var dataStack: DataStack {
+        
         get {
-            return self[DataStackEnvironmentKey.self]
+            
+            return self[DataStackKey.self]
         }
         set {
-            self[DataStackEnvironmentKey.self] = newValue
+            
+            self[DataStackKey.self] = newValue
+        }
+    }
+
+
+    // MARK: - DataStackEnvironmentKey
+
+    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+    fileprivate struct DataStackKey: EnvironmentKey {
+
+        // MARK: FilePrivate
+        
+        fileprivate static var defaultValue: DataStack {
+            
+            return Shared.defaultStack
         }
     }
 }
diff --git a/Sources/LiveList.swift b/Sources/LiveList.swift
index fdce498..7b937aa 100644
--- a/Sources/LiveList.swift
+++ b/Sources/LiveList.swift
@@ -38,6 +38,37 @@ import SwiftUI
 
 // MARK: - LiveList
 
+/**
+ `LiveList` tracks a diffable list of `DynamicObject` instances. Unlike `ListMonitor`s, `LiveList` are more lightweight and access objects lazily. `LiveList`s are also designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. Objects that need to be notified of `LiveList` changes may register themselves to its `addObserver(_:_:)` method:
+ ```
+ let liveList = Shared.defaultStack.liveList(
+     From<Person>()
+         .where(\.title == "Engineer")
+         .orderBy(.ascending(\.lastName))
+ )
+ liveList.addObserver(self) { (liveList) in
+ 
+     // Handle changes
+ }
+ ```
+ The `LiveList` instance needs to be held on (retained) for as long as the list needs to be observed.
+ Observers registered via `addObserver(_:_:)` are not retained. `LiveList` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+ 
+ `LiveList`s may optionally be created with sections:
+ ```
+ let liveList = Shared.defaultStack.liveList(
+     From<Person>()
+         .sectionBy(\.age") { "Age \($0)" }
+         .where(\.title == "Engineer")
+         .orderBy(.ascending(\.lastName))
+ )
+ liveList.addObserver(self) { (liveList) in
+ 
+     // Handle changes
+ }
+ ```
+ */
+@available(macOS 10.12, *)
 public final class LiveList<O: DynamicObject>: Hashable {
     
     // MARK: Public
diff --git a/Sources/LiveQuery.swift b/Sources/LiveQuery.swift
deleted file mode 100644
index aefa1ce..0000000
--- a/Sources/LiveQuery.swift
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-//  LiveQuery.swift
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-//#if canImport(SwiftUI) && canImport(Combine)
-//
-//import CoreData
-//import Combine
-//import SwiftUI
-//
-//
-//#warning("TODO: autoupdating doesn't work yet")
-//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//@propertyWrapper
-//public struct LiveQuery<Result: LiveResult>: DynamicProperty {
-//    
-//    // MARK: Public
-//    
-//    @Environment(\.dataStack)
-//    public var dataStack: DataStack
-//    
-//    public typealias ObjectType = Result.ObjectType
-//    
-//    
-//    // MARK: @propertyWrapper
-//    
-//    public var wrappedValue: Result {
-//        
-//        get {
-//
-//            return self.backingWrapper!.wrappedValue
-//        }
-//        set {
-//
-//            self.backingWrapper!.wrappedValue = newValue
-//        }
-//    }
-//    
-//    public var projectedValue: ObservedObject<Result>.Wrapper {
-//
-//        return self.backingWrapper!.projectedValue
-//    }
-//    
-//
-//    // MARK: DynamicProperty
-//
-//    public mutating func update() {
-//
-//        SwiftUI.withAnimation {
-//
-//            let dataStack = self.dataStack
-//
-//            if self.backingWrapper == nil {
-//
-//                self.backingWrapper = ObservedObject(wrappedValue: self.newLiveResult(dataStack))
-//            }
-//            else {
-//
-//                self.backingWrapper!.wrappedValue = self.newLiveResult(dataStack)
-//            }
-//            self.backingWrapper!.update()
-//        }
-//    }
-//    
-//    
-//    // MARK: FilePrivate
-//    
-//    fileprivate let newLiveResult: (DataStack) -> Result
-//    
-//    fileprivate init(newLiveResult: @escaping (DataStack) -> Result) {
-//
-//        self.newLiveResult = newLiveResult
-//    }
-//    
-//    
-//    // MARK: Private
-//    
-////    private var nonMutatingWrappedValue: LazyNonmutating<Result> = .init { fatalError() }
-//    
-//    private var currentDataStack: DataStack?
-//    private var backingWrapper: ObservedObject<Result>?
-//    
-//    private mutating func set(dataStack: DataStack) -> Bool {
-//
-//        guard self.currentDataStack != dataStack else {
-//            
-//            return false
-//        }
-//        self.currentDataStack = dataStack
-//        if self.backingWrapper == nil {
-//
-//            self.backingWrapper = ObservedObject(wrappedValue: self.newLiveResult(dataStack))
-//        }
-//        else {
-//
-//            self.backingWrapper?.wrappedValue = self.newLiveResult(dataStack)
-//        }
-//        return true
-//    }
-//    
-//    
-//    // MARK: - LazyNonmutating
-//    
-//    fileprivate final class LazyNonmutating<Value> {
-//        
-//        // MARK: FilePrivate
-//        
-//        lazy var wrappedValue: Value = self.initializer()
-//
-//        init(_ initializer: @escaping () -> Value) {
-//            
-//            self.initializer = initializer
-//        }
-//        
-//
-//        // MARK: Private
-//        
-//        private var initializer: () -> Value
-//    }
-//}
-//
-//
-//#if canImport(UIKit) || canImport(AppKit)
-//
-//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//extension LiveQuery {
-//
-//    public init<D: DynamicObject>(liveList: LiveList<D>) where Result == LiveList<D> {
-//
-//        self.init(
-//            newLiveResult: { _ in liveList }
-//        )
-//    }
-//
-//    public init<D: DynamicObject>(_ clauseChain: FetchChainBuilder<D>) where Result == LiveList<D> {
-//        
-//        self.init(
-//            newLiveResult: { $0.liveList(clauseChain) }
-//        )
-//    }
-//
-//    public init<D: DynamicObject>(_ clauseChain: SectionMonitorChainBuilder<D>) where Result == LiveList<D> {
-//        
-//        self.init(
-//            newLiveResult: { $0.liveList(clauseChain) }
-//        )
-//    }
-//}
-//
-//#endif
-//
-//#endif
diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift
index be8574d..ad12bb8 100644
--- a/Sources/UnsafeDataTransaction+Observing.swift
+++ b/Sources/UnsafeDataTransaction+Observing.swift
@@ -33,9 +33,9 @@ import CoreData
 extension UnsafeDataTransaction {
     
     /**
-     Creates a `ObjectMonitor` for the specified `ObjectRepresentation`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
-     - parameter object: the `ObjectRepresentation` to observe changes from
+     - parameter object: the `DynamicObject` to observe changes from
      - returns: a `ObjectMonitor` that monitors changes to `object`
      */
     public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {

From 0b18366ab15399f131872ead787e73dd1c768be9 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 18 Oct 2019 19:36:27 +0900
Subject: [PATCH 24/58] Renamed LiveList to ListPublisher and LiveObject to
 ObjectPublisher. WIP: docs

---
 CoreStore.xcodeproj/project.pbxproj           |  76 ++--
 .../CoreStoreDemo/Base.lproj/Main.storyboard  |   8 +-
 .../CollectionViewDemoViewController.swift    |   6 +-
 .../ColorsDemo.swift                          |   4 +-
 .../ListObserverDemoViewController.swift      |   6 +-
 .../SwiftUIContainerViewController.swift      |   2 +-
 .../SwiftUI Demo/SwiftUIView.swift            |  12 +-
 ...stTests.swift => ListPublisherTests.swift} |  12 +-
 Sources/CoreStoreObject+DataSources.swift     |   2 +-
 Sources/DataStack+DataSources.swift           |  60 +--
 Sources/ListMonitor.swift                     | 170 +++------
 .../{LiveList.swift => ListPublisher.swift}   | 343 +++++++-----------
 Sources/ListSnapshot.swift                    | 222 +++++++++---
 Sources/LiveResult.swift                      |  48 ---
 .../NSManagedObjectContext+CoreStore.swift    |  20 +-
 Sources/ObjectMonitor.swift                   |   6 +
 ...LiveObject.swift => ObjectPublisher.swift} | 125 +++++--
 Sources/ObjectRepresentation.swift            |   6 +-
 Sources/ObjectSnapshot.swift                  |   8 +-
 Sources/SnapshotResult.swift                  |  44 ---
 20 files changed, 561 insertions(+), 619 deletions(-)
 rename CoreStoreTests/{LiveListTests.swift => ListPublisherTests.swift} (98%)
 rename Sources/{LiveList.swift => ListPublisher.swift} (51%)
 delete mode 100644 Sources/LiveResult.swift
 rename Sources/{LiveObject.swift => ObjectPublisher.swift} (70%)
 delete mode 100644 Sources/SnapshotResult.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 96cc302..bee2174 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -70,10 +70,10 @@
 		82BA18D81C4BBD7100A0916E /* Internals.WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */; };
 		82BA18DC1C4BBD9C00A0916E /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
 		82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
-		B501322A2344ECB500FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
-		B501322B2346A9AE00FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
-		B501322D2346A9B000FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
-		B501322E2346A9B100FC238B /* LiveList.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* LiveList.swift */; };
+		B501322A2344ECB500FC238B /* ListPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* ListPublisher.swift */; };
+		B501322B2346A9AE00FC238B /* ListPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* ListPublisher.swift */; };
+		B501322D2346A9B000FC238B /* ListPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* ListPublisher.swift */; };
+		B501322E2346A9B100FC238B /* ListPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50132292344ECB500FC238B /* ListPublisher.swift */; };
 		B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
 		B50132312346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
 		B50132322346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */; };
@@ -600,10 +600,10 @@
 		B5BF7FBD234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBE234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBF234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
-		B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
-		B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
-		B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
-		B5BF7FC4234D7B2E0070E741 /* LiveObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */; };
+		B5BF7FC1234D7B2E0070E741 /* ObjectPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */; };
+		B5BF7FC2234D7B2E0070E741 /* ObjectPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */; };
+		B5BF7FC3234D7B2E0070E741 /* ObjectPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */; };
+		B5BF7FC4234D7B2E0070E741 /* ObjectPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */; };
 		B5BF7FC6234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
 		B5BF7FC7234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
 		B5BF7FC8234D7E460070E741 /* ObjectSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */; };
@@ -668,9 +668,9 @@
 		B5D8CA772346EAEE0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
 		B5D8CA782346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
 		B5D8CA792346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */; };
-		B5D8CA7C2346EC5F0055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
-		B5D8CA7D2346EC610055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
-		B5D8CA7E2346EC610055D7D1 /* LiveListTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */; };
+		B5D8CA7C2346EC5F0055D7D1 /* ListPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */; };
+		B5D8CA7D2346EC610055D7D1 /* ListPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */; };
+		B5D8CA7E2346EC610055D7D1 /* ListPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */; };
 		B5DAFB482203D9F8003FCCD0 /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
 		B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
 		B5DBE2CD1C9914A900B5CEFA /* CSCoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */; };
@@ -722,10 +722,6 @@
 		B5E2222C1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
 		B5E2222D1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
 		B5E2222E1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */; };
-		B5E294DD2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
-		B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
-		B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
-		B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */; };
 		B5E41EC01EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC11EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
 		B5E41EC21EA9BB37006240F0 /* DynamicSchema+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */; };
@@ -818,10 +814,6 @@
 		B5ECDC331CA81CDC00C7F112 /* CSCoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDC2E1CA81CDC00C7F112 /* CSCoreStore+Transaction.swift */; };
 		B5F1DA8D1B9AA97D007C5CBB /* ImportableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */; };
 		B5F1DA901B9AA991007C5CBB /* ImportableUniqueObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */; };
-		B5F335582348D75D00FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
-		B5F335592348D76300FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
-		B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
-		B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F335572348D75D00FD649F /* LiveResult.swift */; };
 		B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496D234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
 		B5F8496E234898240029D57B /* ListSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F8496B234898240029D57B /* ListSnapshot.swift */; };
@@ -884,7 +876,7 @@
 		82BA18DE1C4BBE2600A0916E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		82BA18E01C4BBE2C00A0916E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B500810F2290CDF800F4CEA5 /* bitrise.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = bitrise.yml; sourceTree = SOURCE_ROOT; };
-		B50132292344ECB500FC238B /* LiveList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveList.swift; sourceTree = "<group>"; };
+		B50132292344ECB500FC238B /* ListPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPublisher.swift; sourceTree = "<group>"; };
 		B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FetchedDiffableDataSourceSnapshotDelegate.swift; sourceTree = "<group>"; };
 		B501323623477F9300FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
 		B501323823477FAC00FC238B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -1021,7 +1013,7 @@
 		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
 		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.TableView.swift; sourceTree = "<group>"; };
 		B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
-		B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveObject.swift; sourceTree = "<group>"; };
+		B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectPublisher.swift; sourceTree = "<group>"; };
 		B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
 		B5BF7FCA234D80910070E741 /* Internals.LazyNonmutating.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.LazyNonmutating.swift; sourceTree = "<group>"; };
 		B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UnsafeDataTransaction+Observing.swift"; sourceTree = "<group>"; };
@@ -1042,7 +1034,7 @@
 		B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		B5D7A5B51CA3BF8F005C752B /* CSInto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInto.swift; sourceTree = "<group>"; };
 		B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DataStack+DataSources.swift"; sourceTree = "<group>"; };
-		B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveListTests.swift; sourceTree = "<group>"; };
+		B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPublisherTests.swift; sourceTree = "<group>"; };
 		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
 		B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Where.Expression.swift; sourceTree = "<group>"; };
 		B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathGenericBindings.swift; sourceTree = "<group>"; };
@@ -1062,7 +1054,6 @@
 		B5E1B5A71CAA49E2007FD580 /* CSDataStack+Migrating.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSDataStack+Migrating.swift"; sourceTree = "<group>"; };
 		B5E222221CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSynchronousDataTransaction.swift; sourceTree = "<group>"; };
 		B5E222291CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSUnsafeDataTransaction.swift; sourceTree = "<group>"; };
-		B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotResult.swift; sourceTree = "<group>"; };
 		B5E41EBF1EA9BB37006240F0 /* DynamicSchema+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DynamicSchema+Convenience.swift"; sourceTree = "<group>"; };
 		B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
 		B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
@@ -1115,7 +1106,6 @@
 		B5ECDC2E1CA81CDC00C7F112 /* CSCoreStore+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSCoreStore+Transaction.swift"; sourceTree = "<group>"; };
 		B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableObject.swift; sourceTree = "<group>"; };
 		B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportableUniqueObject.swift; sourceTree = "<group>"; };
-		B5F335572348D75D00FD649F /* LiveResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveResult.swift; sourceTree = "<group>"; };
 		B5F8496B234898240029D57B /* ListSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListSnapshot.swift; sourceTree = "<group>"; };
 		B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EnvironmentValues+DataSources.swift"; sourceTree = "<group>"; };
 		B5FAD6A81B50A4B300714891 /* Progress+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Progress+Convenience.swift"; sourceTree = "<group>"; };
@@ -1264,7 +1254,7 @@
 				B5220E0B1D0D0D19009BC71E /* ImportTests.swift */,
 				B525576B1CFAF18F00E51965 /* IntoTests.swift */,
 				B5220E0F1D0DA6AB009BC71E /* ListObserverTests.swift */,
-				B5D8CA7A2346EC550055D7D1 /* LiveListTests.swift */,
+				B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */,
 				B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */,
 				B5220E071D0C5F8D009BC71E /* ObjectObserverTests.swift */,
 				B52557771D02826E00E51965 /* OrderByTests.swift */,
@@ -1597,15 +1587,13 @@
 			isa = PBXGroup;
 			children = (
 				B5F849702348A6690029D57B /* EnvironmentValues+DataSources.swift */,
-				B50132292344ECB500FC238B /* LiveList.swift */,
-				B5BF7FC0234D7B2E0070E741 /* LiveObject.swift */,
+				B50132292344ECB500FC238B /* ListPublisher.swift */,
 				B5F8496B234898240029D57B /* ListSnapshot.swift */,
+				B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */,
 				B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */,
 				B55BB4D3235012AE00C33E34 /* ObjectRepresentation.swift */,
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
-				B5F335572348D75D00FD649F /* LiveResult.swift */,
-				B5E294DC2349F8E7003E5956 /* SnapshotResult.swift */,
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
 				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */,
 				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */,
@@ -2119,7 +2107,6 @@
 				B5D339E21E948C3600C880DE /* Value.swift in Sources */,
 				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B53FBA0B1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
-				B5E294DD2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
 				B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
@@ -2133,7 +2120,7 @@
 				B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */,
 				B50564D32350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5D8CA762346E7590055D7D1 /* DataStack+DataSources.swift in Sources */,
-				B5BF7FC1234D7B2E0070E741 /* LiveObject.swift in Sources */,
+				B5BF7FC1234D7B2E0070E741 /* ObjectPublisher.swift in Sources */,
 				B5E1B5A81CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
 				B50132302346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift in Sources */,
 				B5D339F11E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
@@ -2148,7 +2135,6 @@
 				B50E175C2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5ECDC291CA81CC700C7F112 /* CSDataStack+Transaction.swift in Sources */,
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
-				B5F335582348D75D00FD649F /* LiveResult.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
 				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
@@ -2269,7 +2255,7 @@
 				B5ECDC0B1CA8161B00C7F112 /* CSGroupBy.swift in Sources */,
 				B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */,
 				B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */,
-				B501322A2344ECB500FC238B /* LiveList.swift in Sources */,
+				B501322A2344ECB500FC238B /* ListPublisher.swift in Sources */,
 				B5F8496C234898240029D57B /* ListSnapshot.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2283,7 +2269,7 @@
 				B5220E101D0DA6AB009BC71E /* ListObserverTests.swift in Sources */,
 				B5519A401CA1B17B002BEF78 /* ErrorTests.swift in Sources */,
 				B525577C1D0291FE00E51965 /* GroupByTests.swift in Sources */,
-				B5D8CA7C2346EC5F0055D7D1 /* LiveListTests.swift in Sources */,
+				B5D8CA7C2346EC5F0055D7D1 /* ListPublisherTests.swift in Sources */,
 				B52557741D02791400E51965 /* WhereTests.swift in Sources */,
 				B5DC47C61C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B525576C1CFAF18F00E51965 /* IntoTests.swift in Sources */,
@@ -2329,7 +2315,7 @@
 				82BA18CE1C4BBD7100A0916E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B56923FB1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514EB1EED8BF900BAB888 /* From+Querying.swift in Sources */,
-				B5BF7FC2234D7B2E0070E741 /* LiveObject.swift in Sources */,
+				B5BF7FC2234D7B2E0070E741 /* ObjectPublisher.swift in Sources */,
 				B596BBBC1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC011CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B55BB4D5235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
@@ -2352,7 +2338,6 @@
 				82BA18BD1C4BBD4A00A0916E /* GroupBy.swift in Sources */,
 				B5ECDC1F1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5BF7FCC234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
-				B5E294DE2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B50564D42350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B53FBA141CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
@@ -2455,7 +2440,6 @@
 				82BA18AF1C4BBD3100A0916E /* CoreStore+Transaction.swift in Sources */,
 				82BA18CB1C4BBD6400A0916E /* NSManagedObject+Convenience.swift in Sources */,
 				82BA18B51C4BBD3F00A0916E /* BaseDataTransaction+Querying.swift in Sources */,
-				B5F335592348D76300FD649F /* LiveResult.swift in Sources */,
 				B501FDDF1CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
 				B5BF7FAE234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B538BA781D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
@@ -2477,7 +2461,7 @@
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
-				B501322B2346A9AE00FC238B /* LiveList.swift in Sources */,
+				B501322B2346A9AE00FC238B /* ListPublisher.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAF1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2507,7 +2491,7 @@
 				B5220E111D0DA6AB009BC71E /* ListObserverTests.swift in Sources */,
 				B5519A411CA1B17B002BEF78 /* ErrorTests.swift in Sources */,
 				B525577D1D0291FE00E51965 /* GroupByTests.swift in Sources */,
-				B5D8CA7D2346EC610055D7D1 /* LiveListTests.swift in Sources */,
+				B5D8CA7D2346EC610055D7D1 /* ListPublisherTests.swift in Sources */,
 				B52557751D02791400E51965 /* WhereTests.swift in Sources */,
 				B5DC47C71C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B5DBE2E01C9939E100B5CEFA /* BridgingTests.m in Sources */,
@@ -2553,7 +2537,7 @@
 				B52DD1951BE1F92500949AFE /* CoreStoreError.swift in Sources */,
 				B56923FD1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514ED1EED8BF900BAB888 /* From+Querying.swift in Sources */,
-				B5BF7FC4234D7B2E0070E741 /* LiveObject.swift in Sources */,
+				B5BF7FC4234D7B2E0070E741 /* ObjectPublisher.swift in Sources */,
 				B596BBBE1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B546F9601C9A12B800D5AC55 /* CSSQliteStore.swift in Sources */,
 				B55BB4D7235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
@@ -2576,7 +2560,6 @@
 				B52DD1A11BE1F92C00949AFE /* DataStack+Transaction.swift in Sources */,
 				B5220E1C1D130801009BC71E /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B5BF7FCE234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
-				B5E294E02349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B52DD19E1BE1F92C00949AFE /* AsynchronousDataTransaction.swift in Sources */,
 				B50564D62350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
@@ -2679,7 +2662,6 @@
 				B5220E191D130761009BC71E /* ListMonitor.swift in Sources */,
 				B5220E181D130711009BC71E /* ObjectObserver.swift in Sources */,
 				B5220E251D13088E009BC71E /* ListObserver.swift in Sources */,
-				B5F3355B2348D76500FD649F /* LiveResult.swift in Sources */,
 				B538BA7A1D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
 				B5BF7FB0234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B51260821E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
@@ -2701,7 +2683,7 @@
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
-				B501322E2346A9B100FC238B /* LiveList.swift in Sources */,
+				B501322E2346A9B100FC238B /* ListPublisher.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB11FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5220E171D1306DF009BC71E /* UnsafeDataTransaction+Observing.swift in Sources */,
@@ -2731,7 +2713,7 @@
 				B5220E271D1308D1009BC71E /* ObjectObserverTests.swift in Sources */,
 				B525577E1D0291FE00E51965 /* GroupByTests.swift in Sources */,
 				B52557761D02791400E51965 /* WhereTests.swift in Sources */,
-				B5D8CA7E2346EC610055D7D1 /* LiveListTests.swift in Sources */,
+				B5D8CA7E2346EC610055D7D1 /* ListPublisherTests.swift in Sources */,
 				B5DC47C81C93D22900FA3BF3 /* MigrationChainTests.swift in Sources */,
 				B5DBE2E11C9939E100B5CEFA /* BridgingTests.m in Sources */,
 				B5220E0E1D0D0D19009BC71E /* ImportTests.swift in Sources */,
@@ -2777,7 +2759,7 @@
 				B5ECDC021CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B56923FC1EB82956007C4DC9 /* CSXcodeDataModelSchema.swift in Sources */,
 				B55514EC1EED8BF900BAB888 /* From+Querying.swift in Sources */,
-				B5BF7FC3234D7B2E0070E741 /* LiveObject.swift in Sources */,
+				B5BF7FC3234D7B2E0070E741 /* ObjectPublisher.swift in Sources */,
 				B596BBBD1DD5C39F001DCDD9 /* QueryableSource.swift in Sources */,
 				B5ECDC081CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B55BB4D6235012AE00C33E34 /* ObjectRepresentation.swift in Sources */,
@@ -2800,7 +2782,6 @@
 				B5ECDC201CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B5BF7FCD234D80910070E741 /* Internals.LazyNonmutating.swift in Sources */,
-				B5E294DF2349F8E7003E5956 /* SnapshotResult.swift in Sources */,
 				B53FBA151CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
 				B50564D52350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5E1B5AB1CAA49E2007FD580 /* CSDataStack+Migrating.swift in Sources */,
@@ -2903,7 +2884,6 @@
 				B5DE522D230BD7D600A22534 /* Internals.swift in Sources */,
 				B56321851BD65216006C9394 /* CoreStore+Logging.swift in Sources */,
 				B56321921BD65216006C9394 /* BaseDataTransaction+Querying.swift in Sources */,
-				B5F3355A2348D76500FD649F /* LiveResult.swift in Sources */,
 				B501FDE01CA8D05000BE22EF /* CSSectionBy.swift in Sources */,
 				B5BF7FAF234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift in Sources */,
 				B538BA791D15B3E30003A766 /* CoreStoreBridge.m in Sources */,
@@ -2925,7 +2905,7 @@
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
 				B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
-				B501322D2346A9B000FC238B /* LiveList.swift in Sources */,
+				B501322D2346A9B000FC238B /* ListPublisher.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB01FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
index 3805cbc..d00ba9a 100644
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -717,7 +717,7 @@
             </objects>
             <point key="canvasLocation" x="1822" y="2013"/>
         </scene>
-        <!--LiveList-->
+        <!--ListPublisher-->
         <scene sceneID="gkX-bd-Rel">
             <objects>
                 <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
@@ -768,7 +768,7 @@
                         </connections>
                     </tableView>
                     <extendedEdge key="edgesForExtendedLayout" top="YES"/>
-                    <navigationItem key="navigationItem" title="LiveList" id="5kj-jr-HoL"/>
+                    <navigationItem key="navigationItem" title="ListPublisher" id="5kj-jr-HoL"/>
                     <connections>
                         <segue destination="dX3-kR-CYC" kind="show" identifier="ObjectObserverDemoViewController" id="hyN-De-zte"/>
                     </connections>
@@ -898,7 +898,7 @@
             </objects>
             <point key="canvasLocation" x="4404" y="1144.5"/>
         </scene>
-        <!--LiveList-->
+        <!--ListPublisher-->
         <scene sceneID="CXQ-vG-dtK">
             <objects>
                 <collectionViewController id="EKY-1g-ALK" customClass="CollectionViewDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
@@ -963,7 +963,7 @@
                             <outlet property="delegate" destination="EKY-1g-ALK" id="r9k-Fz-mWc"/>
                         </connections>
                     </collectionView>
-                    <navigationItem key="navigationItem" title="LiveList" id="goy-Zu-94A"/>
+                    <navigationItem key="navigationItem" title="ListPublisher" id="goy-Zu-94A"/>
                     <connections>
                         <segue destination="dX3-kR-CYC" kind="show" identifier="ObjectObserverDemoViewController" id="k4E-dJ-1lz"/>
                     </connections>
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
index 7a4175c..362ab99 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
@@ -75,14 +75,14 @@ final class CollectionViewDemoViewController: UICollectionViewController {
                 }
             }
         )
-        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList) in
+        ColorsDemo.palettes.addObserver(self) { [weak self] (listPublisher) in
 
             guard let self = self else {
 
                 return
             }
             self.filterBarButton?.title = ColorsDemo.filter.rawValue
-            self.dataSource?.apply(liveList.snapshot, animatingDifferences: true)
+            self.dataSource?.apply(listPublisher.snapshot, animatingDifferences: true)
         }
         self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
     }
@@ -93,7 +93,7 @@ final class CollectionViewDemoViewController: UICollectionViewController {
 
         switch (segue.identifier, segue.destination, sender) {
 
-        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as LiveObject<Palette>):
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as ObjectPublisher<Palette>):
             destinationViewController.setPalette(palette)
 
         default:
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
index d012c15..931aa0b 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -75,9 +75,9 @@ struct ColorsDemo {
         return dataStack
     }()
     
-    static let palettes: LiveList<Palette> = {
+    static let palettes: ListPublisher<Palette> = {
 
-        return ColorsDemo.stack.liveList(
+        return ColorsDemo.stack.listPublisher(
             From<Palette>()
                 .sectionBy(\.colorName)
                 .orderBy(.ascending(\.hue))
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 72daae2..14f614f 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -87,14 +87,14 @@ final class ListObserverDemoViewController: UITableViewController {
                 return cell
             }
         )
-        ColorsDemo.palettes.addObserver(self) { [weak self] (liveList) in
+        ColorsDemo.palettes.addObserver(self) { [weak self] (listPublisher) in
             
             guard let self = self else {
                 
                 return
             }
             self.filterBarButton?.title = ColorsDemo.filter.rawValue
-            self.dataSource?.apply(liveList.snapshot, animatingDifferences: true)
+            self.dataSource?.apply(listPublisher.snapshot, animatingDifferences: true)
         }
         self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
     }
@@ -105,7 +105,7 @@ final class ListObserverDemoViewController: UITableViewController {
         
         switch (segue.identifier, segue.destination, sender) {
             
-        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as LiveObject<Palette>):
+        case ("ObjectObserverDemoViewController"?, let destinationViewController as ObjectObserverDemoViewController, let palette as ObjectPublisher<Palette>):
             destinationViewController.setPalette(palette)
             
         default:
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
index ea0fbad..c6bd6d1 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -25,7 +25,7 @@ final class SwiftUIContainerViewController: UIViewController {
             
             let hostingController = UIHostingController(
                 rootView: SwiftUIView(
-                    palettes: ColorsDemo.stack.liveList(
+                    palettes: ColorsDemo.stack.listPublisher(
                         From<Palette>()
                             .sectionBy(\.colorName)
                             .orderBy(.ascending(\.hue))
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 5c2ab8c..8b727cd 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -18,7 +18,7 @@ struct SwiftUIView: View {
     var dataStack: DataStack
 
     @ObservedObject
-    var palettes: LiveList<Palette>
+    var palettes: ListPublisher<Palette>
 
     var body: some View {
         NavigationView {
@@ -92,7 +92,7 @@ struct SwiftUIView: View {
                 content: {
                     Alert(
                         title: Text("SwiftUI Binding Demo"),
-                        message: Text("This demo shows how to bind to LiveList and to CoreStoreObject when using SwiftUI"),
+                        message: Text("This demo shows how to bind to ListPublisher and to CoreStoreObject when using SwiftUI"),
                         dismissButton: .cancel(Text("OK"))
                     )
                 }
@@ -112,7 +112,7 @@ struct SwiftUIView: View {
 struct ColorCell: View {
 
     @ObservedObject
-    var palette: LiveObject<Palette>
+    var palette: ObjectPublisher<Palette>
 
     var body: some View {
         HStack {
@@ -131,13 +131,13 @@ struct DetailView: View {
     var dataStack: DataStack
 
     @ObservedObject
-    var palette: LiveObject<Palette>
+    var palette: ObjectPublisher<Palette>
 
     @State var hue: Float = 0
     @State var saturation: Float = 0
     @State var brightness: Float = 0
 
-    init(palette: LiveObject<Palette>) {
+    init(palette: ObjectPublisher<Palette>) {
 
         self.palette = palette
         self.hue = Float(palette.hue ?? 0)
@@ -166,7 +166,7 @@ struct SwiftUIView_Previews: PreviewProvider {
     
     static var previews: some View {
         SwiftUIView(
-            palettes: ColorsDemo.stack.liveList(
+            palettes: ColorsDemo.stack.listPublisher(
                 From<Palette>()
                     .sectionBy(\.colorName)
                     .orderBy(.ascending(\.hue))
diff --git a/CoreStoreTests/LiveListTests.swift b/CoreStoreTests/ListPublisherTests.swift
similarity index 98%
rename from CoreStoreTests/LiveListTests.swift
rename to CoreStoreTests/ListPublisherTests.swift
index 0d8184c..c17e179 100644
--- a/CoreStoreTests/LiveListTests.swift
+++ b/CoreStoreTests/ListPublisherTests.swift
@@ -1,5 +1,5 @@
 //
-//  LiveListTests.swift
+//  ListPublisherTests.swift
 //  CoreStore iOS
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -31,18 +31,18 @@ import XCTest
 import CoreStore
 
 
-// MARK: - LiveListTests
+// MARK: - ListPublisherTests
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-class LiveListTests: BaseTestDataTestCase {
+class ListPublisherTests: BaseTestDataTestCase {
 
     @objc
-    dynamic func test_ThatLiveLists_CanReceiveInsertNotifications() {
+    dynamic func test_ThatListPublishers_CanReceiveInsertNotifications() {
 
         self.prepareStack { (stack) in
 
 //            let observer = TestListObserver()
-            let liveList = stack.liveList(
+            let listPublisher = stack.listPublisher(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
                 OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
@@ -160,7 +160,7 @@ class LiveListTests: BaseTestDataTestCase {
             )
             self.waitAndCheckExpectations()
 
-            withExtendedLifetime(liveList, {})
+            withExtendedLifetime(listPublisher, {})
         }
     }
 
diff --git a/Sources/CoreStoreObject+DataSources.swift b/Sources/CoreStoreObject+DataSources.swift
index 3147b2c..52155f4 100644
--- a/Sources/CoreStoreObject+DataSources.swift
+++ b/Sources/CoreStoreObject+DataSources.swift
@@ -11,7 +11,7 @@
 #if canImport(Combine)
 import Combine
 
-// MARK: - LiveList: ObservableObject
+// MARK: - ListPublisher: ObservableObject
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
 extension CoreStoreObject: ObservableObject {
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 827bfc7..1e899c1 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -34,24 +34,24 @@ import CoreData
 extension DataStack {
     
     /**
-     Creates a `LiveObject` for the specified `DynamicObject`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates a `ObjectPublisher` for the specified `DynamicObject`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
-     - returns: a `LiveObject` that broadcasts changes to `object`
+     - returns: a `ObjectPublisher` that broadcasts changes to `object`
      */
-    public func liveObject<O: DynamicObject>(_ object: O) -> LiveObject<O> {
+    public func objectPublisher<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
 
-        return LiveObject<O>(objectID: object.cs_id(), context: self.unsafeContext())
+        return ObjectPublisher<O>(objectID: object.cs_id(), context: self.unsafeContext())
     }
 
-    public func liveList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
+    public func listPublisher<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
 
-        return self.liveList(from, fetchClauses)
+        return self.listPublisher(from, fetchClauses)
     }
 
-    public func liveList<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> LiveList<D> {
+    public func listPublisher<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
 
-        return LiveList(
+        return ListPublisher(
             dataStack: self,
             from: from,
             sectionBy: nil,
@@ -61,31 +61,31 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
     }
 
-    public func liveList<B: FetchChainableBuilderType>(_ clauseChain: B) -> LiveList<B.ObjectType> {
+    public func listPublisher<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
-        return self.liveList(
+        return self.listPublisher(
             clauseChain.from,
             clauseChain.fetchClauses
         )
     }
 
-    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
+    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
 
-        self.liveList(
+        self.listPublisher(
             createAsynchronously: createAsynchronously,
             from, fetchClauses
         )
     }
 
-    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
+    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
 
-        _ = LiveList(
+        _ = ListPublisher(
             dataStack: self,
             from: from,
             sectionBy: nil,
@@ -95,25 +95,25 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             },
             createAsynchronously: createAsynchronously
         )
     }
 
-    public func liveList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> LiveList<D> {
+    public func listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
 
-        return self.liveList(
+        return self.listPublisher(
             from,
             sectionBy,
             fetchClauses
         )
     }
 
-    public func liveList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> LiveList<D> {
+    public func listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
 
-        return LiveList(
+        return ListPublisher(
             dataStack: self,
             from: from,
             sectionBy: sectionBy,
@@ -123,24 +123,24 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
     }
 
-    public func liveList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> LiveList<B.ObjectType> {
+    public func listPublisher<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
-        return self.liveList(
+        return self.listPublisher(
             clauseChain.from,
             clauseChain.sectionBy,
             clauseChain.fetchClauses
         )
     }
 
-    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
+    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
 
-        self.liveList(
+        self.listPublisher(
             createAsynchronously: createAsynchronously,
             from,
             sectionBy,
@@ -148,9 +148,9 @@ extension DataStack {
         )
     }
 
-    public func liveList<D>(createAsynchronously: @escaping (LiveList<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
+    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
 
-        _ = LiveList(
+        _ = ListPublisher(
             dataStack: self,
             from: from,
             sectionBy: sectionBy,
@@ -160,16 +160,16 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(LiveList<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             },
             createAsynchronously: createAsynchronously
         )
     }
 
-    public func liveList<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (LiveList<B.ObjectType>) -> Void, _ clauseChain: B) {
+    public func listPublisher<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (ListPublisher<B.ObjectType>) -> Void, _ clauseChain: B) {
 
-        self.liveList(
+        self.listPublisher(
             createAsynchronously: createAsynchronously,
             clauseChain.from,
             clauseChain.sectionBy,
diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift
index 74e0d63..85b2ab6 100644
--- a/Sources/ListMonitor.swift
+++ b/Sources/ListMonitor.swift
@@ -67,14 +67,14 @@ import CoreData
  In the example above, both `person1` and `person2` will contain the object at section=2, index=3.
  */
 @available(macOS 10.12, *)
-public final class ListMonitor<D: DynamicObject>: Hashable {
+public final class ListMonitor<O: DynamicObject>: Hashable {
     
     // MARK: Public (Accessors)
     
     /**
      The type for the objects contained bye the `ListMonitor`
      */
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
     /**
      Returns the object at the given index within the first section. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
@@ -82,7 +82,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter index: the index of the object. Using an index above the valid range will raise an exception.
      - returns: the `DynamicObject` at the specified index
      */
-    public subscript(index: Int) -> ObjectType {
+    public subscript(index: Int) -> O {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
@@ -90,7 +90,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
         if self.isSectioned {
             
-            return ObjectType.cs_fromRaw(object: (self.fetchedResultsController.fetchedObjects as NSArray?)![index] as! NSManagedObject)
+            return O.cs_fromRaw(object: (self.fetchedResultsController.fetchedObjects as NSArray?)![index] as! NSManagedObject)
         }
         return self[0, index]
     }
@@ -101,14 +101,14 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter index: the index for the object. Using an index above the valid range will return `nil`.
      - returns: the `DynamicObject` at the specified index, or `nil` if out of bounds
      */
-    public subscript(safeIndex index: Int) -> ObjectType? {
+    public subscript(safeIndex index: Int) -> O? {
         
         if self.isSectioned {
             
             let fetchedObjects = (self.fetchedResultsController.fetchedObjects as NSArray?)!
             if index < fetchedObjects.count && index >= 0 {
                 
-                return ObjectType.cs_fromRaw(object: fetchedObjects[index] as! NSManagedObject)
+                return O.cs_fromRaw(object: fetchedObjects[index] as! NSManagedObject)
             }
             return nil
         }
@@ -122,7 +122,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will raise an exception.
      - returns: the `DynamicObject` at the specified section and item index
      */
-    public subscript(sectionIndex: Int, itemIndex: Int) -> ObjectType {
+    public subscript(sectionIndex: Int, itemIndex: Int) -> O {
         
         return self[IndexPath(indexes: [sectionIndex, itemIndex])]
     }
@@ -134,7 +134,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`.
      - returns: the `DynamicObject` at the specified section and item index, or `nil` if out of bounds
      */
-    public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> ObjectType? {
+    public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> O? {
         
         guard let section = self.sectionInfo(safelyAt: sectionIndex) else {
             
@@ -153,13 +153,13 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter indexPath: the `IndexPath` for the object. Using an `indexPath` with an invalid range will raise an exception.
      - returns: the `DynamicObject` at the specified index path
      */
-    public subscript(indexPath: IndexPath) -> ObjectType {
+    public subscript(indexPath: IndexPath) -> O {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
             "Attempted to access a \(Internals.typeName(self)) outside the main thread while a refetch is in progress."
         )
-        return ObjectType.cs_fromRaw(object: self.fetchedResultsController.object(at: indexPath))
+        return O.cs_fromRaw(object: self.fetchedResultsController.object(at: indexPath))
     }
     
     /**
@@ -168,7 +168,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter indexPath: the `IndexPath` for the object. Using an `indexPath` with an invalid range will return `nil`.
      - returns: the `DynamicObject` at the specified index path, or `nil` if out of bounds
      */
-    public subscript(safeIndexPath indexPath: IndexPath) -> ObjectType? {
+    public subscript(safeIndexPath indexPath: IndexPath) -> O? {
         
         return self[
             safeSectionIndex: indexPath[0],
@@ -345,7 +345,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter object: the `DynamicObject` to search the index of
      - returns: the index of the `DynamicObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
      */
-    public func index(of object: ObjectType) -> Int? {
+    public func index(of object: O) -> Int? {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
@@ -364,7 +364,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      - parameter object: the `DynamicObject` to search the index of
      - returns: the `IndexPath` of the `DynamicObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
      */
-    public func indexPath(of object: ObjectType) -> IndexPath? {
+    public func indexPath(of object: O) -> IndexPath? {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
@@ -387,7 +387,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      
      - parameter observer: a `ListObserver` to send change notifications to
      */
-    public func addObserver<U: ListObserver>(_ observer: U) where U.ListEntityType == ObjectType {
+    public func addObserver<U: ListObserver>(_ observer: U) where U.ListEntityType == O {
         
         self.unregisterObserver(observer)
         self.registerObserver(
@@ -422,7 +422,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      
      - parameter observer: a `ListObjectObserver` to send change notifications to
      */
-    public func addObserver<U: ListObjectObserver>(_ observer: U) where U.ListEntityType == ObjectType {
+    public func addObserver<U: ListObjectObserver>(_ observer: U) where U.ListEntityType == O {
         
         self.unregisterObserver(observer)
         self.registerObserver(
@@ -476,7 +476,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      
      - parameter observer: a `ListSectionObserver` to send change notifications to
      */
-    public func addObserver<U: ListSectionObserver>(_ observer: U) where U.ListEntityType == ObjectType {
+    public func addObserver<U: ListSectionObserver>(_ observer: U) where U.ListEntityType == O {
         
         self.unregisterObserver(observer)
         self.registerObserver(
@@ -537,7 +537,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
      
      - parameter observer: a `ListObserver` to unregister notifications to
      */
-    public func removeObserver<U: ListObserver>(_ observer: U) where U.ListEntityType == ObjectType {
+    public func removeObserver<U: ListObserver>(_ observer: U) where U.ListEntityType == O {
         
         self.unregisterObserver(observer)
     }
@@ -597,7 +597,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
     
     // MARK: Equatable
     
-    public static func == (lhs: ListMonitor<ObjectType>, rhs: ListMonitor<ObjectType>) -> Bool {
+    public static func == (lhs: ListMonitor<O>, rhs: ListMonitor<O>) -> Bool {
         
         return lhs.fetchedResultsController === rhs.fetchedResultsController
     }
@@ -607,7 +607,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         return lhs.fetchedResultsController === rhs.fetchedResultsController
     }
     
-    public static func ~= (lhs: ListMonitor<ObjectType>, rhs: ListMonitor<ObjectType>) -> Bool {
+    public static func ~= (lhs: ListMonitor<O>, rhs: ListMonitor<O>) -> Bool {
         
         return lhs.fetchedResultsController === rhs.fetchedResultsController
     }
@@ -628,7 +628,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
     
     // MARK: Internal
     
-    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+    internal convenience init(dataStack: DataStack, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         self.init(
             context: dataStack.mainContext,
@@ -640,7 +640,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
+    internal convenience init(dataStack: DataStack, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<O>) -> Void) {
         
         self.init(
             context: dataStack.mainContext,
@@ -652,7 +652,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
         
         self.init(
             context: unsafeTransaction.context,
@@ -664,7 +664,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<ObjectType>) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListMonitor<O>) -> Void) {
         
         self.init(
             context: unsafeTransaction.context,
@@ -676,7 +676,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<ObjectType>) -> Void) {
+    internal func registerChangeNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<O>) -> Void) {
         
         Internals.setAssociatedRetainedObject(
             Internals.NotificationObserver(
@@ -696,7 +696,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<ObjectType>, _ object: ObjectType, _ indexPath: IndexPath?, _ newIndexPath: IndexPath?) -> Void) {
+    internal func registerObjectNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<O>, _ object: O, _ indexPath: IndexPath?, _ newIndexPath: IndexPath?) -> Void) {
         
         Internals.setAssociatedRetainedObject(
             Internals.NotificationObserver(
@@ -712,7 +712,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
                     }
                     callback(
                         self,
-                        ObjectType.cs_fromRaw(object: rawObject),
+                        O.cs_fromRaw(object: rawObject),
                         userInfo[String(describing: IndexPath.self)] as? IndexPath,
                         userInfo["\(String(describing: IndexPath.self)).New"] as? IndexPath
                     )
@@ -723,7 +723,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerSectionNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<ObjectType>, _ sectionInfo: NSFetchedResultsSectionInfo, _ sectionIndex: Int) -> Void) {
+    internal func registerSectionNotification(_ notificationKey: UnsafeRawPointer, name: Notification.Name, toObserver observer: AnyObject, callback: @escaping (_ monitor: ListMonitor<O>, _ sectionInfo: NSFetchedResultsSectionInfo, _ sectionIndex: Int) -> Void) {
         
         Internals.setAssociatedRetainedObject(
             Internals.NotificationObserver(
@@ -746,7 +746,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerObserver<U: AnyObject>(_ observer: U, willChange: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>) -> Void, didChange: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>) -> Void, willRefetch: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>) -> Void, didRefetch: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>) -> Void) {
+    internal func registerObserver<U: AnyObject>(_ observer: U, willChange: @escaping (_ observer: U, _ monitor: ListMonitor<O>) -> Void, didChange: @escaping (_ observer: U, _ monitor: ListMonitor<O>) -> Void, willRefetch: @escaping (_ observer: U, _ monitor: ListMonitor<O>) -> Void, didRefetch: @escaping (_ observer: U, _ monitor: ListMonitor<O>) -> Void) {
         
         Internals.assert(
             Thread.isMainThread,
@@ -806,7 +806,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerObserver<U: AnyObject>(_ observer: U, didInsertObject: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ object: ObjectType, _ toIndexPath: IndexPath) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ object: ObjectType, _ fromIndexPath: IndexPath) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ object: ObjectType, _ atIndexPath: IndexPath) -> Void, didMoveObject: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ object: ObjectType, _ fromIndexPath: IndexPath, _ toIndexPath: IndexPath) -> Void) {
+    internal func registerObserver<U: AnyObject>(_ observer: U, didInsertObject: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ object: O, _ toIndexPath: IndexPath) -> Void, didDeleteObject: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ object: O, _ fromIndexPath: IndexPath) -> Void, didUpdateObject: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ object: O, _ atIndexPath: IndexPath) -> Void, didMoveObject: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ object: O, _ fromIndexPath: IndexPath, _ toIndexPath: IndexPath) -> Void) {
         
         Internals.assert(
             Thread.isMainThread,
@@ -867,7 +867,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         )
     }
     
-    internal func registerObserver<U: AnyObject>(_ observer: U, didInsertSection: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ sectionInfo: NSFetchedResultsSectionInfo, _ toIndex: Int) -> Void, didDeleteSection: @escaping (_ observer: U, _ monitor: ListMonitor<ObjectType>, _ sectionInfo: NSFetchedResultsSectionInfo, _ fromIndex: Int) -> Void) {
+    internal func registerObserver<U: AnyObject>(_ observer: U, didInsertSection: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ sectionInfo: NSFetchedResultsSectionInfo, _ toIndex: Int) -> Void, didDeleteSection: @escaping (_ observer: U, _ monitor: ListMonitor<O>, _ sectionInfo: NSFetchedResultsSectionInfo, _ fromIndex: Int) -> Void) {
         
         Internals.assert(
             Thread.isMainThread,
@@ -1052,7 +1052,7 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         }
     }
     
-    private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedResultsControllerDelegate) {
+    private static func recreateFetchedResultsController(context: NSManagedObjectContext, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) -> (controller: Internals.CoreStoreFetchedResultsController, delegate: Internals.FetchedResultsControllerDelegate) {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         fetchRequest.fetchLimit = 0
@@ -1075,10 +1075,10 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
         return (fetchedResultsController, fetchedResultsControllerDelegate)
     }
     
-    private let from: From<ObjectType>
-    private let sectionBy: SectionBy<ObjectType>?
+    private let from: From<O>
+    private let sectionBy: SectionBy<O>?
     
-    private init(context: NSManagedObjectContext, transactionQueue: DispatchQueue, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((ListMonitor<ObjectType>) -> Void)?) {
+    private init(context: NSManagedObjectContext, transactionQueue: DispatchQueue, from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((ListMonitor<O>) -> Void)?) {
         
         self.isSectioned = (sectionBy != nil)
         self.from = from
@@ -1173,77 +1173,26 @@ public final class ListMonitor<D: DynamicObject>: Hashable {
             try! self.fetchedResultsController.performFetchFromSpecifiedStores()
         }
     }
-
-
-    // MARK: Deprecated
-
-    @available(*, deprecated, renamed: "hasObjects(in:)")
-    public func hasObjectsInSection(_ section: Int) -> Bool {
-
-        return self.hasObjects(in: section)
-    }
-
-    @available(*, deprecated, renamed: "numberOfObjects(in:)")
-    public func numberOfObjectsInSection(_ section: Int) -> Int {
-
-        return self.numberOfObjects(in: section)
-    }
-
-    @available(*, deprecated, renamed: "numberOfObjects(safelyIn:)")
-    public func numberOfObjectsInSection(safeSectionIndex section: Int) -> Int? {
-
-        return self.numberOfObjects(safelyIn: section)
-    }
-
-    @available(*, deprecated, renamed: "sectionInfo(at:)")
-    public func sectionInfoAtIndex(_ section: Int) -> NSFetchedResultsSectionInfo {
-
-        return self.sectionInfo(at: section)
-    }
-
-    @available(*, deprecated, renamed: "sectionInfo(safelyAt:)")
-    public func sectionInfoAtIndex(safeSectionIndex section: Int) -> NSFetchedResultsSectionInfo? {
-
-        return self.sectionInfo(safelyAt: section)
-    }
-
-    @available(*, deprecated, renamed: "targetSection(forSectionIndexTitle:at:)")
-    public func targetSectionForSectionIndex(title: String, index: Int) -> Int {
-
-        return self.targetSection(forSectionIndexTitle: title, at: index)
-    }
-
-    @available(*, deprecated, renamed: "index(of:)")
-    public func indexOf(_ object: ObjectType) -> Int? {
-
-        return self.index(of: object)
-    }
-
-    @available(*, deprecated, renamed: "indexPath(of:)")
-    public func indexPathOf(_ object: ObjectType) -> IndexPath? {
-
-        return self.indexPath(of: object)
-    }
 }
 
     
-// MARK: - ListMonitor where ListMonitor.ObjectType: NSManagedObject
+// MARK: - ListMonitor where O: NSManagedObject
 
 @available(macOS 10.12, *)
-extension ListMonitor where ListMonitor.ObjectType: NSManagedObject {
+extension ListMonitor where O: NSManagedObject {
     
     /**
      Returns all objects in all sections
      
      - returns: all objects in all sections
      */
-    public func objectsInAllSections() -> [ObjectType] {
+    public func objectsInAllSections() -> [O] {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
             "Attempted to access a \(Internals.typeName(self)) outside the main thread while a refetch is in progress."
         )
-        return (self.fetchedResultsController.dynamicCast() as NSFetchedResultsController<ObjectType>).fetchedObjects ?? []
+        return (self.fetchedResultsController.dynamicCast() as NSFetchedResultsController<O>).fetchedObjects ?? []
     }
     
     /**
@@ -1252,9 +1201,9 @@ extension ListMonitor where ListMonitor.ObjectType: NSManagedObject {
      - parameter section: the section index. Using an index outside the valid range will raise an exception.
      - returns: all objects in the specified section
      */
-    public func objects(in section: Int) -> [ObjectType] {
+    public func objects(in section: Int) -> [O] {
         
-        return (self.sectionInfo(at: section).objects as! [ObjectType]?) ?? []
+        return (self.sectionInfo(at: section).objects as! [O]?) ?? []
     }
     
     /**
@@ -1263,46 +1212,46 @@ extension ListMonitor where ListMonitor.ObjectType: NSManagedObject {
      - parameter section: the section index. Using an index outside the valid range will return `nil`.
      - returns: all objects in the specified section
      */
-    public func objects(safelyIn section: Int) -> [ObjectType]? {
+    public func objects(safelyIn section: Int) -> [O]? {
         
-        return self.sectionInfo(safelyAt: section)?.objects as! [ObjectType]?
+        return self.sectionInfo(safelyAt: section)?.objects as! [O]?
     }
 
 
     // MARK: Deprecated
 
     @available(*, deprecated, renamed: "objects(in:)")
-    public func objectsInSection(_ section: Int) -> [ObjectType] {
+    public func objectsInSection(_ section: Int) -> [O] {
 
         return self.objects(in: section)
     }
 
     @available(*, deprecated, renamed: "objects(safelyIn:)")
-    public func objectsInSection(safeSectionIndex section: Int) -> [ObjectType]? {
+    public func objectsInSection(safeSectionIndex section: Int) -> [O]? {
 
         return self.objects(safelyIn: section)
     }
 }
 
 
-// MARK: - ListMonitor where ListMonitor.ObjectType: CoreStoreObject
+// MARK: - ListMonitor where O: CoreStoreObject
 
 @available(macOS 10.12, *)
-extension ListMonitor where ListMonitor.ObjectType: CoreStoreObject {
+extension ListMonitor where O: CoreStoreObject {
     
     /**
      Returns all objects in all sections
      
      - returns: all objects in all sections
      */
-    public func objectsInAllSections() -> [ObjectType] {
+    public func objectsInAllSections() -> [O] {
         
         Internals.assert(
             !self.isPendingRefetch || Thread.isMainThread,
             "Attempted to access a \(Internals.typeName(self)) outside the main thread while a refetch is in progress."
         )
         return (self.fetchedResultsController.fetchedObjects ?? [])
-            .map(ObjectType.cs_fromRaw)
+            .map(O.cs_fromRaw)
     }
     
     /**
@@ -1311,10 +1260,10 @@ extension ListMonitor where ListMonitor.ObjectType: CoreStoreObject {
      - parameter section: the section index. Using an index outside the valid range will raise an exception.
      - returns: all objects in the specified section
      */
-    public func objects(in section: Int) -> [ObjectType] {
+    public func objects(in section: Int) -> [O] {
         
         return (self.sectionInfo(at: section).objects ?? [])
-            .map({ ObjectType.cs_fromRaw(object: $0 as! NSManagedObject) })
+            .map({ O.cs_fromRaw(object: $0 as! NSManagedObject) })
     }
     
     /**
@@ -1323,26 +1272,17 @@ extension ListMonitor where ListMonitor.ObjectType: CoreStoreObject {
      - parameter section: the section index. Using an index outside the valid range will return `nil`.
      - returns: all objects in the specified section
      */
-    public func objects(safelyIn section: Int) -> [ObjectType]? {
+    public func objects(safelyIn section: Int) -> [O]? {
         
         return (self.sectionInfo(safelyAt: section)?.objects)?
-            .map({ ObjectType.cs_fromRaw(object: $0 as! NSManagedObject) })
+            .map({ O.cs_fromRaw(object: $0 as! NSManagedObject) })
     }
 
 
-    // MARK: Deprecated
+    // MARK: - Deprecated
 
-    @available(*, deprecated, renamed: "objects(in:)")
-    public func objectsInSection(_ section: Int) -> [ObjectType] {
-
-        return self.objects(in: section)
-    }
-
-    @available(*, deprecated, renamed: "objects(safelyIn:)")
-    public func objectsInSection(safeSectionIndex section: Int) -> [ObjectType]? {
-
-        return self.objects(safelyIn: section)
-    }
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
diff --git a/Sources/LiveList.swift b/Sources/ListPublisher.swift
similarity index 51%
rename from Sources/LiveList.swift
rename to Sources/ListPublisher.swift
index 7b937aa..b992aa4 100644
--- a/Sources/LiveList.swift
+++ b/Sources/ListPublisher.swift
@@ -1,5 +1,5 @@
 //
-//  LiveList.swift
+//  ListPublisher.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -36,176 +36,110 @@ import SwiftUI
 #endif
 
 
-// MARK: - LiveList
+// MARK: - ListPublisher
 
 /**
- `LiveList` tracks a diffable list of `DynamicObject` instances. Unlike `ListMonitor`s, `LiveList` are more lightweight and access objects lazily. `LiveList`s are also designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. Objects that need to be notified of `LiveList` changes may register themselves to its `addObserver(_:_:)` method:
+ `ListPublisher` tracks a diffable list of `DynamicObject` instances. Unlike `ListMonitor`s, `ListPublisher` are more lightweight and access objects lazily. Objects that need to be notified of `ListPublisher` changes may register themselves to its `addObserver(_:_:)` method:
  ```
- let liveList = Shared.defaultStack.liveList(
+ let listPublisher = Shared.defaultStack.listPublisher(
      From<Person>()
          .where(\.title == "Engineer")
          .orderBy(.ascending(\.lastName))
  )
- liveList.addObserver(self) { (liveList) in
- 
+ listPublisher.addObserver(self) { (listPublisher) in
      // Handle changes
  }
  ```
- The `LiveList` instance needs to be held on (retained) for as long as the list needs to be observed.
- Observers registered via `addObserver(_:_:)` are not retained. `LiveList` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+ The `ListPublisher` instance needs to be held on (retained) for as long as the list needs to be observed.
+ Observers registered via `addObserver(_:_:)` are not retained. `ListPublisher` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
  
- `LiveList`s may optionally be created with sections:
+ `ListPublisher`s may optionally be created with sections:
  ```
- let liveList = Shared.defaultStack.liveList(
+ let listPublisher = Shared.defaultStack.listPublisher(
      From<Person>()
          .sectionBy(\.age") { "Age \($0)" }
          .where(\.title == "Engineer")
          .orderBy(.ascending(\.lastName))
  )
- liveList.addObserver(self) { (liveList) in
- 
-     // Handle changes
- }
  ```
+ All access to the `ListPublisher` items should be done via its `snapshot` value, which is a `struct` of type `ListSnapshot<O>`. `ListSnapshot`s are also designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. For detailed examples, refer to the documentation for `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView`.
  */
 @available(macOS 10.12, *)
-public final class LiveList<O: DynamicObject>: Hashable {
-    
-    // MARK: Public
+public final class ListPublisher<O: DynamicObject>: Hashable {
 
-    public typealias SectionID = SnapshotType.SectionID
-    public typealias ItemID = SnapshotType.ItemID
+    // MARK: Public (Accessors)
 
-    public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
+    /**
+     The `DynamicObject` type associated with this list
+     */
+    public typealias ObjectType = O
 
-        let context = self.context
-        return self.snapshot
-            .itemIdentifiers(inSection: sectionID)
-            .map({ context.liveObject(objectID: $0) })
-    }
+    /**
+     The type for the section IDs
+     */
+    public typealias SectionID = ListSnapshot<O>.SectionID
 
-    public subscript(itemID itemID: ItemID) -> LiveObject<O>? {
+    /**
+     The type for the item IDs
+     */
+    public typealias ItemID = ListSnapshot<O>.ItemID
 
-        guard let validID = self.snapshot.itemIdentifiers.first(where: { $0 == itemID }) else {
-
-            return nil
-        }
-        return self.context.liveObject(objectID: validID)
-    }
-
-    public subscript(indexPath indexPath: IndexPath) -> LiveObject<O>? {
-        
-        let snapshot = self.snapshot
-        let sectionIdentifiers = snapshot.sectionIdentifiers
-        guard sectionIdentifiers.indices.contains(indexPath.section) else {
-            
-            return nil
-        }
-        let sectionID = sectionIdentifiers[indexPath.section]
-        let itemIdentifiers = snapshot.itemIdentifiers(inSection: sectionID)
-        guard itemIdentifiers.indices.contains(indexPath.item) else {
-            
-            return nil
-        }
-        let itemID = itemIdentifiers[indexPath.item]
-        return self.context.liveObject(objectID: itemID)
-    }
-
-    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
-
-        let context = self.context
-        let itemIDs = self.snapshot.itemIdentifiers(inSection: sectionID)
-        return itemIndices.map { position in
-
-            let itemID = itemIDs[position]
-            return context.liveObject(objectID: itemID)
-        }
-    }
-
-    public fileprivate(set) var snapshot: SnapshotType = .init() {
+    /**
+     A snapshot of the latest state of this list
+     */
+    public fileprivate(set) var snapshot: ListSnapshot<O> = .init() {
 
         willSet {
 
             self.willChange()
         }
         didSet {
-            
-            self.notifyObservers()
+
             self.didChange()
+            self.notifyObservers()
         }
     }
 
-    public var numberOfItems: Int {
 
-        return self.snapshot.numberOfItems
-    }
+    // MARK: Public (Observers)
 
-    public var numberOfSections: Int {
+    /**
+     Registers an object as an observer to be notified when changes to the `ListPublisher`'s snapshot occur.
 
-        return self.snapshot.numberOfSections
-    }
+     To prevent retain-cycles, `ListPublisher` only keeps `weak` references to its observers.
 
-    public var sectionIdentifiers: [SectionID] {
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
 
-        return self.snapshot.sectionIdentifiers
-    }
+     Calling `addObserver(_:_:)` multiple times on the same observer is safe.
 
-    public var items: [LiveObject<O>] {
+     - parameter observer: an object to become owner of the specified `callback`
+     - parameter callback: the closure to execute when changes occur
+     */
+    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (ListPublisher<O>) -> Void) {
 
-        let context = self.context
-        return self.snapshot.itemIdentifiers
-            .map({ context.liveObject(objectID: $0) })
-    }
-
-    public func numberOfItems(inSection identifier: SectionID) -> Int {
-
-        return self.snapshot.numberOfItems(inSection: identifier)
-    }
-
-    public func items(inSection identifier: SectionID) -> [LiveObject<O>] {
-
-        let context = self.context
-        return self.snapshot
-            .itemIdentifiers(inSection: identifier)
-            .map({ context.liveObject(objectID: $0) })
-    }
-
-    public func items(inSection identifier: SectionID, atIndices indices: IndexSet) -> [LiveObject<O>] {
-
-        let context = self.context
-        let itemIDs = self.snapshot.itemIdentifiers(inSection: identifier)
-        return indices.map { position in
-
-            let itemID = itemIDs[position]
-            return context.liveObject(objectID: itemID)
-        }
-    }
-
-    public func section(containingItem item: LiveObject<O>) -> SectionID? {
-
-        return self.snapshot.sectionIdentifier(containingItem: item.objectID())
-    }
-
-    public func indexOfItem(_ item: LiveObject<O>) -> Int? {
-
-        return self.snapshot.indexOfItem(item.objectID())
-    }
-
-    public func indexOfSection(_ identifier: SectionID) -> Int? {
-
-        return self.snapshot.indexOfSection(identifier)
-    }
-    
-    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveList<O>) -> Void) {
-        
+        Internals.assert(
+            Thread.isMainThread,
+            "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread."
+        )
         self.observers.setObject(
             Internals.Closure(callback),
             forKey: observer
         )
     }
-    
+
+    /**
+     Unregisters an object from receiving notifications for changes to the `ListPublisher`'s snapshot.
+
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+
+     - parameter observer: the object whose notifications will be unregistered
+     */
     public func removeObserver<T: AnyObject>(_ observer: T) {
-        
+
+        Internals.assert(
+            Thread.isMainThread,
+            "Attempted to remove an observer of type \(Internals.typeName(observer)) outside the main thread."
+        )
         self.observers.removeObject(forKey: observer)
     }
 
@@ -213,39 +147,57 @@ public final class LiveList<O: DynamicObject>: Hashable {
     // MARK: Public (Refetching)
 
     /**
-     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-
-     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
-
-     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`.
+     Asks the `ListPublisher` to refetch its objects using the specified `FetchChainableBuilderType`. Unlike `ListMonitor`s, a `ListPublisher`'s `refetch(...)` executes immediately.
+     ```
+     try listPublisher.refetch(
+         From<MyPersonEntity>()
+             .where(\.age > 18)
+             .orderBy(.ascending(\.age))
+     )
+     ```
+     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
      */
-    public func refetch(_ fetchClauses: FetchClause...) {
+    public func refetch<B: FetchChainableBuilderType>(_ clauseChain: B) throws where B.ObjectType == O {
 
-        self.refetch(fetchClauses)
+        try self.refetch(
+            from: clauseChain.from,
+            sectionBy: nil,
+            applyFetchClauses: { (fetchRequest) in
+
+                clauseChain.fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+            }
+        )
     }
 
     /**
-     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-
-     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
-
-     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-     - Important: Starting CoreStore 4.0, all `FetchClause`s required by the `ListMonitor` should be provided in the arguments list of `refetch(...)`.
+    Asks the `ListPublisher` to refetch its objects using the specified `SectionMonitorBuilderType`. Unlike `ListMonitor`s, a `ListPublisher`'s `refetch(...)` executes immediately.
+     ```
+     try listPublisher.refetch(
+         From<MyPersonEntity>()
+             .sectionBy(\.age, { "\($0!) years old" })
+             .where(\.age > 18)
+             .orderBy(.ascending(\.age))
+     )
+     ```
+     - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
      */
-    public func refetch(_ fetchClauses: [FetchClause]) {
+    public func refetch<B: SectionMonitorBuilderType>(_ clauseChain: B) throws where B.ObjectType == O {
 
-        self.refetch { (fetchRequest) in
+        try self.refetch(
+            from: clauseChain.from,
+            sectionBy: clauseChain.sectionBy,
+            applyFetchClauses: { (fetchRequest) in
 
-            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
-        }
+                clauseChain.fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
+            }
+        )
     }
 
 
     // MARK: Public (3rd Party Utilities)
 
     /**
-     Allow external libraries to store custom data in the `ListMonitor`. App code should rarely have a need for this.
+     Allow external libraries to store custom data in the `ListPublisher`. App code should rarely have a need for this.
      ```
      enum Static {
          static var myDataKey: Void?
@@ -259,7 +211,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
     // MARK: Equatable
 
-    public static func == (_ lhs: LiveList, _ rhs: LiveList) -> Bool {
+    public static func == (_ lhs: ListPublisher, _ rhs: ListPublisher) -> Bool {
 
         return lhs === rhs
     }
@@ -271,13 +223,6 @@ public final class LiveList<O: DynamicObject>: Hashable {
 
         hasher.combine(ObjectIdentifier(self))
     }
-    
-    
-    // MARK: LiveResult
-    
-    public typealias ObjectType = O
-    
-    public typealias SnapshotType = ListSnapshot<O>
 
 
     // MARK: Internal
@@ -293,7 +238,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         )
     }
 
-    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (LiveList<ObjectType>) -> Void) {
+    internal convenience init(dataStack: DataStack, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListPublisher<ObjectType>) -> Void) {
 
         self.init(
             context: dataStack.mainContext,
@@ -315,7 +260,7 @@ public final class LiveList<O: DynamicObject>: Hashable {
         )
     }
 
-    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (LiveList<ObjectType>) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: @escaping (ListPublisher<ObjectType>) -> Void) {
 
         self.init(
             context: unsafeTransaction.context,
@@ -326,36 +271,26 @@ public final class LiveList<O: DynamicObject>: Hashable {
         )
     }
 
-    internal func refetch(_ applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+    internal func refetch(from: From<O>, sectionBy: SectionBy<O>?, applyFetchClauses: @escaping (_ fetchRequest:  Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) throws {
 
-        self.applyFetchClauses = applyFetchClauses
+        let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
+            context: self.fetchedResultsController.managedObjectContext,
+            from: from,
+            sectionBy: sectionBy,
+            applyFetchClauses: applyFetchClauses
+        )
 
-        DispatchQueue.main.async { [weak self] () -> Void in
+        try newFetchedResultsController.performFetchFromSpecifiedStores()
 
-            guard let `self` = self else {
+        newFetchedResultsControllerDelegate.handler = self
 
-                return
-            }
-
-            let (newFetchedResultsController, newFetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
-                context: self.fetchedResultsController.managedObjectContext,
-                from: self.from,
-                sectionBy: self.sectionBy,
-                applyFetchClauses: self.applyFetchClauses
-            )
-            newFetchedResultsControllerDelegate.handler = self
-
-            do {
-
-                try newFetchedResultsController.performFetchFromSpecifiedStores()
-            }
-            catch {
-
-                // DataStack may have been deallocated
-                return
-            }
-            (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = (newFetchedResultsController, newFetchedResultsControllerDelegate)
-        }
+        self.query = (
+            from: from,
+            sectionBy: sectionBy,
+            sectionIndexTransformer: sectionBy?.sectionIndexTransformer ?? { $0 },
+            applyFetchClauses: applyFetchClauses
+        )
+        (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = (newFetchedResultsController, newFetchedResultsControllerDelegate)
     }
 
     deinit {
@@ -372,16 +307,19 @@ public final class LiveList<O: DynamicObject>: Hashable {
     
     // MARK: Private
 
+    private var query: (
+        from: From<O>,
+        sectionBy: SectionBy<O>?,
+        sectionIndexTransformer: (_ sectionName: KeyPathString?) -> String?,
+        applyFetchClauses: (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void
+    )
+
     private var fetchedResultsController: Internals.CoreStoreFetchedResultsController
     private var fetchedResultsControllerDelegate: Internals.FetchedDiffableDataSourceSnapshotDelegate
-    private let sectionIndexTransformer: (_ sectionName: KeyPathString?) -> String?
-    private var applyFetchClauses: (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void
     private var observerForWillChangePersistentStore: Internals.NotificationObserver!
     private var observerForDidChangePersistentStore: Internals.NotificationObserver!
 
-    private let from: From<ObjectType>
-    private let sectionBy: SectionBy<ObjectType>?
-    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<LiveList<O>, Void>> = .weakToStrongObjects()
+    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<ListPublisher<O>, Void>> = .weakToStrongObjects()
 
     private lazy var context: NSManagedObjectContext = self.fetchedResultsController.managedObjectContext
 
@@ -407,10 +345,14 @@ public final class LiveList<O: DynamicObject>: Hashable {
         return (fetchedResultsController, fetchedResultsControllerDelegate)
     }
 
-    private init(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((LiveList<ObjectType>) -> Void)?) {
+    private init(context: NSManagedObjectContext, from: From<ObjectType>, sectionBy: SectionBy<ObjectType>?, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void, createAsynchronously: ((ListPublisher<ObjectType>) -> Void)?) {
 
-        self.from = from
-        self.sectionBy = sectionBy
+        self.query = (
+            from: from,
+            sectionBy: sectionBy,
+            sectionIndexTransformer: sectionBy?.sectionIndexTransformer ?? { $0 },
+            applyFetchClauses: applyFetchClauses
+        )
         (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = Self.recreateFetchedResultsController(
             context: context,
             from: from,
@@ -433,15 +375,6 @@ public final class LiveList<O: DynamicObject>: Hashable {
             self.rawObjectWillChange = nil
         }
 
-        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
-
-            self.sectionIndexTransformer = sectionIndexTransformer
-        }
-        else {
-
-            self.sectionIndexTransformer = { $0 }
-        }
-        self.applyFetchClauses = applyFetchClauses
         self.fetchedResultsControllerDelegate.handler = self
 
         try! self.fetchedResultsController.performFetchFromSpecifiedStores()
@@ -455,15 +388,15 @@ public final class LiveList<O: DynamicObject>: Hashable {
         }
         for closure in enumerator {
 
-            (closure as! Internals.Closure<LiveList<O>, Void>).invoke(with: self)
+            (closure as! Internals.Closure<ListPublisher<O>, Void>).invoke(with: self)
         }
     }
 }
 
 
-// MARK: - LiveList: FetchedDiffableDataSourceSnapshotHandler
+// MARK: - ListPublisher: FetchedDiffableDataSourceSnapshotHandler
 
-extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
+extension ListPublisher: FetchedDiffableDataSourceSnapshotHandler {
 
     // MARK: FetchedDiffableDataSourceSnapshotHandler
     
@@ -486,7 +419,7 @@ extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
     
     internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String? {
     
-        return self.sectionIndexTransformer(sectionName)
+        return self.query.sectionIndexTransformer(sectionName)
     }
 }
 
@@ -495,13 +428,13 @@ extension LiveList: FetchedDiffableDataSourceSnapshotHandler {
 import Combine
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-extension LiveList: ObservableObject {}
+extension ListPublisher: ObservableObject {}
 
 #endif
 
-// MARK: - LiveList: LiveResult
+// MARK: - ListPublisher
 
-extension LiveList: LiveResult {
+extension ListPublisher {
 
     // MARK: ObservableObject
 
@@ -515,7 +448,7 @@ extension LiveList: LiveResult {
 
     #endif
 
-    public func willChange() {
+    fileprivate func willChange() {
 
         guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) else {
 
@@ -536,8 +469,8 @@ extension LiveList: LiveResult {
         #endif
     }
 
-    public func didChange() {
+    fileprivate func didChange() {
 
-        // TODO:
+        // nothing
     }
 }
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 5f84726..fd2723e 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -36,63 +36,174 @@ import AppKit
 
 // MARK: - ListSnapshot
 
-public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollection, Hashable {
+/**
+ A `ListSnapshot` holds a stable list of `DynamicObject` identifiers. This is typically created by a `ListPublisher` and are designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. For detailed examples, see the documentation on `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView`.
 
-    // MARK: Public
+ While the `ListSnapshot` stores only object identifiers, all accessors to its items return `ObjectPublisher`s, which are lazily created. For more details, see the documentation on `ListObject`.
 
+ Since `ListSnapshot` is a value type, you can freely modify its items.
+ */
+public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
+
+    // MARK: Public (Accessors)
+
+    /**
+     The `DynamicObject` type associated with this list
+     */
+    public typealias ObjectType = O
+
+    /**
+     The type for the section IDs
+     */
     public typealias SectionID = String
+
+    /**
+     The type for the item IDs
+     */
     public typealias ItemID = O.ObjectID
-    
-    public init(byCloning snapshot: ListSnapshot<O>, for dataStack: DataStack) {
 
-//        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//            self.init(
-//                diffableSnapshot: snapshot.diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
-//                context: dataStack.mainContext
-//            )
-//        }
-//        else {
+    /**
+     Returns the object at the given index.
 
-            self.init(
-                diffableSnapshot: snapshot.diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
-                context: dataStack.mainContext
-            )
-//        }
+     - parameter index: the index of the object. Using an index above the valid range will raise an exception.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified index
+     */
+    public subscript(index: Index) -> ObjectPublisher<O> {
+
+        let context = self.context!
+        let itemID = self.diffableSnapshot.itemIdentifiers[index]
+        return context.objectPublisher(objectID: itemID)
     }
 
-    public subscript<S: Sequence>(indices indices: S) -> [LiveObject<O>] where S.Element == Index {
+    /**
+     Returns the object at the given index, or `nil` if out of bounds.
+
+     - parameter index: the index for the object. Using an index above the valid range will return `nil`.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified index, or `nil` if out of bounds
+     */
+    public subscript(safeIndex index: Index) -> ObjectPublisher<O>? {
 
         let context = self.context!
         let itemIDs = self.diffableSnapshot.itemIdentifiers
-        return indices.map { position in
+        guard itemIDs.indices.contains(index) else {
 
-            let itemID = itemIDs[position]
-            return LiveObject<O>(objectID: itemID, context: context)
+            return nil
         }
+        let itemID = itemIDs[index]
+        return context.objectPublisher(objectID: itemID)
     }
 
-    public subscript(section sectionID: SectionID) -> [LiveObject<O>] {
+    /**
+     Returns the object at the given `sectionIndex` and `itemIndex`.
+
+     - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will raise an exception.
+     - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will raise an exception.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified section and item index
+     */
+    public subscript(sectionIndex: Int, itemIndex: Int) -> ObjectPublisher<O> {
 
         let context = self.context!
-        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
-        return itemIDs.map {
-
-            return LiveObject<O>(objectID: $0, context: context)
-        }
+        let snapshot = self.diffableSnapshot
+        let sectionID = snapshot.sectionIdentifiers[sectionIndex]
+        let itemID = snapshot.itemIdentifiers(inSection: sectionID)[itemIndex]
+        return context.objectPublisher(objectID: itemID)
     }
 
-    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [LiveObject<O>] where S.Element == Int {
+    /**
+     Returns the object at the given section and item index, or `nil` if out of bounds.
+
+     - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will return `nil`.
+     - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified section and item index, or `nil` if out of bounds
+     */
+    public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> ObjectPublisher<O>? {
 
         let context = self.context!
-        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
-        return itemIndices.map { position in
+        let snapshot = self.diffableSnapshot
+        let sectionIDs = snapshot.sectionIdentifiers
+        guard sectionIDs.indices.contains(sectionIndex) else {
 
-            let itemID = itemIDs[position]
-            return LiveObject<O>(objectID: itemID, context: context)
+            return nil
         }
+        let sectionID = sectionIDs[sectionIndex]
+        let itemIDs = snapshot.itemIdentifiers(inSection: sectionID)
+        guard itemIDs.indices.contains(itemIndex) else {
+
+            return nil
+        }
+        let itemID = itemIDs[itemIndex]
+        return context.objectPublisher(objectID: itemID)
     }
 
+    /**
+     Returns the object at the given `IndexPath`.
+
+     - parameter indexPath: the `IndexPath` for the object. Using an `indexPath` with an invalid range will raise an exception.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified index path
+     */
+    public subscript(indexPath: IndexPath) -> ObjectPublisher<O> {
+
+        return self[indexPath[0], indexPath[1]]
+    }
+
+    /**
+     Returns the object at the given `IndexPath`, or `nil` if out of bounds.
+
+     - parameter indexPath: the `IndexPath` for the object. Using an `indexPath` with an invalid range will return `nil`.
+     - returns: the `ObjectPublisher<O>` interfacing the object at the specified index path, or `nil` if out of bounds
+     */
+    public subscript(safeIndexPath indexPath: IndexPath) -> ObjectPublisher<O>? {
+
+        return self[
+            safeSectionIndex: indexPath[0],
+            safeItemIndex: indexPath[1]
+        ]
+    }
+
+    /**
+     Checks if the `ListSnapshot` has at least one section
+
+     - returns: `true` if at least one section exists, `false` otherwise
+     */
+    public func hasSections() -> Bool {
+
+        return self.diffableSnapshot.numberOfSections > 0
+    }
+
+    /**
+     Checks if the `ListSnapshot` has at least one object in any section.
+
+     - returns: `true` if at least one object in any section exists, `false` otherwise
+     */
+    public func hasObjects() -> Bool {
+
+        return self.diffableSnapshot.numberOfItems > 0
+    }
+
+    /**
+     Checks if the `ListSnapshot` has at least one object the specified section.
+
+     - parameter section: the section index. Using an index outside the valid range will return `false`.
+     - returns: `true` if at least one object in the specified section exists, `false` otherwise
+     */
+    public func hasObjects(in sectionIndex: Int) -> Bool {
+
+        let snapshot = self.diffableSnapshot
+        let sectionIDs = snapshot.sectionIdentifiers
+        guard sectionIDs.indices.contains(sectionIndex) else {
+
+            return false
+        }
+        let sectionID = sectionIDs[sectionIndex]
+        return snapshot.numberOfItems(inSection: sectionID) > 0
+    }
+
+
+
+
+
+
+
     public var numberOfItems: Int {
 
         return self.diffableSnapshot.numberOfItems
@@ -218,11 +329,39 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
 
         self.diffableSnapshot.reloadSections(identifiers)
     }
-    
-    
-    // MARK: SnapshotResult
-    
-    public typealias ObjectType = O
+
+    public func items<S: Sequence>(atIndices indices: S) -> [ObjectPublisher<O>] where S.Element == Index {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers
+        return indices.map { position in
+
+            let itemID = itemIDs[position]
+            return ObjectPublisher<O>(objectID: itemID, context: context)
+        }
+    }
+
+    public subscript(section sectionID: SectionID) -> [ObjectPublisher<O>] {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
+        return itemIDs.map {
+
+            return ObjectPublisher<O>(objectID: $0, context: context)
+        }
+    }
+
+    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [ObjectPublisher<O>] where S.Element == Int {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
+        return itemIndices.map { position in
+
+            let itemID = itemIDs[position]
+            return ObjectPublisher<O>(objectID: itemID, context: context)
+        }
+    }
+
     
     
     // MARK: RandomAccessCollection
@@ -237,17 +376,10 @@ public struct ListSnapshot<O: DynamicObject>: SnapshotResult, RandomAccessCollec
         return self.diffableSnapshot.itemIdentifiers.endIndex
     }
     
-    public subscript(position: Index) -> Element {
-        
-        let context = self.context!
-        let itemID = self.diffableSnapshot.itemIdentifiers[position]
-        return LiveObject<O>(objectID: itemID, context: context)
-    }
-    
     
     // MARK: Sequence
     
-    public typealias Element = LiveObject<O>
+    public typealias Element = ObjectPublisher<O>
     
     public typealias Index = Int
     
diff --git a/Sources/LiveResult.swift b/Sources/LiveResult.swift
deleted file mode 100644
index e2c012f..0000000
--- a/Sources/LiveResult.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-//  File.swift
-//  CoreStore iOS
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-#if canImport(UIKit) || canImport(AppKit)
-
-#if canImport(UIKit)
-import UIKit
-
-#elseif canImport(AppKit)
-import AppKit
-
-#endif
-
-
-// MARK: - LiveResult
-
-public protocol LiveResult: AnyObject {
-    
-    associatedtype ObjectType
-    associatedtype SnapshotType: SnapshotResult where SnapshotType.ObjectType == Self.ObjectType
-
-    func willChange()
-    func didChange()
-}
-
-#endif
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 589e99b..0e0be6c 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -87,21 +87,21 @@ extension NSManagedObjectContext {
     }
 
     @nonobjc
-    internal func liveObject<D: DynamicObject>(objectID: NSManagedObjectID) -> LiveObject<D> {
+    internal func objectPublisher<D: DynamicObject>(objectID: NSManagedObjectID) -> ObjectPublisher<D> {
 
-        let cache: NSMapTable<NSManagedObjectID, LiveObject<D>> = self.userInfo(for: .liveObjectsCache(D.self)) {
+        let cache: NSMapTable<NSManagedObjectID, ObjectPublisher<D>> = self.userInfo(for: .objectPublishersCache(D.self)) {
 
             return .strongToWeakObjects()
         }
         return Internals.with {
 
-            if let liveObject = cache.object(forKey: objectID) {
+            if let objectPublisher = cache.object(forKey: objectID) {
 
-                return liveObject
+                return objectPublisher
             }
-            let liveObject = LiveObject<D>(objectID: objectID, context: self)
-            cache.setObject(liveObject, forKey: objectID)
-            return liveObject
+            let objectPublisher = ObjectPublisher<D>(objectID: objectID, context: self)
+            cache.setObject(objectPublisher, forKey: objectID)
+            return objectPublisher
         }
     }
 
@@ -185,15 +185,15 @@ extension NSManagedObjectContext {
 
     private enum UserInfoKeys {
 
-        case liveObjectsCache(DynamicObject.Type)
+        case objectPublishersCache(DynamicObject.Type)
         case objectsChangeObserver(AnyObject.Type)
 
         var keyString: String {
 
             switch self {
 
-            case .liveObjectsCache(let objectType):
-                return "CoreStore.liveObjectsCache(\(Internals.typeName(objectType)))"
+            case .objectPublishersCache(let objectType):
+                return "CoreStore.objectPublishersCache(\(Internals.typeName(objectType)))"
 
             case .objectsChangeObserver:
                 return "CoreStore.objectsChangeObserver"
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index 9a9fa3a..f3367c0 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -325,6 +325,12 @@ public final class ObjectMonitor<O: DynamicObject>: Equatable {
             inObject: observer
         )
     }
+
+
+    // MARK: - Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
diff --git a/Sources/LiveObject.swift b/Sources/ObjectPublisher.swift
similarity index 70%
rename from Sources/LiveObject.swift
rename to Sources/ObjectPublisher.swift
index 4ca4f2e..c1a6a0d 100644
--- a/Sources/LiveObject.swift
+++ b/Sources/ObjectPublisher.swift
@@ -1,5 +1,5 @@
 //
-//  LiveObject.swift
+//  ObjectPublisher.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -36,44 +36,89 @@ import SwiftUI
 #endif
 
 
-// MARK: - LiveObject
+// MARK: - ObjectPublisher
 
+/**
+ The `ObjectPublisher` tracks changes to a single `DynamicObject` instance. Objects that need to be notified of `ObjectPublisher` changes may register themselves to its `addObserver(_:_:)` method:
+ ```
+ let objectPublisher = Shared.defaultStack.objectPublisher(object)
+ objectPublisher.addObserver(self) { (objectPublisher) in
+     // Handle changes
+ }
+ ```
+ The created `ObjectPublisher` instance needs to be held on (retained) for as long as the object needs to be observed.
+
+ Observers registered via `addObserver(_:_:)` are not retained. `ObjectPublisher` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+
+ The `ObjectPublisher`'s `snapshot` value is a lazy copy operation that extracts all property values at a specific point time. This cached copy is invalidated right before the `ObjectPublisher` broadcasts any changes to its observers.
+ */
 @dynamicMemberLookup
-public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable {
-
-    // MARK: Public
-
-    public typealias SectionID = String
-    public typealias ItemID = O.ObjectID
+public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hashable {
 
+    // MARK: Public (Accessors)
+    /**
+     A snapshot of the latest state of this list. Returns `nil` if the object has been deleted.
+     */
     public var snapshot: ObjectSnapshot<O>? {
 
         return self.lazySnapshot
     }
 
-    public lazy var object: O? = self.context.fetchExisting(self.id)
-    
-    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (LiveObject<O>) -> Void) {
-        
+    /**
+     The actual `DynamicObject` instance. Becomes `nil` if the object has been deleted.
+     */
+    public private(set) lazy var object: O? = self.context.fetchExisting(self.id)
+
+
+
+    // MARK: Public (Observers)
+
+    /**
+     Registers an object as an observer to be notified when changes to the `ObjectPublisher`'s snapshot occur.
+
+     To prevent retain-cycles, `ObjectPublisher` only keeps `weak` references to its observers.
+
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+
+     Calling `addObserver(_:_:)` multiple times on the same observer is safe.
+
+     - parameter observer: an object to become owner of the specified `callback`
+     - parameter callback: the closure to execute when changes occur
+     */
+    public func addObserver<T: AnyObject>(_ observer: T, _ callback: @escaping (ObjectPublisher<O>) -> Void) {
+
+        Internals.assert(
+            Thread.isMainThread,
+            "Attempted to add an observer of type \(Internals.typeName(observer)) outside the main thread."
+        )
         self.observers.setObject(
             Internals.Closure(callback),
             forKey: observer
         )
     }
-    
+
+    /**
+     Unregisters an object from receiving notifications for changes to the `ObjectPublisher`'s snapshot.
+
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+
+     - parameter observer: the object whose notifications will be unregistered
+     */
     public func removeObserver<T: AnyObject>(_ observer: T) {
-        
+
+        Internals.assert(
+            Thread.isMainThread,
+            "Attempted to remove an observer of type \(Internals.typeName(observer)) outside the main thread."
+        )
         self.observers.removeObject(forKey: observer)
     }
-
-    deinit {
-
-        self.observers.removeAllObjects()
-    }
     
     
     // MARK: ObjectRepresentation
 
+    /**
+     The `DynamicObject` type associated with this list
+     */
     public typealias ObjectType = O
     
     public func objectID() -> O.ObjectID {
@@ -81,7 +126,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         return self.id
     }
     
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O> {
+    public func asPublisher(in dataStack: DataStack) -> ObjectPublisher<O> {
         
         let context = dataStack.unsafeContext()
         if self.context == context {
@@ -124,7 +169,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
     // MARK: Equatable
 
-    public static func == (_ lhs: LiveObject, _ rhs: LiveObject) -> Bool {
+    public static func == (_ lhs: ObjectPublisher, _ rhs: ObjectPublisher) -> Bool {
 
         return lhs.id == rhs.id
             && lhs.context == rhs.context
@@ -140,11 +185,6 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
     }
 
 
-    // MARK: LiveResult
-
-    public typealias SnapshotType = ObjectSnapshot<O>
-
-
     // MARK: Internal
 
     internal convenience init(objectID: O.ObjectID, context: NSManagedObjectContext) {
@@ -156,6 +196,11 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         )
     }
 
+    deinit {
+
+        self.observers.removeAllObjects()
+    }
+
 
     // MARK: FilePrivate
 
@@ -193,15 +238,15 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 
                 self.willChange()
                 self.$lazySnapshot.reset({ nil })
-                self.notifyObservers()
                 self.didChange()
+                self.notifyObservers()
             }
             else if updatedIDs.contains(objectID) {
 
                 self.willChange()
                 self.$lazySnapshot.reset({ initializer(objectID, context) })
-                self.notifyObservers()
                 self.didChange()
+                self.notifyObservers()
             }
         }
     }
@@ -215,7 +260,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
     @Internals.LazyNonmutating(uninitialized: ())
     private var lazySnapshot: ObjectSnapshot<O>?
     
-    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<LiveObject<O>, Void>> = .weakToStrongObjects()
+    private lazy var observers: NSMapTable<AnyObject, Internals.Closure<ObjectPublisher<O>, Void>> = .weakToStrongObjects()
 
     private func notifyObservers() {
 
@@ -225,7 +270,7 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
         }
         for closure in enumerator {
 
-            (closure as! Internals.Closure<LiveObject
+            (closure as! Internals.Closure<ObjectPublisher
                 <O>, Void>).invoke(with: self)
         }
     }
@@ -236,13 +281,13 @@ public final class LiveObject<O: DynamicObject>: ObjectRepresentation, Hashable
 import Combine
 
 @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-extension LiveObject: ObservableObject {}
+extension ObjectPublisher: ObservableObject {}
 
 #endif
 
-// MARK: - LiveObject: LiveResult
+// MARK: - ObjectPublisher
 
-extension LiveObject: LiveResult {
+extension ObjectPublisher {
 
     // MARK: ObservableObject
 
@@ -256,7 +301,7 @@ extension LiveObject: LiveResult {
     
     #endif
 
-    public func willChange() {
+    fileprivate func willChange() {
 
         guard #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) else {
 
@@ -277,17 +322,17 @@ extension LiveObject: LiveResult {
         #endif
     }
 
-    public func didChange() {
+    fileprivate func didChange() {
 
-        // TODO:
+        // nothing
     }
 }
 
 
-// MARK: - LiveObject where O: NSManagedObject
+// MARK: - ObjectPublisher where O: NSManagedObject
 
 @available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
-extension LiveObject where O: NSManagedObject {
+extension ObjectPublisher where O: NSManagedObject {
 
     // MARK: Public
 
@@ -302,9 +347,9 @@ extension LiveObject where O: NSManagedObject {
 }
 
 
-// MARK: - LiveObject where O: CoreStoreObject
+// MARK: - ObjectPublisher where O: CoreStoreObject
 
-extension LiveObject where O: CoreStoreObject {
+extension ObjectPublisher where O: CoreStoreObject {
 
     // MARK: Public
 
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 8f88c1f..3eb2f64 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -46,7 +46,7 @@ public protocol ObjectRepresentation {
     /**
      An instance that may be observed for object changes.
      */
-    func asLiveObject(in dataStack: DataStack) -> LiveObject<ObjectType>
+    func asPublisher(in dataStack: DataStack) -> ObjectPublisher<ObjectType>
 
     /**
      A read-only instance in the `DataStack`.
@@ -82,10 +82,10 @@ extension DynamicObject where Self: ObjectRepresentation {
         return self.cs_id()
     }
 
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<Self> {
+    public func asPublisher(in dataStack: DataStack) -> ObjectPublisher<Self> {
 
         let context = dataStack.unsafeContext()
-        return LiveObject<Self>(objectID: self.cs_id(), context: context)
+        return ObjectPublisher<Self>(objectID: self.cs_id(), context: context)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> Self? {
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 5c2dd3d..b4b95cd 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -37,9 +37,7 @@ import AppKit
 // MARK: - ObjectSnapshot
 
 @dynamicMemberLookup
-public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresentation, Hashable {
-
-    // MARK: SnapshotResult
+public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
 
     public typealias ObjectType = O
     
@@ -51,10 +49,10 @@ public struct ObjectSnapshot<O: DynamicObject>: SnapshotResult, ObjectRepresenta
         return self.id
     }
     
-    public func asLiveObject(in dataStack: DataStack) -> LiveObject<O> {
+    public func asPublisher(in dataStack: DataStack) -> ObjectPublisher<O> {
         
         let context = dataStack.unsafeContext()
-        return LiveObject<O>(objectID: self.id, context: context)
+        return ObjectPublisher<O>(objectID: self.id, context: context)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> O? {
diff --git a/Sources/SnapshotResult.swift b/Sources/SnapshotResult.swift
deleted file mode 100644
index a58422c..0000000
--- a/Sources/SnapshotResult.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-//  SnapshotResult.swift
-//  CoreStore
-//
-//  Copyright © 2018 John Rommel Estropia
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in all
-//  copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-//
-
-#if canImport(UIKit) || canImport(AppKit)
-
-#if canImport(UIKit)
-import UIKit
-
-#elseif canImport(AppKit)
-import AppKit
-
-#endif
-
-
-// MARK: - SnapshotResult
-
-public protocol SnapshotResult {
-    
-    associatedtype ObjectType: DynamicObject
-}
-
-#endif

From 326b897b06b54caba5bb779a7e5df6b6a2ac12ee Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sat, 19 Oct 2019 09:34:31 +0900
Subject: [PATCH 25/58] WIP: docs

---
 .../CollectionViewDemoViewController.swift    |   4 +-
 .../ColorsDemo.swift                          |   8 +-
 .../ListObserverDemoViewController.swift      |   4 +-
 .../SwiftUI Demo/SwiftUIView.swift            |  13 +-
 Sources/AsynchronousDataTransaction.swift     |  15 +
 Sources/BaseDataTransaction.swift             |  18 +
 ...edDiffableDataSourceSnapshotDelegate.swift |  47 ++-
 Sources/ListPublisher.swift                   |   8 +-
 Sources/ListSnapshot.swift                    | 347 +++++++++++++-----
 Sources/SynchronousDataTransaction.swift      |  15 +
 10 files changed, 354 insertions(+), 125 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
index 362ab99..abc664f 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
@@ -67,7 +67,7 @@ final class CollectionViewDemoViewController: UICollectionViewController {
 
                 case UICollectionView.elementKindSectionHeader:
                     let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "PaletteCollectionSectionHeaderView", for: indexPath) as! PaletteCollectionSectionHeaderView
-                    view.label?.text = ColorsDemo.palettes.sectionIdentifiers[indexPath.section]
+                    view.label?.text = ColorsDemo.palettes.snapshot.sectionIDs[indexPath.section]
                     return view
 
                 default:
@@ -110,7 +110,7 @@ final class CollectionViewDemoViewController: UICollectionViewController {
 
         self.performSegue(
             withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath: indexPath]
+            sender: ColorsDemo.palettes.snapshot[indexPath]
         )
     }
 
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
index 931aa0b..daff9e5 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -45,9 +45,11 @@ struct ColorsDemo {
         
         didSet {
             
-            self.palettes.refetch(
-                self.filter.whereClause(),
-                OrderBy<Palette>(.ascending(\.hue))
+            try! self.palettes.refetch(
+                From<Palette>()
+                    .sectionBy(\.colorName)
+                    .where(self.filter.whereClause())
+                    .orderBy(.ascending(\.hue))
             )
         }
     }
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 14f614f..3df9d0e 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -23,7 +23,7 @@ final class ListObserverDemoViewController: UITableViewController {
             switch editingStyle {
 
             case .delete:
-                let palette = ColorsDemo.palettes[indexPath: indexPath]
+                let palette = ColorsDemo.palettes.snapshot[indexPath]
                 ColorsDemo.stack.perform(
                     asynchronous: { (transaction) in
 
@@ -122,7 +122,7 @@ final class ListObserverDemoViewController: UITableViewController {
         
         self.performSegue(
             withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath: indexPath]
+            sender: ColorsDemo.palettes.snapshot[indexPath]
         )
     }
     
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 8b727cd..33706ca 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -23,20 +23,23 @@ struct SwiftUIView: View {
     var body: some View {
         NavigationView {
             List {
-                ForEach(palettes.sectionIdentifiers, id: \.self) { (sectionID) in
+                ForEach(palettes.snapshot.sectionIDs, id: \.self) { (sectionID) in
                     Section(header: Text(sectionID)) {
-                        ForEach(self.palettes[section: sectionID], id: \.self) { palette in
+                        ForEach(self.palettes.snapshot.items(inSectionWithID: sectionID), id: \.self) { palette in
                             NavigationLink(
                                 destination: DetailView(palette: palette),
                                 label: { ColorCell(palette: palette) }
                             )
                         }
                         .onDelete { itemIndices in
-                            let objectsToDelete = self.palettes[section: sectionID, itemIndices: itemIndices]
+                            let objectIDsToDelete = self.palettes.snapshot.itemIDs(
+                                inSectionWithID: sectionID,
+                                atIndices: itemIndices
+                            )
                             self.dataStack.perform(
                                 asynchronous: { transaction in
 
-                                    transaction.delete(objectsToDelete)
+                                    transaction.delete(objectIDs: objectIDsToDelete)
                                 },
                                 completion: { _ in }
                             )
@@ -44,7 +47,7 @@ struct SwiftUIView: View {
                     }
                 }
             }
-            .navigationBarTitle(Text("SwiftUI (\(palettes.numberOfItems) objects)"))
+            .navigationBarTitle(Text("SwiftUI (\(palettes.snapshot.numberOfItems) objects)"))
             .navigationBarItems(
                 leading: EditButton(),
                 trailing: HStack {
diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift
index 3c926fb..988e337 100644
--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -109,6 +109,21 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
         return super.edit(into, objectID)
     }
 
+    /**
+     Deletes the objects with the specified `NSManagedObjectID`s.
+
+     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
+     */
+    public override func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+
+        Internals.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
+        )
+
+        super.delete(objectIDs: objectIDs)
+    }
+
     /**
      Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
 
diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift
index 2d44fe4..08879d8 100644
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -154,6 +154,24 @@ public /*abstract*/ class BaseDataTransaction {
         )
         return self.fetchExisting(objectID)
     }
+
+    /**
+     Deletes the objects with the specified `NSManagedObjectID`s.
+
+     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
+     */
+    public func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+
+        Internals.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to delete an entity outside its designated queue."
+        )
+        let context = self.context
+        objectIDs.forEach {
+
+            context.fetchExisting($0).map(context.delete(_:))
+        }
+    }
     
     /**
      Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 7098e2d..3a06159 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -119,13 +119,15 @@ extension Internals {
             var snapshot = Internals.DiffableDataSourceSnapshot(
                 sections: controller.sections ?? []
             )
-            snapshot.reloadItems(self.reloadedIDs)
+            snapshot.reloadSections(self.reloadedSectionIDs)
+            snapshot.reloadItems(self.reloadedItemIDs)
             
             self.handler?.controller(
                 controller,
                 didChangeContentWith: snapshot
             )
-            self.reloadedIDs.removeAll()
+            self.reloadedItemIDs.removeAll()
+            self.reloadedSectionIDs.removeAll()
         }
 
         @objc
@@ -139,14 +141,45 @@ extension Internals {
         
         @objc
         dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
-            
-            let object = anObject as! NSManagedObject
-            self.reloadedIDs.append(object.objectID)
+
+            switch type {
+
+            case .update,
+                 .move where indexPath == newIndexPath:
+                let object = anObject as! NSManagedObject
+                self.reloadedItemIDs.append(object.objectID)
+
+            case .insert,
+                 .delete,
+                 .move:
+                 return
+
+            @unknown default:
+                return
+            }
+        }
+
+        func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
+
+            switch type {
+
+            case .update:
+                self.reloadedSectionIDs.append(sectionInfo.name)
+
+            case .insert,
+                 .delete,
+                 .move:
+                return
+
+            @unknown default:
+                return
+            }
         }
         
         
         // MARK: Private
-        
-        private var reloadedIDs: [NSManagedObjectID] = []
+
+        private var reloadedItemIDs: [NSManagedObjectID] = []
+        private var reloadedSectionIDs: [String] = []
     }
 }
diff --git a/Sources/ListPublisher.swift b/Sources/ListPublisher.swift
index b992aa4..4f14329 100644
--- a/Sources/ListPublisher.swift
+++ b/Sources/ListPublisher.swift
@@ -279,11 +279,6 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
             sectionBy: sectionBy,
             applyFetchClauses: applyFetchClauses
         )
-
-        try newFetchedResultsController.performFetchFromSpecifiedStores()
-
-        newFetchedResultsControllerDelegate.handler = self
-
         self.query = (
             from: from,
             sectionBy: sectionBy,
@@ -291,6 +286,9 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
             applyFetchClauses: applyFetchClauses
         )
         (self.fetchedResultsController, self.fetchedResultsControllerDelegate) = (newFetchedResultsController, newFetchedResultsControllerDelegate)
+
+        newFetchedResultsControllerDelegate.handler = self
+        try newFetchedResultsController.performFetchFromSpecifiedStores()
     }
 
     deinit {
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index fd2723e..ffda6c9 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -175,18 +175,18 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - returns: `true` if at least one object in any section exists, `false` otherwise
      */
-    public func hasObjects() -> Bool {
+    public func hasItems() -> Bool {
 
         return self.diffableSnapshot.numberOfItems > 0
     }
 
     /**
-     Checks if the `ListSnapshot` has at least one object the specified section.
+     Checks if the `ListSnapshot` has at least one object in the specified section.
 
-     - parameter section: the section index. Using an index outside the valid range will return `false`.
+     - parameter sectionIndex: the section index. Using an index outside the valid range will return `false`.
      - returns: `true` if at least one object in the specified section exists, `false` otherwise
      */
-    public func hasObjects(in sectionIndex: Int) -> Bool {
+    public func hasItems(inSectionIndex sectionIndex: Int) -> Bool {
 
         let snapshot = self.diffableSnapshot
         let sectionIDs = snapshot.sectionIdentifiers
@@ -198,138 +198,141 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return snapshot.numberOfItems(inSection: sectionID) > 0
     }
 
+    /**
+     Checks if the `ListSnapshot` has at least one object the specified section.
 
+     - parameter sectionID: the section identifier. Using an index outside the valid range will return `false`.
+     - returns: `true` if at least one object in the specified section exists, `false` otherwise
+     */
+    public func hasItems(inSectionWithID sectionID: SectionID) -> Bool {
 
+        let snapshot = self.diffableSnapshot
+        guard snapshot.sectionIdentifiers.contains(sectionID) else {
 
+            return false
+        }
+        return snapshot.numberOfItems(inSection: sectionID) > 0
+    }
 
-
-
+    /**
+     The number of items in all sections in the `ListSnapshot`
+     */
     public var numberOfItems: Int {
 
         return self.diffableSnapshot.numberOfItems
     }
 
+    /**
+     The number of sections in the `ListSnapshot`
+     */
     public var numberOfSections: Int {
 
         return self.diffableSnapshot.numberOfSections
     }
 
-    public var sectionIdentifiers: [SectionID] {
+    /**
+     Returns the number of items for the specified `SectionID`.
+
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - returns: The number of items in the given `SectionID`
+     */
+    public func numberOfItems(inSectionWithID sectionID: SectionID) -> Int {
+
+        return self.diffableSnapshot.numberOfItems(inSection: sectionID)
+    }
+
+    /**
+     Returns the number of items at the specified section index.
+
+     - parameter sectionIndex: the index of the section. Specifying an invalid value will raise an exception.
+     - returns: The number of items in the given `SectionID`
+     */
+    public func numberOfItems(inSectionIndex sectionIndex: Int) -> Int {
+
+        let snapshot = self.diffableSnapshot
+        let sectionID = snapshot.sectionIdentifiers[sectionIndex]
+        return snapshot.numberOfItems(inSection: sectionID)
+    }
+
+    /**
+     All section identifiers in the `ListSnapshot`
+     */
+    public var sectionIDs: [SectionID] {
 
         return self.diffableSnapshot.sectionIdentifiers
     }
 
-    public var itemIdentifiers: [ItemID] {
+    /**
+     Returns the `SectionID` that the specified `ItemID` belongs to, or `nil` if it is not in the list.
+
+     - parameter itemID: the `ItemID`
+     - returns: the `SectionID` that the specified `ItemID` belongs to, or `nil` if it is not in the list
+     */
+    public func sectionID(containingItemWithID itemID: ItemID) -> SectionID? {
+
+        return self.diffableSnapshot.sectionIdentifier(containingItem: itemID)
+    }
+
+    /**
+     All object identifiers in the `ListSnapshot`
+     */
+    public var itemIDs: [ItemID] {
 
         return self.diffableSnapshot.itemIdentifiers
     }
 
-    public func numberOfItems(inSection identifier: SectionID) -> Int {
+    /**
+     Returns the item identifiers belonging to the specified `SectionID`.
 
-        return self.diffableSnapshot.numberOfItems(inSection: identifier)
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - returns: the `ItemID` array belonging to the given `SectionID`
+     */
+    public func itemIDs(inSectionWithID sectionID: SectionID) -> [ItemID] {
+
+        return self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
     }
 
-    public func itemIdentifiers(inSection identifier: SectionID) -> [ItemID] {
+    /**
+     Returns the item identifiers belonging to the specified `SectionID` and a `Sequence` of item indices.
 
-        return self.diffableSnapshot.itemIdentifiers(inSection: identifier)
-    }
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - parameter indices: the positions of the itemIDs to return. Specifying an invalid value will raise an exception.
+     - returns: the `ItemID` array belonging to the given `SectionID` at the specified indices
+     */
+    public func itemIDs<S: Sequence>(inSectionWithID sectionID: SectionID, atIndices indices: S) -> [ItemID] where S.Element == Int {
 
-    public func itemIdentifiers(inSection identifier: SectionID, atIndices indices: IndexSet) -> [ItemID] {
-
-        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: identifier)
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
         return indices.map({ itemIDs[$0] })
     }
 
-    public func sectionIdentifier(containingItem identifier: ItemID) -> SectionID? {
+    /**
+     Returns the index of the specified `ItemID` in the whole list, or `nil` if it is not in the list.
 
-        return self.diffableSnapshot.sectionIdentifier(containingItem: identifier)
+     - parameter itemID: the `ItemID`
+     - returns: the index of the specified `ItemID`, or `nil` if it is not in the list
+     */
+    public func indexOfItem(withID itemID: ItemID) -> Index? {
+
+        return self.diffableSnapshot.indexOfItem(itemID)
     }
 
-    public func indexOfItem(_ identifier: ItemID) -> Index? {
+    /**
+     Returns the index of the specified `SectionID`, or `nil` if it is not in the list.
 
-        return self.diffableSnapshot.indexOfItem(identifier)
+     - parameter sectionID: the `SectionID`
+     - returns: the index of the specified `SectionID`, or `nil` if it is not in the list
+     */
+    public func indexOfSection(withID sectionID: SectionID) -> Int? {
+
+        return self.diffableSnapshot.indexOfSection(sectionID)
     }
 
-    public func indexOfSection(_ identifier: SectionID) -> Int? {
-
-        return self.diffableSnapshot.indexOfSection(identifier)
-    }
-
-    public mutating func appendItems(_ identifiers: [ItemID], toSection sectionIdentifier: SectionID? = nil) {
-
-        self.diffableSnapshot.appendItems(identifiers, toSection: sectionIdentifier)
-    }
-
-    public mutating func insertItems(_ identifiers: [ItemID], beforeItem beforeIdentifier: ItemID) {
-
-        self.diffableSnapshot.insertItems(identifiers, beforeItem: beforeIdentifier)
-    }
-
-    public mutating func insertItems(_ identifiers: [ItemID], afterItem afterIdentifier: ItemID) {
-
-        self.diffableSnapshot.insertItems(identifiers, afterItem: afterIdentifier)
-    }
-
-    public mutating func deleteItems(_ identifiers: [ItemID]) {
-
-        self.diffableSnapshot.deleteItems(identifiers)
-    }
-
-    public mutating func deleteAllItems() {
-
-        self.diffableSnapshot.deleteAllItems()
-    }
-
-    public mutating func moveItem(_ identifier: ItemID, beforeItem toIdentifier: ItemID) {
-
-        self.diffableSnapshot.moveItem(identifier, beforeItem: toIdentifier)
-    }
-
-    public mutating func moveItem(_ identifier: ItemID, afterItem toIdentifier: ItemID) {
-
-        self.diffableSnapshot.moveItem(identifier, afterItem: toIdentifier)
-    }
-
-    public mutating func reloadItems(_ identifiers: [ItemID]) {
-
-        self.diffableSnapshot.reloadItems(identifiers)
-    }
-
-    public mutating func appendSections(_ identifiers: [SectionID]) {
-
-        self.diffableSnapshot.appendSections(identifiers)
-    }
-
-    public mutating func insertSections(_ identifiers: [SectionID], beforeSection toIdentifier: SectionID) {
-
-        self.diffableSnapshot.insertSections(identifiers, beforeSection: toIdentifier)
-    }
-
-    public mutating func insertSections(_ identifiers: [SectionID], afterSection toIdentifier: SectionID) {
-
-        self.diffableSnapshot.insertSections(identifiers, afterSection: toIdentifier)
-    }
-
-    public mutating func deleteSections(_ identifiers: [SectionID]) {
-
-        self.diffableSnapshot.deleteSections(identifiers)
-    }
-
-    public mutating func moveSection(_ identifier: SectionID, beforeSection toIdentifier: SectionID) {
-
-        self.diffableSnapshot.moveSection(identifier, beforeSection: toIdentifier)
-    }
-
-    public mutating func moveSection(_ identifier: SectionID, afterSection toIdentifier: SectionID) {
-
-        self.diffableSnapshot.moveSection(identifier, afterSection: toIdentifier)
-    }
-
-    public mutating func reloadSections(_ identifiers: [SectionID]) {
-
-        self.diffableSnapshot.reloadSections(identifiers)
-    }
+    /**
+     Returns an array of `ObjectPublisher`s for the items at the specified indices
 
+     - parameter indices: the positions of items. Specifying an invalid value will raise an exception.
+     - returns: an array of `ObjectPublisher`s for the items at the specified indices
+     */
     public func items<S: Sequence>(atIndices indices: S) -> [ObjectPublisher<O>] where S.Element == Index {
 
         let context = self.context!
@@ -341,7 +344,13 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         }
     }
 
-    public subscript(section sectionID: SectionID) -> [ObjectPublisher<O>] {
+    /**
+     Returns an array of `ObjectPublisher`s for the items in the specified `SectionID`
+
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - returns: an array of `ObjectPublisher`s for the items in the specified `SectionID`
+     */
+    public func items(inSectionWithID sectionID: SectionID) -> [ObjectPublisher<O>] {
 
         let context = self.context!
         let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
@@ -351,7 +360,14 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         }
     }
 
-    public subscript<S: Sequence>(section sectionID: SectionID, itemIndices itemIndices: S) -> [ObjectPublisher<O>] where S.Element == Int {
+    /**
+     Returns an array of `ObjectPublisher`s for the items in the specified `SectionID` and indices
+
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - parameter itemIndices: the positions of items within the section. Specifying an invalid value will raise an exception.
+     - returns: an array of `ObjectPublisher`s for the items in the specified `SectionID` and indices
+     */
+    public func items<S: Sequence>(inSectionWithID sectionID: SectionID, atIndices itemIndices: S) -> [ObjectPublisher<O>] where S.Element == Int {
 
         let context = self.context!
         let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
@@ -362,6 +378,135 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         }
     }
 
+    /**
+     Returns a lazy sequence of `ObjectPublisher`s for the items at the specified indices
+
+     - parameter indices: the positions of items. Specifying an invalid value will raise an exception.
+     - returns: a lazy sequence of `ObjectPublisher`s for the items at the specified indices
+     */
+    public func lazy<S: Sequence>(atIndices indices: S) -> LazyMapSequence<S, ObjectPublisher<O>> where S.Element == Index {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers
+        return indices.lazy.map { position in
+
+            let itemID = itemIDs[position]
+            return ObjectPublisher<O>(objectID: itemID, context: context)
+        }
+    }
+
+    /**
+     Returns a lazy sequence of `ObjectPublisher`s for the items in the specified `SectionID`
+
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - returns: a lazy sequence of `ObjectPublisher`s for the items in the specified `SectionID`
+     */
+    public func lazy(inSectionWithID sectionID: SectionID) -> LazyMapSequence<[NSManagedObjectID], ObjectPublisher<O>> {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
+        return itemIDs.lazy.map {
+
+            return ObjectPublisher<O>(objectID: $0, context: context)
+        }
+    }
+
+    /**
+     Returns a lazy sequence of `ObjectPublisher`s for the items in the specified `SectionID` and indices
+
+     - parameter sectionID: the `SectionID`. Specifying an invalid value will raise an exception.
+     - parameter itemIndices: the positions of items within the section. Specifying an invalid value will raise an exception.
+     - returns: a lazy sequence of `ObjectPublisher`s for the items in the specified `SectionID` and indices
+     */
+    public func lazy<S: Sequence>(inSectionWithID sectionID: SectionID, atIndices itemIndices: S) -> LazyMapSequence<S, ObjectPublisher<O>> where S.Element == Int {
+
+        let context = self.context!
+        let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
+        return itemIndices.lazy.map { position in
+
+            let itemID = itemIDs[position]
+            return ObjectPublisher<O>(objectID: itemID, context: context)
+        }
+    }
+
+
+    // MARK: Public (Mutators)
+
+    public mutating func appendItems(withIDs itemIDs: [ItemID], toSectionWithID sectionID: SectionID? = nil) {
+
+        self.diffableSnapshot.appendItems(itemIDs, toSection: sectionID)
+    }
+
+    public mutating func insertItems(withIDs itemIDs: [ItemID], beforeItemID: ItemID) {
+
+        self.diffableSnapshot.insertItems(itemIDs, beforeItem: beforeItemID)
+    }
+
+    public mutating func insertItems(withIDs itemIDs: [ItemID], afterItemID: ItemID) {
+
+        self.diffableSnapshot.insertItems(itemIDs, afterItem: afterItemID)
+    }
+
+    public mutating func deleteItems(withIDs itemIDs: [ItemID]) {
+
+        self.diffableSnapshot.deleteItems(itemIDs)
+    }
+
+    public mutating func deleteAllItems() {
+
+        self.diffableSnapshot.deleteAllItems()
+    }
+
+    public mutating func moveItem(withID itemID: ItemID, beforeItemID: ItemID) {
+
+        self.diffableSnapshot.moveItem(itemID, beforeItem: beforeItemID)
+    }
+
+    public mutating func moveItem(withID itemID: ItemID, afterItemID: ItemID) {
+
+        self.diffableSnapshot.moveItem(itemID, afterItem: afterItemID)
+    }
+
+    public mutating func reloadItems(withIDs itemIDs: [ItemID]) {
+
+        self.diffableSnapshot.reloadItems(itemIDs)
+    }
+
+    public mutating func appendSections(withIDs sectionIDs: [SectionID]) {
+
+        self.diffableSnapshot.appendSections(sectionIDs)
+    }
+
+    public mutating func insertSections(withIDs sectionIDs: [SectionID], beforeSectionID: SectionID) {
+
+        self.diffableSnapshot.insertSections(sectionIDs, beforeSection: beforeSectionID)
+    }
+
+    public mutating func insertSections(withIDs sectionIDs: [SectionID], afterSectionID: SectionID) {
+
+        self.diffableSnapshot.insertSections(sectionIDs, afterSection: afterSectionID)
+    }
+
+    public mutating func deleteSections(withIDs sectionIDs: [SectionID]) {
+
+        self.diffableSnapshot.deleteSections(sectionIDs)
+    }
+
+    public mutating func moveSection(withID sectionID: SectionID, beforeSectionID: SectionID) {
+
+        self.diffableSnapshot.moveSection(sectionID, beforeSection: beforeSectionID)
+    }
+
+    public mutating func moveSection(withID sectionID: SectionID, afterSectionID: SectionID) {
+
+        self.diffableSnapshot.moveSection(sectionID, afterSection: afterSectionID)
+    }
+
+    public mutating func reloadSections(withIDs sectionIDs: [SectionID]) {
+
+        self.diffableSnapshot.reloadSections(sectionIDs)
+    }
+
     
     
     // MARK: RandomAccessCollection
diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift
index f456229..4f84a4f 100644
--- a/Sources/SynchronousDataTransaction.swift
+++ b/Sources/SynchronousDataTransaction.swift
@@ -98,6 +98,21 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
         return super.edit(into, objectID)
     }
 
+    /**
+     Deletes the objects with the specified `NSManagedObjectID`s.
+
+     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
+     */
+    public override func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+
+        Internals.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
+        )
+
+        super.delete(objectIDs: objectIDs)
+    }
+
     /**
      Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
 

From a2673956180f45f34dc88f45226372cef48397c1 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sat, 19 Oct 2019 22:17:25 +0900
Subject: [PATCH 26/58] WIP: README

---
 README.md                                     |   2 +-
 Sources/CSDataStack+Observing.swift           |   2 +-
 Sources/CoreStore+Observing.swift             |   2 +-
 Sources/DataStack+DataSources.swift           | 149 +++++++++---------
 Sources/DataStack+Observing.swift             |   2 +-
 .../DiffableDataSource.CollectionView.swift   |  92 +++++++++--
 Sources/DiffableDataSource.TableView.swift    | 101 +++++++++++-
 Sources/DiffableDataSource.swift              |   3 +
 Sources/ListSnapshot.swift                    |  84 +++++++++-
 Sources/ObjectObserver.swift                  |   2 +-
 Sources/ObjectPublisher.swift                 |   3 -
 Sources/ObjectSnapshot.swift                  |   8 +-
 Sources/UnsafeDataTransaction+Observing.swift |   2 +-
 13 files changed, 348 insertions(+), 104 deletions(-)

diff --git a/README.md b/README.md
index c355c14..e0b976d 100644
--- a/README.md
+++ b/README.md
@@ -1476,7 +1476,7 @@ class MyViewController: UIViewController, ObjectObserver {
     }
 }
 ```
-We then need to keep a `ObjectMonitor` instance and register our `ObjectObserver` as an observer:
+We then need to keep an `ObjectMonitor` instance and register our `ObjectObserver` as an observer:
 ```swift
 let person: MyPersonEntity = // ...
 self.monitor = CoreStore.monitorObject(person)
diff --git a/Sources/CSDataStack+Observing.swift b/Sources/CSDataStack+Observing.swift
index f7f9c4a..7f97735 100644
--- a/Sources/CSDataStack+Observing.swift
+++ b/Sources/CSDataStack+Observing.swift
@@ -36,7 +36,7 @@ extension CSDataStack {
      Creates a `CSObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
      
      - parameter object: the `NSManagedObject` to observe changes from
-     - returns: a `ObjectMonitor` that monitors changes to `object`
+     - returns: an `ObjectMonitor` that monitors changes to `object`
      */
     @objc
     public func monitorObject(_ object: NSManagedObject) -> CSObjectMonitor {
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index 02bfa1e..a8aa4dd 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -37,7 +37,7 @@ extension CoreStore {
      Using the `defaultStack`, creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
-     - returns: a `ObjectMonitor` that monitors changes to `object`
+     - returns: an `ObjectMonitor` that monitors changes to `object`
      */
     public static func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
         
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 1e899c1..1b1ad43 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -34,21 +34,35 @@ import CoreData
 extension DataStack {
     
     /**
-     Creates a `ObjectPublisher` for the specified `DynamicObject`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Creates an `ObjectPublisher` for the specified `DynamicObject`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
-     - returns: a `ObjectPublisher` that broadcasts changes to `object`
+     - returns: an `ObjectPublisher` that broadcasts changes to `object`
      */
     public func objectPublisher<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
 
         return ObjectPublisher<O>(objectID: object.cs_id(), context: self.unsafeContext())
     }
-
+    
+    /**
+     Creates a `ListPublisher` for the specified `From` and `FetchClause`s. Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     
+     - 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.
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
 
         return self.listPublisher(from, fetchClauses)
     }
-
+    
+    /**
+     Creates a `ListPublisher` for the specified `From` and `FetchClause`s. Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     
+     - 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.
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
 
         return ListPublisher(
@@ -66,7 +80,25 @@ extension DataStack {
             }
         )
     }
-
+    
+    /**
+     Creates a `ListPublisher` that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
+     ```
+     let listPublisher = dataStack.listPublisher(
+         From<MyPersonEntity>()
+             .where(\.age > 18)
+             .orderBy(.ascending(\.age))
+     )
+     ```
+     Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     ```
+     listPublisher.addObserver(self) { (listPublisher) in
+         // handle changes
+     }
+     ```
+     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
         return self.listPublisher(
@@ -74,34 +106,15 @@ extension DataStack {
             clauseChain.fetchClauses
         )
     }
-
-    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
-
-        self.listPublisher(
-            createAsynchronously: createAsynchronously,
-            from, fetchClauses
-        )
-    }
-
-    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
-
-        _ = ListPublisher(
-            dataStack: self,
-            from: from,
-            sectionBy: nil,
-            applyFetchClauses: { fetchRequest in
-
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
-
-                Internals.assert(
-                    fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
-                )
-            },
-            createAsynchronously: createAsynchronously
-        )
-    }
-
+    
+    /**
+     Creates a `ListPublisher` for a sectioned list that satisfy the fetch clauses. Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - 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.
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
 
         return self.listPublisher(
@@ -110,7 +123,15 @@ extension DataStack {
             fetchClauses
         )
     }
-
+    
+    /**
+     Creates a `ListPublisher` for a sectioned list that satisfy the fetch clauses. Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - 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.
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
 
         return ListPublisher(
@@ -128,7 +149,26 @@ extension DataStack {
             }
         )
     }
-
+    
+    /**
+     Creates a `ListPublisher` for a sectioned list that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
+     ```
+     let listPublisher = dataStack.listPublisher(
+         From<MyPersonEntity>()
+             .sectionBy(\.age, { "\($0!) years old" })
+             .where(\.age > 18)
+             .orderBy(.ascending(\.age))
+     )
+     ```
+     Multiple objects may then register themselves to be notified when changes are made to the fetched results.
+     ```
+     listPublisher.addObserver(self) { (listPublisher) in
+         // handle changes
+     }
+     ```
+     - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
+     - returns: a `ListPublisher` that broadcasts changes to the fetched results
+     */
     public func listPublisher<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
         return self.listPublisher(
@@ -137,45 +177,6 @@ extension DataStack {
             clauseChain.fetchClauses
         )
     }
-
-    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
-
-        self.listPublisher(
-            createAsynchronously: createAsynchronously,
-            from,
-            sectionBy,
-            fetchClauses
-        )
-    }
-
-    public func listPublisher<D>(createAsynchronously: @escaping (ListPublisher<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
-
-        _ = ListPublisher(
-            dataStack: self,
-            from: from,
-            sectionBy: sectionBy,
-            applyFetchClauses: { fetchRequest in
-
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
-
-                Internals.assert(
-                    fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
-                )
-            },
-            createAsynchronously: createAsynchronously
-        )
-    }
-
-    public func listPublisher<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (ListPublisher<B.ObjectType>) -> Void, _ clauseChain: B) {
-
-        self.listPublisher(
-            createAsynchronously: createAsynchronously,
-            clauseChain.from,
-            clauseChain.sectionBy,
-            clauseChain.fetchClauses
-        )
-    }
 }
 
 #endif
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index f111ee0..78b4069 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -36,7 +36,7 @@ extension DataStack {
      Creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
-     - returns: a `ObjectMonitor` that monitors changes to `object`
+     - returns: an `ObjectMonitor` that monitors changes to `object`
      */
     public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
         
diff --git a/Sources/DiffableDataSource.CollectionView.swift b/Sources/DiffableDataSource.CollectionView.swift
index 8b4fa93..34a0cb3 100644
--- a/Sources/DiffableDataSource.CollectionView.swift
+++ b/Sources/DiffableDataSource.CollectionView.swift
@@ -34,13 +34,59 @@ import CoreData
 extension DiffableDataSource {
 
     // MARK: - CollectionView
-
+    
+    /**
+     The `DiffableDataSource.CollectionView` serves as a `UICollectionViewDataSource` that handles `ListPublisher` snapshots for a `UICollectionView`. Subclasses of `DiffableDataSource.CollectionView` may override some `UICollectionViewDataSource` methods as needed.
+     The `DiffableDataSource.CollectionView` instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
+     ```
+     self.dataSource = DiffableDataSource.CollectionView<Person>(
+         collectionView: self.collectionView,
+         dataStack: Shared.defaultStack,
+         cellProvider: { (collectionView, indexPath, person) in
+             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PersonCell") as! PersonCell
+             cell.setPerson(person)
+             return cell
+         }
+     )
+     ```
+     The dataSource can then apply changes from a `ListPublisher` as shown:
+     ```
+     listPublisher.addObserver(self) { [weak self] (listPublisher) in
+        self?.dataSource?.apply(
+            listPublisher.snapshot,
+            animatingDifferences: true
+        )
+     }
+     ```
+     `DiffableDataSource.CollectionView` fully handles the reload animations.
+     */
     open class CollectionView<O: DynamicObject>: NSObject, UICollectionViewDataSource {
 
         // MARK: Public
-
+        
+        /**
+         The object type represented by this dataSource
+         */
         public typealias ObjectType = O
-
+        
+        /**
+         Initializes the `DiffableDataSource.CollectionView`. This instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
+         ```
+         self.dataSource = DiffableDataSource.CollectionView<Person>(
+             collectionView: self.collectionView,
+             dataStack: Shared.defaultStack,
+             cellProvider: { (collectionView, indexPath, person) in
+                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PersonCell") as! PersonCell
+                 cell.setPerson(person)
+                 return cell
+             }
+         )
+         ```
+         - parameter collectionView: the `UICollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionView`.
+         - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
+         - parameter cellProvider: a closure that configures and returns the `UICollectionViewCell` for the object
+         - parameter supplementaryViewProvider: an optional closure for providing `UICollectionReusableView` supplementary views. If not set, defaults to returning `nil`
+         */
         @nonobjc
         public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, O) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) {
 
@@ -76,7 +122,21 @@ extension DiffableDataSource {
 
             collectionView.dataSource = self
         }
-
+        
+        /**
+         Reloads the `UICollectionView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
+         ```
+         listPublisher.addObserver(self) { [weak self] (listPublisher) in
+            self?.dataSource?.apply(
+                listPublisher.snapshot,
+                animatingDifferences: true
+            )
+         }
+         ```
+         
+         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
+         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
+         */
         public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
             let diffableSnapshot = snapshot.diffableSnapshot
@@ -104,8 +164,15 @@ extension DiffableDataSource {
                 )
 //            }
         }
-
-        public func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
+        
+        /**
+         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         
+         - parameter indexPath: the `IndexPath` to search for
+         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         */
+        @nonobjc
+        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
 
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
@@ -116,8 +183,15 @@ extension DiffableDataSource {
                 return self.legacyDataSource.itemIdentifier(for: indexPath)
 //            }
         }
-
-        public func indexPath(for itemIdentifier: O.ObjectID) -> IndexPath? {
+        
+        /**
+         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         
+         - parameter itemID: the object identifier to search for
+         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         */
+        @nonobjc
+        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
 
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
@@ -125,7 +199,7 @@ extension DiffableDataSource {
 //            }
 //            else {
 
-                return self.legacyDataSource.indexPath(for: itemIdentifier)
+                return self.legacyDataSource.indexPath(for: itemID)
 //            }
         }
 
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView.swift
index eedc726..c100dc1 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView.swift
@@ -35,18 +35,66 @@ extension DiffableDataSource {
 
     // MARK: - TableView
 
+    /**
+     The `DiffableDataSource.TableView` serves as a `UITableViewDataSource` that handles `ListPublisher` snapshots for a `UITableView`. Subclasses of `DiffableDataSource.TableView` may override some `UITableViewDataSource` methods as needed.
+     The `DiffableDataSource.TableView` instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
+     ```
+     self.dataSource = DiffableDataSource.TableView<Person>(
+         tableView: self.tableView,
+         dataStack: Shared.defaultStack,
+         cellProvider: { (tableView, indexPath, person) in
+             let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
+             cell.setPerson(person)
+             return cell
+         }
+     )
+     ```
+     The dataSource can then apply changes from a `ListPublisher` as shown:
+     ```
+     listPublisher.addObserver(self) { [weak self] (listPublisher) in
+        self?.dataSource?.apply(
+            listPublisher.snapshot,
+            animatingDifferences: true
+        )
+     }
+     ```
+     `DiffableDataSource.TableView` fully handles the reload animations. To turn change the default animation, set the `defaultRowAnimation`.
+     */
     open class TableView<O: DynamicObject>: NSObject, UITableViewDataSource {
         
         // MARK: Open
 
+        /**
+         The animation style for row changes
+         */
         @nonobjc
         open var defaultRowAnimation: UITableView.RowAnimation = .automatic
         
 
         // MARK: Public
 
+        /**
+         The object type represented by this dataSource
+         */
         public typealias ObjectType = O
-        
+
+        /**
+         Initializes the `DiffableDataSource.TableView`. This instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
+         ```
+         self.dataSource = DiffableDataSource.TableView<Person>(
+             tableView: self.tableView,
+             dataStack: Shared.defaultStack,
+             cellProvider: { (tableView, indexPath, person) in
+                 let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
+                 cell.setPerson(person)
+                 return cell
+             }
+         )
+         ```
+         - parameter tableView: the `UITableView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.TableView`.
+         - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
+         - parameter cellProvider: a closure that configures and returns the `UITableViewCell` for the object
+         */
         @nonobjc
         public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, O) -> UITableViewCell?) {
 
@@ -81,7 +129,23 @@ extension DiffableDataSource {
 
             tableView.dataSource = self
         }
-
+        
+        /**
+         Reloads the `UITableView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
+         ```
+         listPublisher.addObserver(self) { [weak self] (listPublisher) in
+            self?.dataSource?.apply(
+                listPublisher.snapshot,
+                animatingDifferences: true
+            )
+         }
+         ```
+         If the `defaultRowAnimation` is configured to, animations are also applied accordingly.
+         
+         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
+         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
+         */
+        @nonobjc
         public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
             let diffableSnapshot = snapshot.diffableSnapshot
@@ -110,8 +174,15 @@ extension DiffableDataSource {
                 )
 //            }
         }
-
-        public func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
+        
+        /**
+         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         
+         - parameter indexPath: the `IndexPath` to search for
+         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         */
+        @nonobjc
+        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
             
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
@@ -122,8 +193,15 @@ extension DiffableDataSource {
                 return self.legacyDataSource.itemIdentifier(for: indexPath)
 //            }
         }
-
-        public func indexPath(for itemIdentifier: O.ObjectID) -> IndexPath? {
+        
+        /**
+         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         
+         - parameter itemID: the object identifier to search for
+         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         */
+        @nonobjc
+        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
             
 //            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
 //
@@ -131,7 +209,7 @@ extension DiffableDataSource {
 //            }
 //            else {
              
-                return self.legacyDataSource.indexPath(for: itemIdentifier)
+                return self.legacyDataSource.indexPath(for: itemID)
 //            }
         }
         
@@ -232,11 +310,17 @@ extension DiffableDataSource {
 
 
         // MARK: Private
-
+        
+        @nonobjc
         private weak var tableView: UITableView?
         
+        @nonobjc
         private let dataStack: DataStack
+        
+        @nonobjc
         private let cellProvider: (UITableView, IndexPath, O) -> UITableViewCell?
+        
+        @nonobjc
         private var rawDataSource: Any!
         
 //        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
@@ -245,6 +329,7 @@ extension DiffableDataSource {
 //            return self.rawDataSource as! UITableViewDiffableDataSource<String, O.ObjectID>
 //        }
         
+        @nonobjc
         private var legacyDataSource: Internals.DiffableDataUIDispatcher<O> {
             
             return self.rawDataSource as! Internals.DiffableDataUIDispatcher<O>
diff --git a/Sources/DiffableDataSource.swift b/Sources/DiffableDataSource.swift
index f4bcc45..82c487b 100644
--- a/Sources/DiffableDataSource.swift
+++ b/Sources/DiffableDataSource.swift
@@ -26,4 +26,7 @@
 
 // MARK: - DiffableDataSource
 
+/**
+ Namespace for diffable data source types. See `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView` for actual implementations
+ */
 public enum DiffableDataSource {}
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index ffda6c9..2ec94b7 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -431,77 +431,159 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
 
     // MARK: Public (Mutators)
+    
+    /**
+     Appends extra items to the specified section
 
+     - parameter itemIDs: the object identifiers for the objects to append
+     - parameter sectionID: the section to append the items to
+     */
     public mutating func appendItems(withIDs itemIDs: [ItemID], toSectionWithID sectionID: SectionID? = nil) {
 
         self.diffableSnapshot.appendItems(itemIDs, toSection: sectionID)
     }
+    
+    /**
+     Inserts extra items before a specified item
 
+     - parameter itemIDs: the object identifiers for the objects to insert
+     - parameter beforeItemID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception.
+     */
     public mutating func insertItems(withIDs itemIDs: [ItemID], beforeItemID: ItemID) {
 
         self.diffableSnapshot.insertItems(itemIDs, beforeItem: beforeItemID)
     }
+    
+    /**
+     Inserts extra items after a specified item
 
+     - parameter itemIDs: the object identifiers for the objects to insert
+     - parameter beforeItemID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception.
+     */
     public mutating func insertItems(withIDs itemIDs: [ItemID], afterItemID: ItemID) {
 
         self.diffableSnapshot.insertItems(itemIDs, afterItem: afterItemID)
     }
+    
+    /**
+     Deletes the specified items
 
+     - parameter itemIDs: the object identifiers for the objects to delete
+     */
     public mutating func deleteItems(withIDs itemIDs: [ItemID]) {
 
         self.diffableSnapshot.deleteItems(itemIDs)
     }
-
+    
+    /**
+     Deletes all items
+     */
     public mutating func deleteAllItems() {
 
         self.diffableSnapshot.deleteAllItems()
     }
+    
+    /**
+     Moves an item before another specified item
 
+     - parameter itemID: an object identifier in the list to move. Specifying an invalid value will raise an exception.
+     - parameter beforeItemID: another identifier to move the item before of. Specifying an invalid value will raise an exception.
+     */
     public mutating func moveItem(withID itemID: ItemID, beforeItemID: ItemID) {
 
         self.diffableSnapshot.moveItem(itemID, beforeItem: beforeItemID)
     }
+    
+    /**
+     Moves an item after another specified item
 
+     - parameter itemID: an object identifier in the list to move. Specifying an invalid value will raise an exception.
+     - parameter beforeItemID: another identifier to move the item after of. Specifying an invalid value will raise an exception.
+     */
     public mutating func moveItem(withID itemID: ItemID, afterItemID: ItemID) {
 
         self.diffableSnapshot.moveItem(itemID, afterItem: afterItemID)
     }
+    
+    /**
+     Marks the specified items as reloaded
 
+     - parameter itemIDs: the object identifiers to reload
+     */
     public mutating func reloadItems(withIDs itemIDs: [ItemID]) {
 
         self.diffableSnapshot.reloadItems(itemIDs)
     }
+    
+    /**
+     Appends new section identifiers to the end of the list
 
+     - parameter sectionIDs: the sections to append
+     */
     public mutating func appendSections(withIDs sectionIDs: [SectionID]) {
 
         self.diffableSnapshot.appendSections(sectionIDs)
     }
+    
+    /**
+     Inserts new sections before an existing section
 
+     - parameter sectionIDs: the section identifiers for the sections to insert
+     - parameter beforeSectionID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception.
+     */
     public mutating func insertSections(withIDs sectionIDs: [SectionID], beforeSectionID: SectionID) {
 
         self.diffableSnapshot.insertSections(sectionIDs, beforeSection: beforeSectionID)
     }
+    
+    /**
+     Inserts new sections after an existing section
 
+     - parameter sectionIDs: the section identifiers for the sections to insert
+     - parameter beforeSectionID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception.
+     */
     public mutating func insertSections(withIDs sectionIDs: [SectionID], afterSectionID: SectionID) {
 
         self.diffableSnapshot.insertSections(sectionIDs, afterSection: afterSectionID)
     }
+    
+    /**
+     Deletes the specified sections
 
+     - parameter sectionIDs: the section identifiers for the sections to delete
+     */
     public mutating func deleteSections(withIDs sectionIDs: [SectionID]) {
 
         self.diffableSnapshot.deleteSections(sectionIDs)
     }
+    
+    /**
+     Moves a section before another specified section
 
+     - parameter sectionID: a section identifier in the list to move. Specifying an invalid value will raise an exception.
+     - parameter beforeSectionID: another identifier to move the section before of. Specifying an invalid value will raise an exception.
+     */
     public mutating func moveSection(withID sectionID: SectionID, beforeSectionID: SectionID) {
 
         self.diffableSnapshot.moveSection(sectionID, beforeSection: beforeSectionID)
     }
+    
+    /**
+     Moves a section after another specified section
 
+     - parameter sectionID: a section identifier in the list to move. Specifying an invalid value will raise an exception.
+     - parameter afterSectionID: another identifier to move the section after of. Specifying an invalid value will raise an exception.
+     */
     public mutating func moveSection(withID sectionID: SectionID, afterSectionID: SectionID) {
 
         self.diffableSnapshot.moveSection(sectionID, afterSection: afterSectionID)
     }
+    
+    /**
+     Marks the specified sections as reloaded
 
+     - parameter sectionIDs: the section identifiers to reload
+     */
     public mutating func reloadSections(withIDs sectionIDs: [SectionID]) {
 
         self.diffableSnapshot.reloadSections(sectionIDs)
diff --git a/Sources/ObjectObserver.swift b/Sources/ObjectObserver.swift
index b9508f3..e5dc377 100644
--- a/Sources/ObjectObserver.swift
+++ b/Sources/ObjectObserver.swift
@@ -30,7 +30,7 @@ import CoreData
 // MARK: - ObjectObserver
 
 /**
- Implement the `ObjectObserver` protocol to observe changes to a single `DynamicObject` instance. `ObjectObserver`s may register themselves to a `ObjectMonitor`'s `addObserver(_:)` method:
+ Implement the `ObjectObserver` protocol to observe changes to a single `DynamicObject` instance. `ObjectObserver`s may register themselves to an `ObjectMonitor`'s `addObserver(_:)` method:
  ```
  let monitor = CoreStore.monitorObject(object)
  monitor.addObserver(self)
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index c1a6a0d..7bc262c 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -116,9 +116,6 @@ public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hash
     
     // MARK: ObjectRepresentation
 
-    /**
-     The `DynamicObject` type associated with this list
-     */
     public typealias ObjectType = O
     
     public func objectID() -> O.ObjectID {
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index b4b95cd..dc94e1c 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -36,13 +36,15 @@ import AppKit
 
 // MARK: - ObjectSnapshot
 
+/**
+ The `ObjectSnapshot` is a full copy of a `DynamicObject`'s properties at a given point in time. This is useful especially when keeping thread-safe state values, in ViewModels for example. Since this is a value type, any changes in this `struct` does not affect the actual object.
+ */
 @dynamicMemberLookup
 public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
-
-    public typealias ObjectType = O
-    
     
     // MARK: ObjectRepresentation
+
+    public typealias ObjectType = O
     
     public func objectID() -> O.ObjectID {
         
diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift
index ad12bb8..72bd683 100644
--- a/Sources/UnsafeDataTransaction+Observing.swift
+++ b/Sources/UnsafeDataTransaction+Observing.swift
@@ -36,7 +36,7 @@ extension UnsafeDataTransaction {
      Creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
-     - returns: a `ObjectMonitor` that monitors changes to `object`
+     - returns: an `ObjectMonitor` that monitors changes to `object`
      */
     public func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
 

From f5fed063eeaf28cab7d259476d4193a4339a16f6 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sun, 20 Oct 2019 18:17:31 +0900
Subject: [PATCH 27/58] Docs update

---
 .travis.yml                                   |  41 ---
 CoreStore.podspec                             |   4 +-
 CoreStore.xcodeproj/project.pbxproj           |  84 ++---
 .../xcschemes/CoreStore OSX.xcscheme          |  22 +-
 .../xcschemes/CoreStore tvOS.xcscheme         |  22 +-
 .../xcschemes/CoreStore watchOS.xcscheme      |   4 -
 .../xcschemes/CoreStoreDemo.xcscheme          |   8 +-
 .../CustomLoggerViewController.swift          |   4 +-
 .../SwiftUIContainerViewController.swift      |   8 +-
 .../SwiftUI Demo/SwiftUIView.swift            |   6 +-
 CoreStoreTests/BaseTests/BaseTestCase.swift   |  14 +-
 README.md                                     | 204 ++++++------
 Sources/AsynchronousDataTransaction.swift     |   2 +-
 Sources/CSCoreStore+Setup.swift               |   6 +-
 Sources/CSCoreStore+Transaction.swift         |   6 +-
 Sources/CSCoreStore.swift                     |   4 +-
 Sources/CoreStore+Logging.swift               |   8 +-
 Sources/CoreStore+Migration.swift             |  24 +-
 Sources/CoreStore+Observing.swift             |  52 ++--
 Sources/CoreStore+Querying.swift              |  98 +++---
 Sources/CoreStore+Setup.swift                 |  42 +--
 Sources/CoreStore+Transaction.swift           |  20 +-
 Sources/CoreStore.swift                       |  12 +-
 .../{Shared.swift => CoreStoreDefaults.swift} |  16 +-
 Sources/CoreStoreLogger.swift                 |   2 +-
 Sources/CoreStoreObject+Querying.swift        |  34 +-
 Sources/CoreStoreObject.swift                 |   2 +-
 Sources/CoreStoreSchema.swift                 |   6 +-
 Sources/DataStack.swift                       |   6 +-
 ...ableDataSource.CollectionView-UIKit.swift} | 158 +++-------
 ... DiffableDataSource.TableView-UIKit.swift} | 135 ++------
 Sources/DiffableDataSource.swift              |   3 +
 Sources/Entity.swift                          |   2 +-
 Sources/EnvironmentValues+DataSources.swift   |   7 +-
 Sources/ImportableObject.swift                |   2 +-
 Sources/ImportableUniqueObject.swift          |   2 +-
 ...Internals.DiffableDataSourceSnapshot.swift |   6 -
 Sources/KeyPath+Querying.swift                |  90 +++---
 Sources/ListMonitor.swift                     |   4 +-
 Sources/ListObserver.swift                    |   6 +-
 Sources/ListPublisher.swift                   |   4 +-
 Sources/MigrationResult.swift                 |   2 +-
 Sources/ObjectMonitor.swift                   |   2 +-
 Sources/ObjectObserver.swift                  |   2 +-
 Sources/ObjectPublisher.swift                 |   3 +-
 Sources/SectionBy.swift                       |   2 +-
 Sources/Select.swift                          |  20 +-
 Sources/SetupResult.swift                     |   2 +-
 Sources/SynchronousDataTransaction.swift      |   2 +-
 Sources/UnsafeDataModelSchema.swift           |   2 +-
 Sources/UserInfo.swift                        |   6 +-
 Sources/VersionLock.swift                     |   2 +-
 Sources/Where.Expression.swift                |  88 +++---
 Sources/XcodeDataModelSchema.swift            |   6 +-
 ...ableDataSource.CollectionView-AppKit.swift | 294 ++++++++++++++++++
 bitrise.yml                                   | 103 ------
 56 files changed, 853 insertions(+), 863 deletions(-)
 delete mode 100644 .travis.yml
 rename Sources/{Shared.swift => CoreStoreDefaults.swift} (77%)
 rename Sources/{DiffableDataSource.CollectionView.swift => DiffableDataSource.CollectionView-UIKit.swift} (64%)
 rename Sources/{DiffableDataSource.TableView.swift => DiffableDataSource.TableView-UIKit.swift} (74%)
 create mode 100644 Sources/diffableDataSource.CollectionView-AppKit.swift
 delete mode 100644 bitrise.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ebabb75..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: objective-c
-osx_image: xcode11
-sudo: false
-git:
-  submodules: false
-notifications:
-  email: false
-env:
-  global:
-  - LC_CTYPE=en_US.UTF-8
-  - LANG=en_US.UTF-8
-  matrix:
-    - DESTINATION="arch=x86_64"                         SCHEME="CoreStore OSX"     SDK=macosx10.14          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=iPhone XS"              SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0.1,name=iPhone 8"             SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.3.1,name=iPhone 7"             SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=iPhone 7"               SCHEME="CoreStore iOS"     SDK=iphonesimulator13.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=4.0,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"      SCHEME="CoreStore watchOS" SDK=watchsimulator6.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=12.0,name=Apple TV 4K"            SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=Apple TV 4K (at 1080p)" SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"         SCHEME="CoreStore tvOS"    SDK=appletvsimulator13.0 RUN_TESTS="YES" POD_LINT="NO"
-before_install:
-  - gem install cocoapods --no-rdoc --no-ri --no-document
-  - gem install xcpretty --no-rdoc --no-ri --no-document
-  - npm install ios-sim -g
-  - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8, 11.0"
-script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - if [ $RUN_TESTS == "YES" ]; then 
-      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-    fi
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator13.0" -destination "OS=13.0,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator13.0" -destination "OS=13.0,name=iPhone 8" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint --quick;
-    fi
diff --git a/CoreStore.podspec b/CoreStore.podspec
index fdb9527..549d04e 100644
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "6.3.2"
-    s.swift_version = "5.0"
+    s.version = "7.0.0"
+    s.swift_version = "5.1"
     s.license = "MIT"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
     s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index bee2174..c767761 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -465,10 +465,10 @@
 		B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; };
 		B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
 		B56321B61BD6521C006C9394 /* Internals.WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */; };
-		B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
-		B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
-		B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
-		B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */; };
+		B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
+		B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
+		B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
+		B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
 		B56507941D3930BC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507931D3930BC000596DA /* CoreData.framework */; };
 		B56507961D3930C1000596DA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507951D3930C1000596DA /* Foundation.framework */; };
 		B56507981D3930CC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507971D3930CC000596DA /* CoreData.framework */; };
@@ -580,6 +580,11 @@
 		B5A992201EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992211EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992221EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
+		B5AA37F1235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F2235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F3235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F4235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37FD235C3D1A00FFD4B9 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B5AEFAB51C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB71C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
@@ -592,10 +597,10 @@
 		B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
 		B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
 		B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
-		B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
-		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
-		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
-		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */; };
+		B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
+		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
+		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
+		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
 		B5BF7FBC234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBD234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBE234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
@@ -694,10 +699,10 @@
 		B5DE522C230BD7D500A22534 /* Internals.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522A230BD7CC00A22534 /* Internals.swift */; };
 		B5DE522D230BD7D600A22534 /* Internals.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522A230BD7CC00A22534 /* Internals.swift */; };
 		B5DE522E230BD7D600A22534 /* Internals.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522A230BD7CC00A22534 /* Internals.swift */; };
-		B5DE5230230BDA1300A22534 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* Shared.swift */; };
-		B5DE5231230BDA1300A22534 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* Shared.swift */; };
-		B5DE5232230BDA1300A22534 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* Shared.swift */; };
-		B5DE5233230BDA1300A22534 /* Shared.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* Shared.swift */; };
+		B5DE5230230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */; };
+		B5DE5231230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */; };
+		B5DE5232230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */; };
+		B5DE5233230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */; };
 		B5E1B5931CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E1B5921CAA0C15007FD580 /* CSObjectMonitor.swift */; };
 		B5E1B5951CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E1B5921CAA0C15007FD580 /* CSObjectMonitor.swift */; };
 		B5E1B5961CAA0C15007FD580 /* CSObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E1B5921CAA0C15007FD580 /* CSObjectMonitor.swift */; };
@@ -875,7 +880,6 @@
 		82BA18921C4BBCBA00A0916E /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		82BA18DE1C4BBE2600A0916E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		82BA18E01C4BBE2C00A0916E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
-		B500810F2290CDF800F4CEA5 /* bitrise.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = bitrise.yml; sourceTree = SOURCE_ROOT; };
 		B50132292344ECB500FC238B /* ListPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPublisher.swift; sourceTree = "<group>"; };
 		B501322F2346B76E00FC238B /* Internals.FetchedDiffableDataSourceSnapshotDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.FetchedDiffableDataSourceSnapshotDelegate.swift; sourceTree = "<group>"; };
 		B501323623477F9300FC238B /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
@@ -969,7 +973,7 @@
 		B563216F1BD65082006C9394 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B56321791BD650DE006C9394 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B563217B1BD650E3006C9394 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.CollectionView.swift; sourceTree = "<group>"; };
+		B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionView-UIKit.swift"; sourceTree = "<group>"; };
 		B56507931D3930BC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B56507951D3930C1000596DA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		B56507971D3930CC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
@@ -1006,12 +1010,14 @@
 		B5A80DF52212C1BC006096AA /* Playground_iOS.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground_iOS.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		B5A991EB1E9DC2CE0091A2E3 /* VersionLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionLock.swift; sourceTree = "<group>"; };
 		B5A9921E1EA898710091A2E3 /* UserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfo.swift; sourceTree = "<group>"; };
+		B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "diffableDataSource.CollectionView-AppKit.swift"; sourceTree = "<group>"; };
+		B5AA37FA235C3D1300FFD4B9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
+		B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
 		B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
 		B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreBridge.swift; sourceTree = "<group>"; };
-		B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
 		B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataSourceSnapshot.swift; sourceTree = "<group>"; };
 		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
-		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.TableView.swift; sourceTree = "<group>"; };
+		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.TableView-UIKit.swift"; sourceTree = "<group>"; };
 		B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
 		B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectPublisher.swift; sourceTree = "<group>"; };
 		B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
@@ -1046,7 +1052,7 @@
 		B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChainTests.swift; sourceTree = "<group>"; };
 		B5DC47C91C93D9C800FA3BF3 /* StorageInterfaceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageInterfaceTests.swift; sourceTree = "<group>"; };
 		B5DE522A230BD7CC00A22534 /* Internals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.swift; sourceTree = "<group>"; };
-		B5DE522F230BDA1300A22534 /* Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shared.swift; sourceTree = "<group>"; };
+		B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreStoreDefaults.swift; sourceTree = "<group>"; };
 		B5E1B5921CAA0C15007FD580 /* CSObjectMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSObjectMonitor.swift; sourceTree = "<group>"; };
 		B5E1B5971CAA0C23007FD580 /* CSObjectObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSObjectObserver.swift; sourceTree = "<group>"; };
 		B5E1B59C1CAA2568007FD580 /* CSDataStack+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSDataStack+Observing.swift"; sourceTree = "<group>"; };
@@ -1141,8 +1147,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B501323F23477FE800FC238B /* SwiftUI.framework in Frameworks */,
 				B501323D23477FD500FC238B /* UIKit.framework in Frameworks */,
+				B501323F23477FE800FC238B /* SwiftUI.framework in Frameworks */,
 				B56507961D3930C1000596DA /* Foundation.framework in Frameworks */,
 				B56507941D3930BC000596DA /* CoreData.framework in Frameworks */,
 			);
@@ -1179,6 +1185,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5AA37FD235C3D1A00FFD4B9 /* SwiftUI.framework in Frameworks */,
 				B565079A1D3930D1000596DA /* Foundation.framework in Frameworks */,
 				B56507981D3930CC000596DA /* CoreData.framework in Frameworks */,
 			);
@@ -1229,11 +1236,9 @@
 			children = (
 				2F03A53419C5C6DA005002A5 /* Info.plist */,
 				B5E84ED81AFF82360064E85B /* README.md */,
-				B500810F2290CDF800F4CEA5 /* bitrise.yml */,
 				B5E84ED91AFF82360064E85B /* LICENSE */,
 				B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */,
 				B5D2D5A91F7558CB00A4DE67 /* .cocoapods.yml */,
-				B5BDC9271C2024F2008147CD /* .travis.yml */,
 				B524E78721CA20AC00BEB794 /* .jazzy.yaml */,
 				B5AD60CD1C90141E00F2B2E8 /* Package.swift */,
 			);
@@ -1287,6 +1292,8 @@
 		2F291E3119C6D4D3007AF63F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */,
+				B5AA37FA235C3D1300FFD4B9 /* UIKit.framework */,
 				B501323E23477FE800FC238B /* SwiftUI.framework */,
 				B501323C23477FD500FC238B /* UIKit.framework */,
 				B501323A23477FB600FC238B /* AppKit.framework */,
@@ -1513,7 +1520,7 @@
 			isa = PBXGroup;
 			children = (
 				2F291E2619C6D3CF007AF63F /* CoreStore.swift */,
-				B5DE522F230BDA1300A22534 /* Shared.swift */,
+				B5DE522F230BDA1300A22534 /* CoreStoreDefaults.swift */,
 				B5D1E22B19FA9FBC003B2874 /* CoreStoreError.swift */,
 				B549F6721E56A92800FBAB2D /* CoreDataNativeType.swift */,
 				B5D339F01E94AF5800C880DE /* CoreStoreStrings.swift */,
@@ -1595,8 +1602,9 @@
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
-				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView.swift */,
-				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView.swift */,
+				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */,
+				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */,
+				B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -2076,8 +2084,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5DE5230230BDA1300A22534 /* Shared.swift in Sources */,
-				B55BB4DB23503B9700C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
+				B5DE5230230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
 				B5CA2B081F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
@@ -2102,17 +2109,19 @@
 				B52FD3AA1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
 				B52F74411E9B8724005F3DAC /* UnsafeDataModelSchema.swift in Sources */,
 				B51FE5AB1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
+				B55BB4DB23503B9700C33E34 /* EnvironmentValues+DataSources.swift in Sources */,
 				B5A9921F1EA898710091A2E3 /* UserInfo.swift in Sources */,
 				B54A6A551BA15F2A007870FD /* Internals.FetchedResultsControllerDelegate.swift in Sources */,
 				B5D339E21E948C3600C880DE /* Value.swift in Sources */,
 				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B53FBA0B1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
+				B5AA37F1235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5DE522B230BD7CC00A22534 /* Internals.swift in Sources */,
 				B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */,
-				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
+				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B5ECDC1D1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B53FBA121CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
@@ -2137,7 +2146,7 @@
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
-				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
+				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
 				B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */,
 				B50E175223517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
@@ -2301,7 +2310,7 @@
 			files = (
 				82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */,
 				B5ECDBFB1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
-				B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
+				B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
 				B5CA2B091F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E81C6E3A5D00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F61EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2393,7 +2402,7 @@
 				82BA18C91C4BBD5900A0916E /* MigrationType.swift in Sources */,
 				B5D8CA772346EAEE0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				82BA18D01C4BBD7100A0916E /* Internals.MigrationManager.swift in Sources */,
-				B5DE5231230BDA1300A22534 /* Shared.swift in Sources */,
+				B5DE5231230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B52F74461E9B8724005F3DAC /* XcodeDataModelSchema.swift in Sources */,
 				82BA18C61C4BBD5900A0916E /* DataStack+Migration.swift in Sources */,
 				B59851491C90289D00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
@@ -2459,6 +2468,7 @@
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5AA37F2235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322B2346A9AE00FC238B /* ListPublisher.swift in Sources */,
@@ -2476,7 +2486,7 @@
 				B5D339E81E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC7234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				82BA18CC1C4BBD6400A0916E /* Progress+Convenience.swift in Sources */,
-				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
+				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */,
 				82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */,
 			);
@@ -2523,7 +2533,7 @@
 			files = (
 				B5220E1E1D13080D009BC71E /* CSListMonitor.swift in Sources */,
 				B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
-				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
+				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
 				B5CA2B0B1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B56923F81EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
 				B52DD1BE1BE1F94300949AFE /* Progress+Convenience.swift in Sources */,
@@ -2615,7 +2625,7 @@
 				B5ECDC091CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5D8CA792346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B56923C71EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
-				B5DE5233230BDA1300A22534 /* Shared.swift in Sources */,
+				B5DE5233230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B52DD1A51BE1F92F00949AFE /* ImportableUniqueObject.swift in Sources */,
 				B5E222271CA4E12600BA2E95 /* CSSynchronousDataTransaction.swift in Sources */,
 				B52F74481E9B8724005F3DAC /* XcodeDataModelSchema.swift in Sources */,
@@ -2681,6 +2691,7 @@
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5AA37F4235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322E2346A9B100FC238B /* ListPublisher.swift in Sources */,
@@ -2698,7 +2709,7 @@
 				B5D339EA1E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC9234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B52DD1AA1BE1F93500949AFE /* TypeErasedClauses.swift in Sources */,
-				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
+				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B53FBA021CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B51FE5AF1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
 			);
@@ -2745,7 +2756,7 @@
 			files = (
 				B56321A91BD65219006C9394 /* Progress+Convenience.swift in Sources */,
 				B5ECDBFC1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
-				B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView.swift in Sources */,
+				B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
 				B5CA2B0A1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E91C6E3A5E00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F71EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2838,7 +2849,7 @@
 				B5D8CA782346EAEF0055D7D1 /* DataStack+DataSources.swift in Sources */,
 				B56923C61EB823B4007C4DC9 /* NSEntityDescription+Migration.swift in Sources */,
 				B56321A71BD65216006C9394 /* MigrationResult.swift in Sources */,
-				B5DE5232230BDA1300A22534 /* Shared.swift in Sources */,
+				B5DE5232230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B598514A1C90289E00C99590 /* NSPersistentStoreCoordinator+Setup.swift in Sources */,
 				B52F74471E9B8724005F3DAC /* XcodeDataModelSchema.swift in Sources */,
 				B5FEC1901C9166E700532541 /* NSPersistentStore+Setup.swift in Sources */,
@@ -2903,6 +2914,7 @@
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5AA37F3235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322D2346A9B000FC238B /* ListPublisher.swift in Sources */,
@@ -2920,7 +2932,7 @@
 				B5D339E91E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC8234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */,
-				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView.swift in Sources */,
+				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */,
 				B56321951BD65216006C9394 /* TypeErasedClauses.swift in Sources */,
 			);
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme
index 5ec36d7..2f268ef 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore OSX.xcscheme	
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore OSX"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B52DD1731BE1F8CC00949AFE"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore OSX"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme
index 8112b5d..38cae67 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore tvOS.xcscheme	
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
-            BuildableName = "CoreStore.framework"
-            BlueprintName = "CoreStore tvOS"
-            ReferencedContainer = "container:CoreStore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme
index cadadc8..188cf5c 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore watchOS.xcscheme	
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:CoreStore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
index 9fdce24..df8f438 100644
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift
index 19cb387..8f25aee 100644
--- a/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/Loggers Demo/CustomLoggerViewController.swift	
@@ -31,7 +31,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
         
         super.viewDidAppear(animated)
 
-        Shared.logger = self
+        CoreStoreDefaults.logger = self
 
         let alert = UIAlertController(
             title: "Logger Demo",
@@ -46,7 +46,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
 
         super.viewDidDisappear(animated)
 
-        Shared.logger = DefaultLogger()
+        CoreStoreDefaults.logger = DefaultLogger()
     }
 
     
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
index c6bd6d1..8e8b9fc 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -13,13 +13,19 @@ import CoreStore
 import SwiftUI
 
 #endif
+
+#if canImport(Combine)
+import Combine
+
+#endif
+
 import Compression
 final class SwiftUIContainerViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        #if canImport(SwiftUI)
+        #if canImport(SwiftUI) && canImport(Combine)
         
         if #available(iOS 13, *) {
             
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 33706ca..9516f1f 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -6,11 +6,13 @@
 //  Copyright © 2019 John Rommel Estropia. All rights reserved.
 //
 
-#if canImport(SwiftUI)
-
+#if canImport(SwiftUI) && canImport(Combine)
 import SwiftUI
+import Combine
+
 import CoreStore
 
+
 @available(iOS 13.0.0, *)
 struct SwiftUIView: View {
     
diff --git a/CoreStoreTests/BaseTests/BaseTestCase.swift b/CoreStoreTests/BaseTests/BaseTestCase.swift
index cc7d026..bdb2d97 100644
--- a/CoreStoreTests/BaseTests/BaseTestCase.swift
+++ b/CoreStoreTests/BaseTests/BaseTestCase.swift
@@ -67,11 +67,11 @@ class BaseTestCase: XCTestCase {
     @nonobjc
     func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () throws -> T) rethrows -> T {
         
-        Shared.logger = TestLogger(self.prepareLoggerExpectations(expectations))
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations(expectations))
         defer {
             
             self.checkExpectationsImmediately()
-            Shared.logger = TestLogger([:])
+            CoreStoreDefaults.logger = TestLogger([:])
         }
         return try closure()
     }
@@ -79,17 +79,17 @@ class BaseTestCase: XCTestCase {
     @nonobjc
     func expectLogger(_ expectations: [TestLogger.Expectation: XCTestExpectation]) {
         
-        Shared.logger = TestLogger(expectations)
+        CoreStoreDefaults.logger = TestLogger(expectations)
     }
 
     @nonobjc
     func expectError<T>(code: CoreStoreErrorCode, closure: () throws -> T) {
 
-        Shared.logger = TestLogger(self.prepareLoggerExpectations([.logError]))
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations([.logError]))
         defer {
 
             self.checkExpectationsImmediately()
-            Shared.logger = TestLogger([:])
+            CoreStoreDefaults.logger = TestLogger([:])
         }
         do {
 
@@ -138,12 +138,12 @@ class BaseTestCase: XCTestCase {
         
         super.setUp()
         self.deleteStores()
-        Shared.logger = TestLogger([:])
+        CoreStoreDefaults.logger = TestLogger([:])
     }
     
     override func tearDown() {
         
-        Shared.logger = DefaultLogger()
+        CoreStoreDefaults.logger = DefaultLogger()
         self.deleteStores()
         super.tearDown()
     }
diff --git a/README.md b/README.md
index e0b976d..8e29bc1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 Unleashing the real power of Core Data with the elegance and safety of Swift
 <br />
 <br />
-<a href="https://app.bitrise.io/app/e736852157296019#/builds"><img alt="Build Status" src="https://img.shields.io/bitrise/e736852157296019/master.svg?label=build&token=vhgAmaiF3tWZoQyFLkKM7g" /></a>
+<a href="https://app.bitrise.io/app/e736852157296019#/builds"><img alt="Build Status" src="https://img.shields.io/bitrise/e736852157296019/master.svg?label=build&token=vhgAmaiF3tWZoQyFLkKM7g&logo=bitrise" /></a>
 <a href="https://github.com/JohnEstropia/CoreStore/commits"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/johnestropia/corestore.svg?style=flat" /></a>
 <a href="http://cocoadocs.org/docsets/CoreStore"><img alt="Platform" src="https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat" /></a>
 <a href="https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE"><img alt="License" src="https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat" /></a>
@@ -14,15 +14,15 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 <a href="https://github.com/Carthage/Carthage"><img alt="Carthage compatible" src="https://img.shields.io/badge/Carthage-compatible-16a085.svg?style=flat" /></a>
 <a href="https://swift.org/source-compatibility/#current-list-of-projects"><img alt="Swift Package Manager compatible" src="https://img.shields.io/badge/Swift_Package_Manager-compatible-orange.svg?style=flat" /></a>
 <br /><br />Contact<br />
-<a href="http://swift-corestore-slack.herokuapp.com/"><img alt="Join us on Slack!" src="http://swift-corestore-slack.herokuapp.com/badge.svg" /></a>
-<a href="https://twitter.com/JohnEstropia"><img alt="Reach me on Twitter!" src="https://img.shields.io/badge/twitter-%40JohnEstropia-3498db.svg" /></a>
+<a href="http://swift-corestore-slack.herokuapp.com/"><img alt="Join us on Slack!" src="http://swift-corestore-slack.herokuapp.com/badge.svg?logo=slack" /></a>
+<a href="https://twitter.com/JohnEstropia"><img alt="Reach me on Twitter!" src="https://img.shields.io/badge/twitter-%40JohnEstropia-3498db.svg?logo=twitter" /></a>
 <br />
 </p>
 
-* **Swift 5.0:** iOS 10+ / macOS 10.12+ / watchOS 3.0+ / tvOS 10.0+
-* Previously supported Swift versions: [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1)
+* **Swift 5.1:** iOS 10+ / macOS 10.12+ / watchOS 3.0+ / tvOS 10.0+
+* Previously supported Swift versions: [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1), [Swift 5.0](https://github.com/JohnEstropia/CoreStore/tree/6.3.2)
 
-Upgrading from CoreStore 5.x (min iOS 9) to 6.x (min iOS 10)? Check out the [new features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).
+Upgrading from CoreStore 6.x (swift 5.0) to 7.x (Swift 5.1)? Check out the [🆕 features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).
 
 CoreStore is now part of the [Swift Source Compatibility projects](https://swift.org/source-compatibility/#current-list-of-projects).
 
@@ -36,14 +36,14 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
 - **💎Tight design around Swift’s code elegance and type safety.** CoreStore fully utilizes Swift's community-driven language features.
 - **🚦Safer concurrency architecture.** CoreStore makes it hard to fall into common concurrency mistakes. The main `NSManagedObjectContext` is strictly read-only, while all updates are done through serial *transactions*. *(See [Saving and processing transactions](#saving-and-processing-transactions))*
 - **🔍Clean fetching and querying API.** Fetching objects is easy, but querying for raw aggregates (`min`, `max`, etc.) and raw property values is now just as convenient. *(See [Fetching and querying](#fetching-and-querying))*
-- **🔭Type-safe, easy to configure observers.** You don't have to deal with the burden of setting up `NSFetchedResultsController`s and KVO. As an added bonus, `ListMonitor`s and `ObjectMonitor`s can have multiple observers. This means you can have multiple view controllers efficiently share a single resource! *(See [Observing changes and notifications](#observing-changes-and-notifications))*
+- **🔭Type-safe, easy to configure observers.** You don't have to deal with the burden of setting up `NSFetchedResultsController`s and KVO. As an added bonus, list and object observable types all support multiple observers. This means you can have multiple view controllers efficiently share a single resource! *(See [Observing changes and notifications](#observing-changes-and-notifications))*
 - **📥Efficient importing utilities.** Map your entities once with their corresponding import source (JSON for example), and importing from *transactions* becomes elegant. Uniquing is also done with an efficient find-and-replace algorithm. *(See [Importing data](#importing-data))*
-- **🗑Say goodbye to *.xcdatamodeld* files!** The new `CoreStoreObject` is *the* replacement to `NSManagedObject`. `CoreStoreObject` subclasses can declare type-safe properties all in Swift code, no need to maintain separate resource files for the models. As bonus, these special properties support custom types, and can be used to create type-safe keypaths and queries. *(See [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects))*
+- **🗑Say goodbye to *.xcdatamodeld* files!** While CoreStore supports `NSManagedObject`s, it offers `CoreStoreObject` whose subclasses can declare type-safe properties all in Swift code without the need to maintain separate resource files for the models. As bonus, these special properties support custom types, and can be used to create type-safe keypaths and queries. *(See [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects))*
 - **🔗Progressive migrations.** No need to think how to migrate from all previous model versions to your latest model. Just tell the `DataStack` the sequence of version strings (`MigrationChain`s) and CoreStore will automatically use progressive migrations when needed. *(See [Migrations](#migrations))*
 - **Easier custom migrations.** Say goodbye to *.xcmappingmodel* files; CoreStore can now infer entity mappings when possible, while still allowing an easy way to write custom mappings. *(See [Migrations](#migrations))*
 - **📝Plug-in your own logging framework.** Although a default logger is built-in, all logging, asserting, and error reporting can be funneled to `CoreStoreLogger` protocol implementations. *(See [Logging and error reporting](#logging-and-error-reporting))*
 - **⛓Heavy support for multiple persistent stores per data stack.** CoreStore lets you manage separate stores in a single `DataStack`, just the way *.xcdatamodeld* configurations are designed to. CoreStore will also manage one stack by default, but you can create and manage as many as you need. *(See [Setting up](#setting-up))*
-- **🎯Free to name entities and their class names independently.** CoreStore gets around a restriction with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you can assign different names for the entities and their class names.
+- **🎯Free to name entities and their class names independently.** CoreStore gets around a restriction with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you can assign independent names for the entities and their class names.
 - **📙Full Documentation.** No magic here; all public classes, functions, properties, etc. have detailed *Apple Docs*. This *README* also introduces a lot of concepts and explains a lot of CoreStore's behavior.
 - **ℹ️Informative (and pretty) logs.** All CoreStore and Core Data-related types now have very informative and pretty print outputs! *(See [Logging and error reporting](#logging-and-error-reporting))*
 - **🎗Objective-C support!** Is your project transitioning from Objective-C to Swift but still can't quite fully convert some huge classes to Swift yet? CoreStore adjusts to the ever-increasing Swift adoption. While still written in pure Swift, all CoreStore types have their corresponding Objective-C-visible "bridging classes". *(See [Objective-C support](#objective-c-support))*
@@ -105,7 +105,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
 
 Setting-up with progressive migration support:
 ```swift
-CoreStore.defaultStack = DataStack(
+dataStack = DataStack(
     xcodeModelName: "MyStore",
     migrationChain: ["MyStore", "MyStoreV2", "MyStoreV3"]
 )
@@ -113,7 +113,7 @@ CoreStore.defaultStack = DataStack(
 
 Adding a store:
 ```swift
-CoreStore.addStorage(
+dataStack.addStorage(
     SQLiteStore(fileName: "MyStore.sqlite"),
     completion: { (result) -> Void in
         // ...
@@ -123,7 +123,7 @@ CoreStore.addStorage(
 
 Starting transactions:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let person = transaction.create(Into<MyPersonEntity>())
         person.name = "John Smith"
@@ -140,12 +140,12 @@ CoreStore.perform(
 
 Fetching objects (simple):
 ```swift
-let people = try CoreStore.fetchAll(From<MyPersonEntity>())
+let people = try dataStack.fetchAll(From<MyPersonEntity>())
 ```
 
 Fetching objects (complex):
 ```swift
-let people = try CoreStore.fetchAll(
+let people = try dataStack.fetchAll(
     From<MyPersonEntity>()
         .where(\.age > 30),
         .orderBy(.ascending(\.name), .descending(.\age)),
@@ -155,7 +155,7 @@ let people = try CoreStore.fetchAll(
 
 Querying values:
 ```swift
-let maxAge = try CoreStore.queryValue(
+let maxAge = try dataStack.queryValue(
     From<MyPersonEntity>()
         .select(Int.self, .maximum(\.age))
 )
@@ -193,10 +193,10 @@ This allows for a butter-smooth main thread, while still taking advantage of saf
 ## Setting up
 The simplest way to initialize CoreStore is to add a default store to the default stack:
 ```swift
-try CoreStore.addStorageAndWait()
+try CoreStoreDefaults.dataStack.addStorageAndWait()
 ```
 This one-liner does the following:
-- Triggers the lazy-initialization of `CoreStore.defaultStack` with a default `DataStack`
+- Triggers the lazy-initialization of `CoreStoreDefaults.dataStack` with a default `DataStack`
 - Sets up the stack's `NSPersistentStoreCoordinator`, the root saving `NSManagedObjectContext`, and the read-only main `NSManagedObjectContext`
 - Adds an `SQLiteStore` in the *"Application Support/<bundle id>"* directory (or the *"Caches/<bundle id>"* directory on tvOS) with the file name *"[App bundle name].sqlite"*
 - Creates and returns the `NSPersistentStore` instance on success, or an `NSError` on failure
@@ -223,13 +223,13 @@ let migrationProgress = dataStack.addStorage(
     }
 )
 
-CoreStore.defaultStack = dataStack // pass the dataStack to CoreStore for easier access later on
+CoreStoreDefaults.dataStack = dataStack // pass the dataStack to CoreStore for easier access later on
 ```
 
 > 💡If you have never heard of "Configurations", you'll find them in your *.xcdatamodeld* file
 > <img src="https://cloud.githubusercontent.com/assets/3029684/8333192/e52cfaac-1acc-11e5-9902-08724f9f1324.png" alt="xcode configurations screenshot" height=212 />
 
-In our sample code above, note that you don't need to do the `CoreStore.defaultStack = dataStack` line. You can just as well hold a reference to the `DataStack` like below and call all its instance methods directly:
+In our sample code above, note that you don't need to do the `CoreStoreDefaults.dataStack = dataStack` line. You can just as well hold a reference to the `DataStack` like below and call all its instance methods directly:
 ```swift
 class MyViewController: UIViewController {
     let dataStack = DataStack(xcodeModelName: "MyModel") // keep reference to the stack
@@ -247,24 +247,6 @@ class MyViewController: UIViewController {
     }
 }
 ```
-The difference is when you set the stack as the `CoreStore.defaultStack`, you can call the stack's methods directly from `CoreStore` itself:
-```swift
-class MyViewController: UIViewController {
-    // elsewhere: CoreStore.defaultStack = DataStack(modelName: "MyModel")
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        do {
-            try CoreStore.addStorageAndWait(SQLiteStore.self)
-        }
-        catch { // ...
-        }
-    }
-    func methodToBeCalledLaterOn() {
-        let objects = CoreStore.fetchAll(From<MyEntity>())
-        print(objects)
-    }
-}
-```
 
 > 💡By default, CoreStore will initialize `NSManagedObject`s from *.xcdatamodeld* files, but you can create models completely from source code using `CoreStoreObject`s and `CoreStoreSchema`.  To use this feature, refer to [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects).
 
@@ -273,7 +255,7 @@ Notice that in our previous examples, `addStorageAndWait(_:)` and `addStorage(_:
 ### In-memory store
 The most basic `StorageInterface` concrete type is the `InMemoryStore`, which just stores objects in memory. Since `InMemoryStore`s always start with a fresh empty data, they do not need any migration information.
 ```swift
-try CoreStore.addStorageAndWait(
+try dataStack.addStorageAndWait(
     InMemoryStore(
         configuration: "Config2" // optional. Use entities from the "Config2" configuration in the .xcdatamodeld file
     )
@@ -283,7 +265,7 @@ try CoreStore.addStorageAndWait(
 ### Local Store
 The most common `StorageInterface` you will probably use is the `SQLiteStore`, which saves data in a local SQLite file.
 ```swift
-let migrationProgress = CoreStore.addStorage(
+let migrationProgress = dataStack.addStorage(
     SQLiteStore(
         fileName: "MyStore.sqlite",
         configuration: "Config2", // optional. Use entities from the "Config2" configuration in the .xcdatamodeld file
@@ -297,7 +279,7 @@ Refer to the *SQLiteStore.swift* source documentation for detailed explanations
 
 CoreStore can decide the default values for these properties, so `SQLiteStore`s can be initialized with no arguments:
 ```swift
-try CoreStore.addStorageAndWait(SQLiteStore())
+try dataStack.addStorageAndWait(SQLiteStore())
 ```
 
 The file-related properties above are actually requirements of another protocol that `SQLiteStore` implements, the `LocalStorage` protocol:
@@ -318,7 +300,7 @@ If you have custom `NSIncrementalStore` or `NSAtomicStore` subclasses, you can i
 ### Declaring model versions
 Until CoreStore 4.0, model versions were always assumed to be declared in *.xcdatamodeld* files. The `DataStack` loads these for us by accepting the *.xcdatamodeld* file name and the `Bundle` where the files can be found:
 ```swift
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     xcodeModelName: "MyModel",
     bundle: Bundle.main,
     migrationChain: ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4"]
@@ -334,7 +316,7 @@ All the `DynamicSchema` for all model versions are then collected within a singl
 
 **Multiple model versions grouped in a *.xcdatamodeld* file (Core Data standard method)**
 ```swift
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     xcodeModelName: "MyModel",
     bundle: Bundle.main,
     migrationChain: ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4"]
@@ -354,7 +336,7 @@ class Person: CoreStoreObject {
     // ...
 }
 
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     CoreStoreSchema(
         modelVersion: "V1",
         entities: [
@@ -391,7 +373,7 @@ let newSchema = CoreStoreSchema(
         Entity<Person>("Person")
     ]
 )
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     schemaHistory: SchemaHistory(
         legacySchema + [newSchema],
         migrationChain: ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4", "V1"] 
@@ -427,7 +409,7 @@ enum V1 {
     }
 }
 
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     CoreStoreSchema(
         modelVersion: "V1",
         entities: [
@@ -533,7 +515,7 @@ Sometimes migrations are huge and you may want prior information so your app cou
 ```swift
 do {
     let storage = SQLiteStorage(fileName: "MyStore.sqlite")
-    let migrationTypes: [MigrationType] = try CoreStore.requiredMigrationsForStorage(storage)
+    let migrationTypes: [MigrationType] = try dataStack.requiredMigrationsForStorage(storage)
     if migrationTypes.count > 1
         || (migrationTypes.filter { $0.isHeavyweightMigration }.count) > 0 {
         // ... will migrate more than once. Show special waiting screen
@@ -544,7 +526,7 @@ do {
     else {
         // ... Do nothing
     }
-    CoreStore.addStorage(storage, completion: { /* ... */ })
+    dataStack.addStorage(storage, completion: { /* ... */ })
 }
 catch {
     // ... either inspection of the store failed, or if no mapping model was found/inferred
@@ -633,7 +615,7 @@ dataStack.perform(
 ```
 or for the default stack, directly from `CoreStore`:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         // make changes
     },
@@ -668,7 +650,7 @@ The examples above use `perform(asynchronous:...)`, but there are actually 3 typ
 #### Asynchronous transactions
 are spawned from `perform(asynchronous:...)`. This method returns immediately and executes its closure from a background serial queue. The return value for the closure is declared as a generic type, so any value returned from the closure can be passed to the completion result:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Bool in
         // make changes
         return transaction.hasChanges
@@ -683,7 +665,7 @@ CoreStore.perform(
 ```
 The success and failure can also be declared as separate handlers:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Int in
         // make changes
         return transaction.delete(objects)
@@ -704,7 +686,7 @@ Transactions created from `perform(asynchronous:...)` are instances of `Asynchro
 #### Synchronous transactions
 are created from `perform(synchronous:...)`. While the syntax is similar to its asynchronous counterpart, `perform(synchronous:...)` waits for its transaction block to complete before returning:
 ```swift
-let hasChanges = CoreStore.perform(
+let hasChanges = dataStack.perform(
     synchronous: { (transaction) -> Bool in
         // make changes
         return transaction.hasChanges
@@ -717,14 +699,14 @@ Since `perform(synchronous:...)` technically blocks two queues (the caller's que
 
 By default, `perform(synchronous:...)` will wait for observers such as `ListMonitor`s to be notified before the method returns. This may cause deadlocks, especially if you are calling this from the main thread. To reduce this risk, you may try to set the `waitForAllObservers:` parameter to `false`. Doing so tells the `SynchronousDataTransaction` to block only until it completes saving. It will not wait for other context's to receive those changes. This reduces deadlock risk but may have surprising side-effects:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     synchronous: { (transaction) in
         let person = transaction.create(Into<Person>())
         person.name = "John"
     },
     waitForAllObservers: false
 )
-let newPerson = CoreStore.fetchOne(From<Person>.where(\.name == "John"))
+let newPerson = dataStack.fetchOne(From<Person>.where(\.name == "John"))
 // newPerson may be nil!
 // The DataStack may have not yet received the update notification.
 ```
@@ -733,7 +715,7 @@ Due to this complicated nature of synchronous transactions, if your app has very
 #### Unsafe transactions
 are special in that they do not enclose updates within a closure:
 ```swift
-let transaction = CoreStore.beginUnsafe()
+let transaction = dataStack.beginUnsafe()
 // make changes
 downloadJSONWithCompletion({ (json) -> Void in
 
@@ -779,7 +761,7 @@ Note that if you do explicitly specify the configuration name, CoreStore will on
 
 After creating an object from the transaction, you can simply update its properties as normal:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let person = transaction.create(Into<MyPersonEntity>())
         person.name = "John Smith"
@@ -790,7 +772,7 @@ CoreStore.perform(
 ```
 To update an existing object, fetch the object's instance from the transaction:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let person = try transaction.fetchOne(
             From<MyPersonEntity>()
@@ -807,7 +789,7 @@ CoreStore.perform(
 ```swift
 let jane: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         // WRONG: jane.age = jane.age + 1
         // RIGHT:
@@ -822,7 +804,7 @@ This is also true when updating an object's relationships. Make sure that the ob
 let jane: MyPersonEntity = // ...
 let john: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         // WRONG: jane.friends = [john]
         // RIGHT:
@@ -840,7 +822,7 @@ Deleting an object is simpler because you can tell a transaction to delete an ob
 ```swift
 let john: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         transaction.delete(john)
     },
@@ -852,7 +834,7 @@ or several objects at once:
 let john: MyPersonEntity = // ...
 let jane: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         try transaction.delete(john, jane)
         // try transaction.delete([john, jane]) is also allowed
@@ -862,7 +844,7 @@ CoreStore.perform(
 ```
 If you do not have references yet to the objects to be deleted, transactions have a `deleteAll(...)` method you can pass a query to:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         try transaction.deleteAll(
             From<MyPersonEntity>()
@@ -879,7 +861,7 @@ Always remember that the `DataStack` and individual transactions manage differen
 ```swift
 let jane: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let jane = transaction.edit(jane)!
         jane.age = jane.age + 1
@@ -891,14 +873,14 @@ But `CoreStore`, `DataStack` and `BaseDataTransaction` have a very flexible `fet
 ```swift
 let jane: MyPersonEntity = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> MyPersonEntity in
         let jane = transaction.fetchExisting(jane)! // instance for transaction
         jane.age = jane.age + 1
         return jane
     },
     success: { (transactionJane) in
-        let jane = CoreStore.fetchExisting(transactionJane)! // instance for DataStack
+        let jane = dataStack.fetchExisting(transactionJane)! // instance for DataStack
         print(jane.age)
     },
     failure: { (error) in
@@ -910,7 +892,7 @@ CoreStore.perform(
 ```swift
 var peopleIDs: [NSManagedObjectID] = // ...
 
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let jane = try transaction.fetchOne(
             From<MyPersonEntity>()
@@ -934,7 +916,7 @@ person.age = json["age"] as? NSNumber
 ```
 If you have many attributes, you don't want to keep repeating this mapping everytime you want to import data. CoreStore lets you write the data mapping code just once, and all you have to do is call `importObject(...)` or `importUniqueObject(...)` through `BaseDataTransaction` subclasses:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let json: [String: Any] = // ...
         try! transaction.importObject(
@@ -976,7 +958,7 @@ typealias ImportSource = [String: Any]
 ```
 This lets us call `importObject(_:source:)` with any `[String: Any]` type as the argument to `source`:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let json: [String: Any] = // ...
         try! transaction.importObject(
@@ -998,7 +980,7 @@ func didInsert(from source: ImportSource, in transaction: BaseDataTransaction) t
 ```
 Transactions also let you import multiple objects at once using the `importObjects(_:sourceArray:)` method:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let jsonArray: [[String: Any]] = // ...
         try! transaction.importObjects(
@@ -1025,7 +1007,7 @@ func didInsert(from source: ImportSource, in transaction: BaseDataTransaction) t
 ```
 Doing so can let you abandon an invalid transaction immediately:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let jsonArray: [[String: Any]] = // ...
 
@@ -1080,7 +1062,7 @@ For `ImportableUniqueObject`, the extraction and assignment of values should be
 
 You can then create/update an object by calling a transaction's `importUniqueObject(...)` method:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let json: [String: Any] = // ...
         try! transaction.importUniqueObject(
@@ -1095,7 +1077,7 @@ CoreStore.perform(
 or multiple objects at once with the `importUniqueObjects(...)` method:
 
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) -> Void in
         let jsonArray: [[String: AnyObject]] = // ...
         try! transaction.importUniqueObjects(
@@ -1125,17 +1107,17 @@ Before we dive in, be aware that CoreStore distinguishes between *fetching* and
 #### `From` clause
 The search conditions for fetches and queries are specified using *clauses*. All fetches and queries require a `From` clause that indicates the target entity type:
 ```swift
-let people = try CoreStore.fetchAll(From<MyPersonEntity>())
+let people = try dataStack.fetchAll(From<MyPersonEntity>())
 ```
 `people` in the example above will be of type `[MyPersonEntity]`. The `From<MyPersonEntity>()` clause indicates a fetch to all persistent stores that `MyPersonEntity` belong to.
 
 If the entity exists in multiple configurations and you need to only search from a particular configuration, indicate in the `From` clause the configuration name for the destination persistent store:
 ```swift
-let people = try CoreStore.fetchAll(From<MyPersonEntity>("Config1")) // ignore objects in persistent stores other than the "Config1" configuration
+let people = try dataStack.fetchAll(From<MyPersonEntity>("Config1")) // ignore objects in persistent stores other than the "Config1" configuration
 ```
 or if the persistent store is the auto-generated "Default" configuration, specify `nil`:
 ```swift
-let person = try CoreStore.fetchAll(From<MyPersonEntity>(nil))
+let person = try dataStack.fetchAll(From<MyPersonEntity>(nil))
 ```
 Now we know how to use a `From` clause, let's move on to fetching and querying.
 
@@ -1155,11 +1137,11 @@ Each method's purpose is straightforward, but we need to understand how to set t
 
 The `Where` clause is CoreStore's `NSPredicate` wrapper. It specifies the search filter to use when fetching (or querying). It implements all initializers that `NSPredicate` does (except for `-predicateWithBlock:`, which Core Data does not support):
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>(),
     Where<MyPersonEntity>("%K > %d", "age", 30) // string format initializer
 )
-people = try CoreStore.fetchAll(
+people = try dataStack.fetchAll(
     From<MyPersonEntity>(),
     Where<MyPersonEntity>(true) // boolean initializer
 )
@@ -1167,21 +1149,21 @@ people = try CoreStore.fetchAll(
 If you do have an existing `NSPredicate` instance already, you can pass that to `Where` as well:
 ```swift
 let predicate = NSPredicate(...)
-var people = CoreStore.fetchAll(
+var people = dataStack.fetchAll(
     From<MyPersonEntity>(),
     Where<MyPersonEntity>(predicate) // predicate initializer
 )
 ```
 ⭐️Starting CoreStore 5.0, `Where` clauses became more type-safe and are now generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `Where` clause expression:
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>()
         .where(\.age > 30) // Type-safe!
 )
 ```
 `Where` clauses also implement the `&&`, `||`, and `!` logic operators, so you can provide logical conditions without writing too much `AND`, `OR`, and `NOT` strings:
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>()
         .where(\.age > 30 && \.gender == "M")
 )
@@ -1192,7 +1174,7 @@ If you do not provide a `Where` clause, all objects that belong to the specified
 
 The `OrderBy` clause is CoreStore's `NSSortDescriptor` wrapper. Use it to specify attribute keys in which to sort the fetch (or query) results with.
 ```swift
-var mostValuablePeople = try CoreStore.fetchAll(
+var mostValuablePeople = try dataStack.fetchAll(
     From<MyPersonEntity>(),
     OrderBy<MyPersonEntity>(.descending("rating"), .ascending("surname"))
 )
@@ -1200,7 +1182,7 @@ var mostValuablePeople = try CoreStore.fetchAll(
 As seen above, `OrderBy` accepts a list of `SortKey` enumeration values, which can be either `.ascending` or `.descending`.
 ⭐️As with `Where` clauses, CoreStore 5.0 turned `OrderBy` clauses into generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `OrderBy` clause expression:
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>()
         .orderBy(.descending(\.rating), .ascending(\.surname)) // Type-safe!
 )
@@ -1212,7 +1194,7 @@ var orderBy = OrderBy<MyPersonEntity>(.descending(\.rating))
 if sortFromYoungest {
     orderBy += OrderBy(.ascending(\.age))
 }
-var mostValuablePeople = try CoreStore.fetchAll(
+var mostValuablePeople = try dataStack.fetchAll(
     From<MyPersonEntity>(),
     orderBy
 )
@@ -1222,7 +1204,7 @@ var mostValuablePeople = try CoreStore.fetchAll(
 
 The `Tweak` clause lets you, uh, *tweak* the fetch (or query). `Tweak` exposes the `NSFetchRequest` in a closure where you can make changes to its properties:
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>(),
     Where<MyPersonEntity>("age > %d", 30),
     OrderBy<MyPersonEntity>(.ascending("surname")),
@@ -1235,7 +1217,7 @@ var people = try CoreStore.fetchAll(
 ```
 `Tweak` also supports **Fetch Chain builders**:
 ```swift
-var people = try CoreStore.fetchAll(
+var people = try dataStack.fetchAll(
     From<MyPersonEntity>(),
         .where(\.age > 30)
         .orderBy(.ascending(\.surname))
@@ -1266,7 +1248,7 @@ Setting up the `From`, `Where`, `OrderBy`, and `Tweak` clauses is similar to how
 
 The `Select<T>` clause specifies the target attribute/aggregate key, as well as the expected return type: 
 ```swift
-let johnsAge = try CoreStore.queryValue(
+let johnsAge = try dataStack.queryValue(
     From<MyPersonEntity>(),
     Select<Int>("age"),
     Where("name == %@", "John Smith")
@@ -1276,14 +1258,14 @@ The example above queries the "age" property for the first object that matches t
 
 For `queryAttributes(...)`, only `NSDictionary` is valid for `Select`, thus you are allowed to omit the generic type:
 ```swift
-let allAges = try CoreStore.queryAttributes(
+let allAges = try dataStack.queryAttributes(
     From<MyPersonEntity>(),
     Select("age")
 )
 ```
 ⭐️Starting CoreStore 5.0, query methods now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
-let johnsAge = try CoreStore.queryValue(
+let johnsAge = try dataStack.queryValue(
     From<MyPersonEntity>()
         .select(\.age) // binds the result to Int
         .where(\.name == "John Smith")
@@ -1298,7 +1280,7 @@ If you only need a value for a particular attribute, you can just specify the ke
 - `.sum(...)`
 
 ```swift
-let oldestAge = try CoreStore.queryValue(
+let oldestAge = try dataStack.queryValue(
     From<MyPersonEntity>(),
     Select<Int>(.maximum("age"))
 )
@@ -1306,7 +1288,7 @@ let oldestAge = try CoreStore.queryValue(
 
 For `queryAttributes(...)` which returns an array of dictionaries, you can specify multiple attributes/aggregates to `Select`:
 ```swift
-let personJSON = try CoreStore.queryAttributes(
+let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>(),
     Select("name", "age")
 )
@@ -1326,7 +1308,7 @@ let personJSON = try CoreStore.queryAttributes(
 ```
 You can also include an aggregate as well:
 ```swift
-let personJSON = try CoreStore.queryAttributes(
+let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>(),
     Select("name", .count("friends"))
 )
@@ -1346,7 +1328,7 @@ which returns:
 ```
 The `"count(friends)"` key name was automatically used by CoreStore, but you can specify your own key alias if you need:
 ```swift
-let personJSON = try CoreStore.queryAttributes(
+let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>(),
     Select("name", .count("friends", as: "friendsCount"))
 )
@@ -1369,7 +1351,7 @@ which now returns:
 
 The `GroupBy` clause lets you group results by a specified attribute/aggregate. This is useful only for `queryAttributes(...)` since `queryValue(...)` just returns the first value.
 ```swift
-let personJSON = try CoreStore.queryAttributes(
+let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>(),
     Select("age", .count("age", as: "count")),
     GroupBy("age")
@@ -1377,7 +1359,7 @@ let personJSON = try CoreStore.queryAttributes(
 ```
 ⭐️Starting CoreStore 5.0, `GroupBy` clauses are now also generic types and now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
-let personJSON = try CoreStore.queryAttributes(
+let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>()
         .select(.attribute(\.age), .count(\.age, as: "count"))
         .groupBy(\.age)
@@ -1407,9 +1389,9 @@ public protocol CoreStoreLogger {
     func abort(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
 }
 ```
-Implement this protocol with your custom class then pass the instance to `CoreStore.logger`:
+Implement this protocol with your custom class then pass the instance to `CoreStoreDefaults.logger`:
 ```swift
-CoreStore.logger = MyLogger()
+CoreStoreDefaults.logger = MyLogger()
 ```
 Doing so channels all logging calls to your logger.
 
@@ -1479,7 +1461,7 @@ class MyViewController: UIViewController, ObjectObserver {
 We then need to keep an `ObjectMonitor` instance and register our `ObjectObserver` as an observer:
 ```swift
 let person: MyPersonEntity = // ...
-self.monitor = CoreStore.monitorObject(person)
+self.monitor = dataStack.monitorObject(person)
 self.monitor.addObserver(self)
 ```
 The controller will then notify our observer whenever the object's attributes change. You can add multiple `ObjectObserver`s to a single `ObjectMonitor` without any problem. This means you can just share around the `ObjectMonitor` instance to different screens without problem.
@@ -1526,7 +1508,7 @@ Including `ListObserver`, there are 3 observer protocols you can implement depen
 
 We then need to create a `ListMonitor` instance and register our `ListObserver` as an observer:
 ```swift
-self.monitor = CoreStore.monitorList(
+self.monitor = dataStack.monitorList(
     From<MyPersonEntity>()
         .where(\.age > 30)
         .orderBy(.ascending(\.name))
@@ -1545,7 +1527,7 @@ let firstPerson = self.monitor[0]
 
 If the list needs to be grouped into sections, create the `ListMonitor` instance with the `monitorSectionedList(...)` method and a `SectionBy` clause:
 ```swift
-self.monitor = CoreStore.monitorSectionedList(
+self.monitor = dataStack.monitorSectionedList(
     From<MyPersonEntity>()
         .sectionBy(\.age)
         .where(\.gender == "M")
@@ -1557,7 +1539,7 @@ A list controller created this way will group the objects by the attribute key i
 
 The `SectionBy` clause can also be passed a closure to transform the section name into a displayable string:
 ```swift
-self.monitor = CoreStore.monitorSectionedList(
+self.monitor = dataStack.monitorSectionedList(
     From<MyPersonEntity>()
         .sectionBy(\.age) { (sectionName) -> String? in
             "\(sectionName) years old"
@@ -1590,7 +1572,7 @@ All CoreStore types are still written in pure Swift, but most core types have Ob
 <tr><th>Swift</th><th>Objective-C</th></tr>
 <tr>
 <td><pre lang=swift>
-try CoreStore.addStorageAndWait(SQLiteStore.self)
+try dataStack.addStorageAndWait(SQLiteStore.self)
 </pre></td>
 <td><pre lang=objc>
 NSError *error
@@ -1599,7 +1581,7 @@ NSError *error
 </tr>
 <tr>
 <td><pre lang=swift>
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) in
         // ...
     },
@@ -1631,7 +1613,7 @@ All of these `CS`-prefixed bridging classes have very similar usage to the exist
 For example, you may have a new, modern Swift class that holds a `ListMonitor`:
 ```swift
 class MyViewController: UIViewController {
-    let monitor = CoreStore.monitorList(From<MyEntity>(), ...)
+    let monitor = dataStack.monitorList(From<MyEntity>(), ...)
     // ...
 }
 ```
@@ -1645,7 +1627,7 @@ Now let's say you have a legacy Objective-C class that previously uses `NSFetche
 When you need to instantiate this class from Swift, you just call `bridgeToObjectiveC`:
 ```swift
 class MyViewController: UIViewController {
-    let monitor = CoreStore.monitorList(From<MyEntity>(), ...)
+    let monitor = dataStack.monitorList(From<MyEntity>(), ...)
     func showOldController() {
         let controller = MYOldViewController(monitor: self.monitor.bridgeToObjectiveC)
         self.presentViewController(controller, animated: true, completion: nil)
@@ -1719,7 +1701,7 @@ Also note how `Relationship`s are linked statically with the `inverse:` argument
 To tell the `DataStack` about these types, add all `CoreStoreObject`s' entities to a `CoreStoreSchema`:
 ```swift
 
-CoreStore.defaultStack = DataStack(
+CoreStoreDefaults.dataStack = DataStack(
     CoreStoreSchema(
         modelVersion: "V1",
         entities: [
@@ -1729,13 +1711,13 @@ CoreStore.defaultStack = DataStack(
         ]
     )
 )
-CoreStore.addStorage(/* ... */)
+CoreStoreDefaults.dataStack.addStorage(/* ... */)
 ```
 And that's all CoreStore needs to build the model; **we don't need *.xcdatamodeld* files anymore.**
 
 These special properties' values can be accessed or mutated using `.value`:
 ```swift
-CoreStore.perform(
+dataStack.perform(
     asynchronous: { (transaction) in
         let dog: Dog = transaction.fetchOne(From<Dog>())!
         // ...
@@ -1755,7 +1737,7 @@ let keyPath: String = Dog.keyPath { $0.nickname }
 ```
 as well as `Where` and `OrderBy` clauses
 ```swift
-let puppies = try CoreStore.fetchAll(
+let puppies = try dataStack.fetchAll(
     From<Dog>()
         .where(\.age < 1)
         .orderBy(.ascending(\.age))
@@ -1790,7 +1772,7 @@ CoreStoreSchema(
 ```
 You can also get this hash after the `DataStack` has been fully set up by printing to the console:
 ```swift
-print(CoreStore.defaultStack.modelSchema.printCoreStoreSchema())
+print(CoreStoreDefaults.dataStack.modelSchema.printCoreStoreSchema())
 ```
 
 Once the version lock is set, any changes in the properties or to the model will trigger an assertion failure similar to this:
@@ -1811,7 +1793,7 @@ Once the version lock is set, any changes in the properties or to the model will
 ### Install with CocoaPods
 In your `Podfile`, add
 ```
-pod 'CoreStore', '~> 6.3'
+pod 'CoreStore', '~> 7.0'
 ```
 and run 
 ```
@@ -1822,7 +1804,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 ### Install with Carthage
 In your `Cartfile`, add
 ```
-github "JohnEstropia/CoreStore" >= 6.3.0
+github "JohnEstropia/CoreStore" >= 7.0.0
 ```
 and run 
 ```
@@ -1833,7 +1815,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: "6.3.0"))
+    .package(url: "https://github.com/JohnEstropia/CoreStore.git", from: "7.0.0"))
 ]
 ```
 Declare `import CoreStore` in your swift file to use the library.
diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift
index 988e337..002f566 100644
--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -30,7 +30,7 @@ import CoreData
 // MARK: - AsynchronousDataTransaction
 
 /**
- The `AsynchronousDataTransaction` provides an interface for `DynamicObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.perform(asynchronous:...)`, or from `CoreStore.perform(synchronous:...)`.
+ The `AsynchronousDataTransaction` provides an interface for `DynamicObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.perform(asynchronous:...)`.
  */
 public final class AsynchronousDataTransaction: BaseDataTransaction {
     
diff --git a/Sources/CSCoreStore+Setup.swift b/Sources/CSCoreStore+Setup.swift
index 0028a94..6665205 100644
--- a/Sources/CSCoreStore+Setup.swift
+++ b/Sources/CSCoreStore+Setup.swift
@@ -38,7 +38,7 @@ extension CSCoreStore {
     @objc
     public static var modelVersion: String {
         
-        return CoreStore.modelVersion
+        return self.defaultStack.modelVersion
     }
     
     /**
@@ -47,7 +47,7 @@ extension CSCoreStore {
     @objc
     public static func entityTypesByNameForType(_ type: NSManagedObject.Type) -> [EntityName: NSManagedObject.Type] {
         
-        return CoreStore.entityTypesByName(for: type)
+        return self.defaultStack.bridgeToSwift.entityTypesByName(for: type)
     }
     
     /**
@@ -56,7 +56,7 @@ extension CSCoreStore {
     @objc
     public static func entityDescriptionForClass(_ type: NSManagedObject.Type) -> NSEntityDescription? {
         
-        return CoreStore.entityDescription(for: type)
+        return self.defaultStack.bridgeToSwift.entityDescription(for: type)
     }
     
     /**
diff --git a/Sources/CSCoreStore+Transaction.swift b/Sources/CSCoreStore+Transaction.swift
index bda8282..53a4f9f 100644
--- a/Sources/CSCoreStore+Transaction.swift
+++ b/Sources/CSCoreStore+Transaction.swift
@@ -65,7 +65,7 @@ extension CSCoreStore {
         
         return bridge {
             
-            CoreStore.beginUnsafe()
+            self.defaultStack.bridgeToSwift.beginUnsafe()
         }
     }
     
@@ -80,7 +80,7 @@ extension CSCoreStore {
         
         return bridge {
             
-            CoreStore.beginUnsafe(supportsUndo: supportsUndo)
+            self.defaultStack.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo)
         }
     }
     
@@ -90,6 +90,6 @@ extension CSCoreStore {
     @objc
     public static func refreshAndMergeAllObjects() {
         
-        CoreStore.refreshAndMergeAllObjects()
+        self.defaultStack.refreshAndMergeAllObjects()
     }
 }
diff --git a/Sources/CSCoreStore.swift b/Sources/CSCoreStore.swift
index ef5709b..c07e675 100644
--- a/Sources/CSCoreStore.swift
+++ b/Sources/CSCoreStore.swift
@@ -46,8 +46,8 @@ public final class CSCoreStore: NSObject {
     @objc
     public static var defaultStack: CSDataStack {
         
-        get { return Shared.defaultStack.bridgeToObjectiveC }
-        set { Shared.defaultStack = newValue.bridgeToSwift }
+        get { return CoreStoreDefaults.dataStack.bridgeToObjectiveC }
+        set { CoreStoreDefaults.dataStack = newValue.bridgeToSwift }
     }
     
     
diff --git a/Sources/CoreStore+Logging.swift b/Sources/CoreStore+Logging.swift
index b2fe6ed..d984871 100644
--- a/Sources/CoreStore+Logging.swift
+++ b/Sources/CoreStore+Logging.swift
@@ -35,7 +35,7 @@ extension Internals {
     @inline(__always)
     internal static func log(_ level: LogLevel, message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
 
-        Shared.logger.log(
+        CoreStoreDefaults.logger.log(
             level: level,
             message: message,
             fileName: fileName,
@@ -47,7 +47,7 @@ extension Internals {
     @inline(__always)
     internal static func log(_ error: CoreStoreError, _ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
 
-        Shared.logger.log(
+        CoreStoreDefaults.logger.log(
             error: error,
             message: message,
             fileName: fileName,
@@ -59,7 +59,7 @@ extension Internals {
     @inline(__always)
     internal static func assert( _ condition: @autoclosure () -> Bool, _ message: @autoclosure () -> String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
 
-        Shared.logger.assert(
+        CoreStoreDefaults.logger.assert(
             condition(),
             message: message(),
             fileName: fileName,
@@ -71,7 +71,7 @@ extension Internals {
     @inline(__always)
     internal static func abort(_ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) -> Never  {
 
-        Shared.logger.abort(
+        CoreStoreDefaults.logger.abort(
             message,
             fileName: fileName,
             lineNumber: lineNumber,
diff --git a/Sources/CoreStore+Migration.swift b/Sources/CoreStore+Migration.swift
index 0615d7c..e0dac94 100644
--- a/Sources/CoreStore+Migration.swift
+++ b/Sources/CoreStore+Migration.swift
@@ -33,9 +33,9 @@ import CoreData
 extension CoreStore {
 
     /**
-     Asynchronously adds a `StorageInterface` to the `defaultStack`. Migrations are also initiated by default.
+     Asynchronously adds a `StorageInterface` to the `CoreStoreDefaults.dataStack`. Migrations are also initiated by default.
      ```
-     CoreStore.addStorage(
+     dataStack.addStorage(
          InMemoryStore(configuration: "Config1"),
          completion: { result in
              switch result {
@@ -50,13 +50,13 @@ extension CoreStore {
      */
     public static func addStorage<T>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) {
         
-        Shared.defaultStack.addStorage(storage, completion: completion)
+        CoreStoreDefaults.dataStack.addStorage(storage, completion: completion)
     }
 
     /**
-     Asynchronously adds a `LocalStorage` to the `defaultStack`. Migrations are also initiated by default.
+     Asynchronously adds a `LocalStorage` to the `CoreStoreDefaults.dataStack`. Migrations are also initiated by default.
      ```
-     let migrationProgress = CoreStore.addStorage(
+     let migrationProgress = dataStack.addStorage(
          SQLiteStore(fileName: "core_data.sqlite", configuration: "Config1"),
          completion: { result in
              switch result {
@@ -72,11 +72,11 @@ extension CoreStore {
      */
     public static func addStorage<T: LocalStorage>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) -> Progress? {
         
-        return Shared.defaultStack.addStorage(storage, completion: completion)
+        return CoreStoreDefaults.dataStack.addStorage(storage, completion: completion)
     }
     
     /**
-     Asynchronously adds a `CloudStorage` to the `defaultStack`. Migrations are also initiated by default.
+     Asynchronously adds a `CloudStorage` to the `CoreStoreDefaults.dataStack`. Migrations are also initiated by default.
      ```
      guard let storage = ICloudStore(
          ubiquitousContentName: "MyAppCloudData",
@@ -104,11 +104,11 @@ extension CoreStore {
      */
     public static func addStorage<T: CloudStorage>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) {
         
-        Shared.defaultStack.addStorage(storage, completion: completion)
+        CoreStoreDefaults.dataStack.addStorage(storage, completion: completion)
     }
 
     /**
-     Migrates a local storage to match the `defaultStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
+     Migrates a local storage to match the `CoreStoreDefaults.dataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
 
      - parameter storage: the local storage
      - parameter completion: the closure to be executed on the main queue when the migration completes, either due to success or failure. The closure's `MigrationResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.failure` result if an error occurs asynchronously.
@@ -117,11 +117,11 @@ extension CoreStore {
      */
     public static func upgradeStorageIfNeeded<T: LocalStorage>(_ storage: T, completion: @escaping (MigrationResult) -> Void) throws -> Progress? {
         
-        return try Shared.defaultStack.upgradeStorageIfNeeded(storage, completion: completion)
+        return try CoreStoreDefaults.dataStack.upgradeStorageIfNeeded(storage, completion: completion)
     }
     
     /**
-     Checks the migration steps required for the storage to match the `defaultStack`'s managed object model version.
+     Checks the migration steps required for the storage to match the `CoreStoreDefaults.dataStack`'s managed object model version.
      
      - parameter storage: the local storage
      - throws: a `CoreStoreError` value indicating the failure
@@ -129,6 +129,6 @@ extension CoreStore {
      */
     public static func requiredMigrationsForStorage<T: LocalStorage>(_ storage: T) throws -> [MigrationType] {
         
-        return try Shared.defaultStack.requiredMigrationsForStorage(storage)
+        return try CoreStoreDefaults.dataStack.requiredMigrationsForStorage(storage)
     }
 }
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index a8aa4dd..94fd5b7 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -34,18 +34,18 @@ import CoreData
 extension CoreStore {
     
     /**
-     Using the `defaultStack`, creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
+     Using the `CoreStoreDefaults.dataStack`, creates an `ObjectMonitor` for the specified `DynamicObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `DynamicObject`.
      
      - parameter object: the `DynamicObject` to observe changes from
      - returns: an `ObjectMonitor` that monitors changes to `object`
      */
     public static func monitorObject<O: DynamicObject>(_ object: O) -> ObjectMonitor<O> {
         
-        return Shared.defaultStack.monitorObject(object)
+        return CoreStoreDefaults.dataStack.monitorObject(object)
     }
     
     /**
-     Using the `defaultStack`, creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     Using the `CoreStoreDefaults.dataStack`, creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
      
      - 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.
@@ -53,11 +53,11 @@ extension CoreStore {
      */
     public static func monitorList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
         
-        return Shared.defaultStack.monitorList(from, fetchClauses)
+        return CoreStoreDefaults.dataStack.monitorList(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     Using the `CoreStoreDefaults.dataStack`, creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
      
      - 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.
@@ -65,13 +65,13 @@ extension CoreStore {
      */
     public static func monitorList<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
         
-        return Shared.defaultStack.monitorList(from, fetchClauses)
+        return CoreStoreDefaults.dataStack.monitorList(from, fetchClauses)
     }
     
     /**
      Creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
      ```
-     let monitor = CoreStore.monitorList(
+     let monitor = dataStack.monitorList(
          From<MyPersonEntity>()
              .where(\.age > 18)
              .orderBy(.ascending(\.age))
@@ -82,11 +82,11 @@ extension CoreStore {
      */
     public static func monitorList<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListMonitor<B.ObjectType> {
         
-        return Shared.defaultStack.monitorList(clauseChain.from, clauseChain.fetchClauses)
+        return CoreStoreDefaults.dataStack.monitorList(clauseChain.from, clauseChain.fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     Using the `CoreStoreDefaults.dataStack`, asynchronously creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
      
      - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
      - parameter from: a `From` clause indicating the entity type
@@ -94,11 +94,11 @@ extension CoreStore {
      */
     public static func monitorList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
         
-        Shared.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+        CoreStoreDefaults.dataStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     Using the `CoreStoreDefaults.dataStack`, asynchronously creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
      
      - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
      - parameter from: a `From` clause indicating the entity type
@@ -106,14 +106,14 @@ extension CoreStore {
      */
     public static func monitorList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
         
-        Shared.defaultStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+        CoreStoreDefaults.dataStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
     }
     
     /**
      Asynchronously creates a `ListMonitor` for a list of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
      
      ```
-     CoreStore.monitorList(
+     dataStack.monitorList(
          createAsynchronously: { (monitor) in
              self.monitor = monitor
          },
@@ -127,7 +127,7 @@ extension CoreStore {
      */
     public static func monitorList<B: FetchChainableBuilderType>(createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void, _ clauseChain: B) {
         
-        Shared.defaultStack.monitorList(
+        CoreStoreDefaults.dataStack.monitorList(
             createAsynchronously: createAsynchronously,
             clauseChain.from,
             clauseChain.fetchClauses
@@ -135,7 +135,7 @@ extension CoreStore {
     }
     
     /**
-     Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     Using the `CoreStoreDefaults.dataStack`, creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
@@ -144,11 +144,11 @@ extension CoreStore {
      */
     public static func monitorSectionedList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
         
-        return Shared.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
+        return CoreStoreDefaults.dataStack.monitorSectionedList(from, sectionBy, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     Using the `CoreStoreDefaults.dataStack`, creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
@@ -157,13 +157,13 @@ extension CoreStore {
      */
     public static func monitorSectionedList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
         
-        return Shared.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
+        return CoreStoreDefaults.dataStack.monitorSectionedList(from, sectionBy, fetchClauses)
     }
     
     /**
      Creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified `SectionMonitorBuilderType` built from a chain of clauses.
      ```
-     let monitor = CoreStore.monitorSectionedList(
+     let monitor = dataStack.monitorSectionedList(
          From<MyPersonEntity>()
              .sectionBy(\.age, { "\($0!) years old" })
              .where(\.age > 18)
@@ -175,7 +175,7 @@ extension CoreStore {
      */
     public static func monitorSectionedList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListMonitor<B.ObjectType> {
         
-        return Shared.defaultStack.monitorSectionedList(
+        return CoreStoreDefaults.dataStack.monitorSectionedList(
             clauseChain.from,
             clauseChain.sectionBy,
             clauseChain.fetchClauses
@@ -183,7 +183,7 @@ extension CoreStore {
     }
     
     /**
-     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     Using the `CoreStoreDefaults.dataStack`, asynchronously creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
      
      - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
      - parameter from: a `From` clause indicating the entity type
@@ -192,11 +192,11 @@ extension CoreStore {
      */
     public static func monitorSectionedList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
         
-        Shared.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+        CoreStoreDefaults.dataStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, asynchronously creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     Using the `CoreStoreDefaults.dataStack`, asynchronously creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
      
      - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
      - parameter from: a `From` clause indicating the entity type
@@ -205,13 +205,13 @@ extension CoreStore {
      */
     public static func monitorSectionedList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
         
-        Shared.defaultStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+        CoreStoreDefaults.dataStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
     }
     
     /**
      Asynchronously creates a `ListMonitor` for a sectioned list of `DynamicObject`s that satisfy the specified `SectionMonitorBuilderType` built from a chain of clauses.
      ```
-     CoreStore.monitorSectionedList(
+     dataStack.monitorSectionedList(
          createAsynchronously: { (monitor) in
              self.monitor = monitor
          },
@@ -226,7 +226,7 @@ extension CoreStore {
      */
     public static func monitorSectionedList<B: SectionMonitorBuilderType>(createAsynchronously: @escaping (ListMonitor<B.ObjectType>) -> Void, _ clauseChain: B) {
         
-        Shared.defaultStack.monitorSectionedList(
+        CoreStoreDefaults.dataStack.monitorSectionedList(
             createAsynchronously: createAsynchronously,
             clauseChain.from,
             clauseChain.sectionBy,
diff --git a/Sources/CoreStore+Querying.swift b/Sources/CoreStore+Querying.swift
index aa33d1d..9ccb96e 100644
--- a/Sources/CoreStore+Querying.swift
+++ b/Sources/CoreStore+Querying.swift
@@ -33,51 +33,51 @@ import CoreData
 extension CoreStore {
     
     /**
-     Using the `defaultStack`, fetches the `DynamicObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `DynamicObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
      
      - 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 static func fetchExisting<D: DynamicObject>(_ object: D) -> D? {
         
-        return Shared.defaultStack.fetchExisting(object)
+        return CoreStoreDefaults.dataStack.fetchExisting(object)
     }
     
     /**
-     Using the `defaultStack`, fetches the `DynamicObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `DynamicObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
      
      - parameter objectID: the `NSManagedObjectID` for the object
      - returns: the `DynamicObject` instance if the object exists in the `DataStack`, or `nil` if not found.
      */
     public static func fetchExisting<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D? {
         
-        return Shared.defaultStack.fetchExisting(objectID)
+        return CoreStoreDefaults.dataStack.fetchExisting(objectID)
     }
     
     /**
-     Using the `defaultStack`, fetches the `DynamicObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `DynamicObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
      
      - parameter objects: an array of `DynamicObject`s created/fetched outside the `DataStack`
      - returns: the `DynamicObject` array for objects that exists in the `DataStack`
      */
     public static func fetchExisting<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D {
         
-        return Shared.defaultStack.fetchExisting(objects)
+        return CoreStoreDefaults.dataStack.fetchExisting(objects)
     }
     
     /**
-     Using the `defaultStack`, fetches the `DynamicObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `DynamicObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
      
      - parameter objectIDs: the `NSManagedObjectID` array for the objects
      - returns: the `DynamicObject` array for objects that exists in the `DataStack`
      */
     public static func fetchExisting<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] where S.Iterator.Element == NSManagedObjectID {
         
-        return Shared.defaultStack.fetchExisting(objectIDs)
+        return CoreStoreDefaults.dataStack.fetchExisting(objectIDs)
     }
     
     /**
-     Using the `defaultStack`, fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -86,11 +86,11 @@ extension CoreStore {
      */
     public static func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
         
-        return try Shared.defaultStack.fetchOne(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchOne(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -99,13 +99,13 @@ extension CoreStore {
      */
     public static func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
         
-        return try Shared.defaultStack.fetchOne(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchOne(from, fetchClauses)
     }
     
     /**
      Fetches the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
      ```
-     let youngestTeen = CoreStore.fetchOne(
+     let youngestTeen = dataStack.fetchOne(
          From<MyPersonEntity>()
              .where(\.age > 18)
              .orderBy(.ascending(\.age))
@@ -117,11 +117,11 @@ extension CoreStore {
      */
     public static func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
         
-        return try Shared.defaultStack.fetchOne(clauseChain)
+        return try CoreStoreDefaults.dataStack.fetchOne(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -130,11 +130,11 @@ extension CoreStore {
      */
     public static func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
         
-        return try Shared.defaultStack.fetchAll(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchAll(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -143,13 +143,13 @@ extension CoreStore {
      */
     public static func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
         
-        return try Shared.defaultStack.fetchAll(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchAll(from, fetchClauses)
     }
     
     /**
      Fetches all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
      ```
-     let people = CoreStore.fetchAll(
+     let people = dataStack.fetchAll(
          From<MyPersonEntity>()
              .where(\.age > 18)
              .orderBy(.ascending(\.age))
@@ -161,11 +161,11 @@ extension CoreStore {
      */
     public static func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
         
-        return try Shared.defaultStack.fetchAll(clauseChain)
+        return try CoreStoreDefaults.dataStack.fetchAll(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -174,11 +174,11 @@ extension CoreStore {
      */
     public static func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
         
-        return try Shared.defaultStack.fetchCount(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchCount(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -187,13 +187,13 @@ extension CoreStore {
      */
     public static func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
         
-        return try Shared.defaultStack.fetchCount(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchCount(from, fetchClauses)
     }
     
     /**
      Fetches the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
      ```
-     let numberOfAdults = CoreStore.fetchCount(
+     let numberOfAdults = dataStack.fetchCount(
          From<MyPersonEntity>()
              .where(\.age > 18)
              .orderBy(.ascending(\.age))
@@ -205,11 +205,11 @@ extension CoreStore {
      */
     public static func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
         
-        return try Shared.defaultStack.fetchCount(clauseChain)
+        return try CoreStoreDefaults.dataStack.fetchCount(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -218,11 +218,11 @@ extension CoreStore {
      */
     public static func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
-        return try Shared.defaultStack.fetchObjectID(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchObjectID(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -231,13 +231,13 @@ extension CoreStore {
      */
     public static func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
-        return try Shared.defaultStack.fetchObjectID(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchObjectID(from, fetchClauses)
     }
     
     /**
      Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
      ```
-     let youngestTeenID = CoreStore.fetchObjectID(
+     let youngestTeenID = dataStack.fetchObjectID(
          From<MyPersonEntity>()
              .where(\.age > 18)
              .orderBy(.ascending(\.age))
@@ -249,11 +249,11 @@ extension CoreStore {
      */
     public static func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
         
-        return try Shared.defaultStack.fetchObjectID(clauseChain)
+        return try CoreStoreDefaults.dataStack.fetchObjectID(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -262,11 +262,11 @@ extension CoreStore {
      */
     public static func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
-        return try Shared.defaultStack.fetchObjectIDs(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchObjectIDs(from, fetchClauses)
     }
     
     /**
-     Using the `defaultStack`, fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
      
      - parameter from: a `From` clause indicating the entity type
      - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -275,7 +275,7 @@ extension CoreStore {
      */
     public static func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
         
-        return try Shared.defaultStack.fetchObjectIDs(from, fetchClauses)
+        return try CoreStoreDefaults.dataStack.fetchObjectIDs(from, fetchClauses)
     }
     
     /**
@@ -293,11 +293,11 @@ extension CoreStore {
      */
     public static func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
         
-        return try Shared.defaultStack.fetchObjectIDs(clauseChain)
+        return try CoreStoreDefaults.dataStack.fetchObjectIDs(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      
@@ -309,11 +309,11 @@ extension CoreStore {
      */
     public static func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
         
-        return try Shared.defaultStack.queryValue(from, selectClause, queryClauses)
+        return try CoreStoreDefaults.dataStack.queryValue(from, selectClause, queryClauses)
     }
     
     /**
-     Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     Using the `CoreStoreDefaults.dataStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      
@@ -325,7 +325,7 @@ extension CoreStore {
      */
     public static func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
-        return try Shared.defaultStack.queryValue(from, selectClause, queryClauses)
+        return try CoreStoreDefaults.dataStack.queryValue(from, selectClause, queryClauses)
     }
     
     /**
@@ -333,7 +333,7 @@ extension CoreStore {
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      ```
-     let averageAdultAge = CoreStore.queryValue(
+     let averageAdultAge = dataStack.queryValue(
          From<MyPersonEntity>()
              .select(Int.self, .average(\.age))
              .where(\.age > 18)
@@ -345,11 +345,11 @@ extension CoreStore {
      */
     public static func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
         
-        return try Shared.defaultStack.queryValue(clauseChain)
+        return try CoreStoreDefaults.dataStack.queryValue(clauseChain)
     }
     
     /**
-     Using the `defaultStack`, 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.
+     Using the `CoreStoreDefaults.dataStack`, 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.
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      
@@ -361,11 +361,11 @@ extension CoreStore {
      */
     public static func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
-        return try Shared.defaultStack.queryAttributes(from, selectClause, queryClauses)
+        return try CoreStoreDefaults.dataStack.queryAttributes(from, selectClause, queryClauses)
     }
     
     /**
-     Using the `defaultStack`, 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.
+     Using the `CoreStoreDefaults.dataStack`, 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.
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      
@@ -377,7 +377,7 @@ extension CoreStore {
      */
     public static func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
-        return try Shared.defaultStack.queryAttributes(from, selectClause, queryClauses)
+        return try CoreStoreDefaults.dataStack.queryAttributes(from, selectClause, queryClauses)
     }
     
     /**
@@ -385,7 +385,7 @@ extension CoreStore {
      
      A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
      ```
-     let results = CoreStore.queryAttributes(
+     let results = dataStack.queryAttributes(
          From<MyPersonEntity>()
              .select(
                  NSDictionary.self,
@@ -406,6 +406,6 @@ extension CoreStore {
      */
     public static func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
         
-        return try Shared.defaultStack.queryAttributes(clauseChain)
+        return try CoreStoreDefaults.dataStack.queryAttributes(clauseChain)
     }
 }
diff --git a/Sources/CoreStore+Setup.swift b/Sources/CoreStore+Setup.swift
index af45f8b..4db95f0 100644
--- a/Sources/CoreStore+Setup.swift
+++ b/Sources/CoreStore+Setup.swift
@@ -33,90 +33,90 @@ import CoreData
 extension CoreStore {
     
     /**
-     Returns the `defaultStack`'s model version. The version string is the same as the name of a version-specific .xcdatamodeld file or `CoreStoreSchema`.
+     Returns the `CoreStoreDefaults.dataStack`'s model version. The version string is the same as the name of a version-specific .xcdatamodeld file or `CoreStoreSchema`.
      */
     public static var modelVersion: String {
         
-        return Shared.defaultStack.modelVersion
+        return CoreStoreDefaults.dataStack.modelVersion
     }
     
     /**
-     Returns the entity name-to-class type mapping from the `defaultStack`'s model.
+     Returns the entity name-to-class type mapping from the `CoreStoreDefaults.dataStack`'s model.
      */
     public static func entityTypesByName(for type: NSManagedObject.Type) -> [EntityName: NSManagedObject.Type] {
         
-        return Shared.defaultStack.entityTypesByName(for: type)
+        return CoreStoreDefaults.dataStack.entityTypesByName(for: type)
     }
     
     /**
-     Returns the entity name-to-class type mapping from the `defaultStack`'s model.
+     Returns the entity name-to-class type mapping from the `CoreStoreDefaults.dataStack`'s model.
      */
     public static func entityTypesByName(for type: CoreStoreObject.Type) -> [EntityName: CoreStoreObject.Type] {
         
-        return Shared.defaultStack.entityTypesByName(for: type)
+        return CoreStoreDefaults.dataStack.entityTypesByName(for: type)
     }
     
     /**
-     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `defaultStack`'s model.
+     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `CoreStoreDefaults.dataStack`'s model.
      */
     public static func entityDescription(for type: NSManagedObject.Type) -> NSEntityDescription? {
         
-        return Shared.defaultStack.entityDescription(for: type)
+        return CoreStoreDefaults.dataStack.entityDescription(for: type)
     }
     
     /**
-     Returns the `NSEntityDescription` for the specified `CoreStoreObject` subclass from `defaultStack`'s model.
+     Returns the `NSEntityDescription` for the specified `CoreStoreObject` subclass from `CoreStoreDefaults.dataStack`'s model.
      */
     public static func entityDescription(for type: CoreStoreObject.Type) -> NSEntityDescription? {
         
-        return Shared.defaultStack.entityDescription(for: type)
+        return CoreStoreDefaults.dataStack.entityDescription(for: type)
     }
     
     /**
-     Creates an `SQLiteStore` with default parameters and adds it to the `defaultStack`. This method blocks until completion.
+     Creates an `SQLiteStore` with default parameters and adds it to the `CoreStoreDefaults.dataStack`. This method blocks until completion.
      ```
      try CoreStore.addStorageAndWait()
      ```
-     - returns: the local SQLite storage added to the `defaultStack`
+     - returns: the local SQLite storage added to the `CoreStoreDefaults.dataStack`
      */
     @discardableResult
     public static func addStorageAndWait() throws -> SQLiteStore {
         
-        return try Shared.defaultStack.addStorageAndWait(SQLiteStore())
+        return try CoreStoreDefaults.dataStack.addStorageAndWait(SQLiteStore())
     }
     
     /**
-     Adds a `StorageInterface` to the `defaultStack` and blocks until completion.
+     Adds a `StorageInterface` to the `CoreStoreDefaults.dataStack` and blocks until completion.
      ```
      try CoreStore.addStorageAndWait(InMemoryStore(configuration: "Config1"))
      ```
      - parameter storage: the `StorageInterface`
      - throws: a `CoreStoreError` value indicating the failure
-     - returns: the `StorageInterface` added to the `defaultStack`
+     - returns: the `StorageInterface` added to the `CoreStoreDefaults.dataStack`
      */
     @discardableResult
     public static func addStorageAndWait<T: StorageInterface>(_ storage: T) throws -> T {
         
-        return try Shared.defaultStack.addStorageAndWait(storage)
+        return try CoreStoreDefaults.dataStack.addStorageAndWait(storage)
     }
     
     /**
-     Adds a `LocalStorage` to the `defaultStack` and blocks until completion.
+     Adds a `LocalStorage` to the `CoreStoreDefaults.dataStack` and blocks until completion.
      ```
      try CoreStore.addStorageAndWait(SQLiteStore(configuration: "Config1"))
      ```
      - parameter storage: the local storage
      - throws: a `CoreStoreError` value indicating the failure
-     - returns: the local storage added to the `defaultStack`. Note that this 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: the local storage added to the `CoreStoreDefaults.dataStack`. Note that this 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.
      */
     @discardableResult
     public static func addStorageAndWait<T: LocalStorage>(_ storage: T) throws -> T {
         
-        return try Shared.defaultStack.addStorageAndWait(storage)
+        return try CoreStoreDefaults.dataStack.addStorageAndWait(storage)
     }
     
     /**
-     Adds a `CloudStorage` to the `defaultStack` and blocks until completion.
+     Adds a `CloudStorage` to the `CoreStoreDefaults.dataStack` and blocks until completion.
      ```
      guard let storage = ICloudStore(
          ubiquitousContentName: "MyAppCloudData",
@@ -138,6 +138,6 @@ extension CoreStore {
     @discardableResult
     public static func addStorageAndWait<T: CloudStorage>(_ storage: T) throws -> T {
         
-        return try Shared.defaultStack.addStorageAndWait(storage)
+        return try CoreStoreDefaults.dataStack.addStorageAndWait(storage)
     }
 }
diff --git a/Sources/CoreStore+Transaction.swift b/Sources/CoreStore+Transaction.swift
index 8381ce0..c0a7052 100644
--- a/Sources/CoreStore+Transaction.swift
+++ b/Sources/CoreStore+Transaction.swift
@@ -32,18 +32,18 @@ import Foundation
 extension CoreStore {
     
     /**
-     Using the `defaultStack`, performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the wrapped as `.success(T)` in the `completion`'s `Result<T>`. Any errors thrown from inside the `task` will be reported as `.failure(CoreStoreError)`. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
+     Using the `CoreStoreDefaults.dataStack`, performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the wrapped as `.success(T)` in the `completion`'s `Result<T>`. Any errors thrown from inside the `task` will be reported as `.failure(CoreStoreError)`. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
      
      - parameter task: the asynchronous closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
      - 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 static func perform<T>(asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, completion: @escaping (AsynchronousDataTransaction.Result<T>) -> Void) {
         
-        Shared.defaultStack.perform(asynchronous: task, completion: completion)
+        CoreStoreDefaults.dataStack.perform(asynchronous: task, completion: completion)
     }
     
     /**
-     Using the `defaultStack`, performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the argument of the `success` closure. Any errors thrown from inside the `task` will be wrapped in a `CoreStoreError` and reported in the `failure` closure. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
+     Using the `CoreStoreDefaults.dataStack`, performs a transaction asynchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the argument of the `success` closure. Any errors thrown from inside the `task` will be wrapped in a `CoreStoreError` and reported in the `failure` closure. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
      
      - parameter task: the asynchronous closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
      - parameter success: the closure executed after the save succeeds. The `T` argument of the closure will be the value returned from `task`.
@@ -51,11 +51,11 @@ extension CoreStore {
      */
     public static func perform<T>(asynchronous task: @escaping (_ transaction: AsynchronousDataTransaction) throws -> T, success: @escaping (T) -> Void, failure: @escaping (CoreStoreError) -> Void) {
         
-        Shared.defaultStack.perform(asynchronous: task, success: success, failure: failure)
+        CoreStoreDefaults.dataStack.perform(asynchronous: task, success: success, failure: failure)
     }
     
     /**
-     Using the `defaultStack`, performs a transaction synchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the return value of `perform(synchronous:)`. Any errors thrown from inside the `task` will be thrown from `perform(synchronous:)`. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
+     Using the `CoreStoreDefaults.dataStack`, performs a transaction synchronously where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. The changes are commited automatically after the `task` closure returns. On success, the value returned from closure will be the return value of `perform(synchronous:)`. Any errors thrown from inside the `task` will be thrown from `perform(synchronous:)`. To cancel/rollback changes, call `try transaction.cancel()`, which throws a `CoreStoreError.userCancelled`.
      
      - parameter task: the synchronous non-escaping closure where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
      - parameter waitForAllObservers: When `true`, this method waits for all observers to be notified of the changes before returning. This results in more predictable data update order, but may risk triggering deadlocks. When `false`, this method does not wait for observers to be notified of the changes before returning. This results in lower risk for deadlocks, but the updated data may not have been propagated to the `DataStack` after returning. Defaults to `true`.
@@ -64,25 +64,25 @@ extension CoreStore {
      */
     public static func perform<T>(synchronous task: ((_ transaction: SynchronousDataTransaction) throws -> T), waitForAllObservers: Bool = true) throws -> T {
         
-        return try Shared.defaultStack.perform(synchronous: task, waitForAllObservers: waitForAllObservers)
+        return try CoreStoreDefaults.dataStack.perform(synchronous: task, waitForAllObservers: waitForAllObservers)
     }
     
     /**
-     Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+     Using the `CoreStoreDefaults.dataStack`, begins a non-contiguous transaction where `NSManagedObject` or `CoreStoreObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
      
      - prameter supportsUndo: `undo()`, `redo()`, and `rollback()` methods are only available when this parameter is `true`, otherwise those method will raise an exception. Defaults to `false`. Note that turning on Undo support may heavily impact performance especially on iOS or watchOS where memory is limited.
      - returns: a `UnsafeDataTransaction` instance where creates, updates, and deletes can be made.
      */
     public static func beginUnsafe(supportsUndo: Bool = false) -> UnsafeDataTransaction {
         
-        return Shared.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
+        return CoreStoreDefaults.dataStack.beginUnsafe(supportsUndo: supportsUndo)
     }
     
     /**
-     Refreshes all registered objects `NSManagedObject`s or `CoreStoreObject`s in the `defaultStack`.
+     Refreshes all registered objects `NSManagedObject`s or `CoreStoreObject`s in the `CoreStoreDefaults.dataStack`.
      */
     public static func refreshAndMergeAllObjects() {
         
-        Shared.defaultStack.refreshAndMergeAllObjects()
+        CoreStoreDefaults.dataStack.refreshAndMergeAllObjects()
     }
 }
diff --git a/Sources/CoreStore.swift b/Sources/CoreStore.swift
index d42ed7f..77f975a 100644
--- a/Sources/CoreStore.swift
+++ b/Sources/CoreStore.swift
@@ -34,17 +34,17 @@ import CoreData
 @available(*, deprecated, message: "Call methods directly from the DataStack instead")
 public enum CoreStore {
 
-    @available(*, unavailable, renamed: "Shared.logger")
+    @available(*, unavailable, renamed: "CoreStoreDefaults.logger")
     public static var logger: CoreStoreLogger {
 
-        get { return Shared.logger }
-        set { Shared.logger = newValue }
+        get { return CoreStoreDefaults.logger }
+        set { CoreStoreDefaults.logger = newValue }
     }
 
-    @available(*, unavailable, renamed: "Shared.defaultStack")
+    @available(*, unavailable, renamed: "CoreStoreDefaults.dataStack")
     public static var defaultStack: DataStack {
         
-        get { return Shared.defaultStack }
-        set { Shared.defaultStack = newValue }
+        get { return CoreStoreDefaults.dataStack }
+        set { CoreStoreDefaults.dataStack = newValue }
     }
 }
diff --git a/Sources/Shared.swift b/Sources/CoreStoreDefaults.swift
similarity index 77%
rename from Sources/Shared.swift
rename to Sources/CoreStoreDefaults.swift
index 8810826..966d4f5 100644
--- a/Sources/Shared.swift
+++ b/Sources/CoreStoreDefaults.swift
@@ -1,5 +1,5 @@
 //
-//  Shared.swift
+//  CoreStoreDefaults.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -26,19 +26,25 @@
 import Foundation
 
 
-// MARK: - Shared
+// MARK: - CoreStoreDefaults
 
 /**
 Global utilities
 */
-public enum Shared {
+public enum CoreStoreDefaults {
 
     /**
     The `CoreStoreLogger` instance to be used. The default logger is an instance of a `DefaultLogger`.
     */
     public static var logger: CoreStoreLogger = DefaultLogger()
-
-    public static var defaultStack: DataStack {
+    
+    /**
+     The default `DataStack` instance to be used. If `defaultStack` is not set during the first time accessed, a default-configured `DataStack` will be created.
+     - SeeAlso: `DataStack`
+     - Note: Changing `dataStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
+     - Important: If `dataStack` is not set during the first time accessed, a default-configured `DataStack` will be created.
+     */
+    public static var dataStack: DataStack {
 
         get {
 
diff --git a/Sources/CoreStoreLogger.swift b/Sources/CoreStoreLogger.swift
index 6bec546..fc28fe9 100644
--- a/Sources/CoreStoreLogger.swift
+++ b/Sources/CoreStoreLogger.swift
@@ -43,7 +43,7 @@ public enum LogLevel {
 // MARK: - CoreStoreLogger
 
 /**
- Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStore.logger`. Calls to `log(...)`, `assert(...)`, and `abort(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety.
+ Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStoreDefaults.logger`. Calls to `log(...)`, `assert(...)`, and `abort(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety.
  */
 public protocol CoreStoreLogger {
     
diff --git a/Sources/CoreStoreObject+Querying.swift b/Sources/CoreStoreObject+Querying.swift
index dc9d94d..8d21e91 100644
--- a/Sources/CoreStoreObject+Querying.swift
+++ b/Sources/CoreStoreObject+Querying.swift
@@ -33,7 +33,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.nickname == "John" }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname == "John" }))
      ```
      */
     public static func == (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -44,7 +44,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is not equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.nickname != "John" }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname != "John" }))
      ```
      */
     public static func != (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -55,7 +55,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is less than a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age < 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age < 20 }))
      ```
      */
     public static func < (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -66,7 +66,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is greater than a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age > 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age > 20 }))
      ```
      */
     public static func > (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -77,7 +77,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is less than or equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age <= 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age <= 20 }))
      ```
      */
     public static func <= (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -88,7 +88,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by comparing if a property is greater than or equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age >= 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age >= 20 }))
      ```
      */
     public static func >= (_ attribute: ValueContainer<O>.Required<V>, _ value: V) -> Where<O> {
@@ -99,7 +99,7 @@ extension ValueContainer.Required {
     /**
      Creates a `Where` clause by checking if a sequence contains the value of a property
      ```
-     let dog = CoreStore.fetchOne(From<Dog>().where({ ["Pluto", "Snoopy", "Scooby"] ~= $0.nickname }))
+     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 {
@@ -116,7 +116,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.nickname == "John" }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname == "John" }))
      ```
      */
     public static func == (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -127,7 +127,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is not equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.nickname != "John" }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.nickname != "John" }))
      ```
      */
     public static func != (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -138,7 +138,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is less than a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age < 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age < 20 }))
      ```
      */
     public static func < (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -156,7 +156,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is greater than a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age > 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age > 20 }))
      ```
      */
     public static func > (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -174,7 +174,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is less than or equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age <= 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age <= 20 }))
      ```
      */
     public static func <= (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -192,7 +192,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by comparing if a property is greater than or equal to a value
      ```
-     let person = CoreStore.fetchOne(From<Person>().where({ $0.age >= 20 }))
+     let person = dataStack.fetchOne(From<Person>().where({ $0.age >= 20 }))
      ```
      */
     public static func >= (_ attribute: ValueContainer<O>.Optional<V>, _ value: V?) -> Where<O> {
@@ -210,7 +210,7 @@ extension ValueContainer.Optional {
     /**
      Creates a `Where` clause by checking if a sequence contains the value of a property
      ```
-     let dog = CoreStore.fetchOne(From<Dog>().where({ ["Pluto", "Snoopy", "Scooby"] ~= $0.nickname }))
+     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 {
@@ -227,7 +227,7 @@ extension RelationshipContainer.ToOne {
     /**
      Creates a `Where` clause by comparing if a property is equal to a value
      ```
-     let dog = CoreStore.fetchOne(From<Dog>().where({ $0.master == me }))
+     let dog = dataStack.fetchOne(From<Dog>().where({ $0.master == me }))
      ```
      */
     public static func == (_ relationship: RelationshipContainer<O>.ToOne<D>, _ object: D?) -> Where<O> {
@@ -238,7 +238,7 @@ extension RelationshipContainer.ToOne {
     /**
      Creates a `Where` clause by comparing if a property is not equal to a value
      ```
-     let dog = CoreStore.fetchOne(From<Dog>().where({ $0.master != me }))
+     let dog = dataStack.fetchOne(From<Dog>().where({ $0.master != me }))
      ```
      */
     public static func != (_ relationship: RelationshipContainer<O>.ToOne<D>, _ object: D?) -> Where<O> {
@@ -249,7 +249,7 @@ extension RelationshipContainer.ToOne {
     /**
      Creates a `Where` clause by checking if a sequence contains the value of a property
      ```
-     let dog = CoreStore.fetchOne(From<Dog>().where({ [john, joe, bob] ~= $0.master }))
+     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 {
diff --git a/Sources/CoreStoreObject.swift b/Sources/CoreStoreObject.swift
index 01dd8d2..6040d85 100644
--- a/Sources/CoreStoreObject.swift
+++ b/Sources/CoreStoreObject.swift
@@ -45,7 +45,7 @@ import Foundation
  ```
  `CoreStoreObject` entities for a model version should be added to `CoreStoreSchema` instance.
  ```
- CoreStore.defaultStack = DataStack(
+ CoreStoreDefaults.dataStack = DataStack(
      CoreStoreSchema(
          modelVersion: "V1",
          entities: [
diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift
index 91905e5..d2c1f28 100644
--- a/Sources/CoreStoreSchema.swift
+++ b/Sources/CoreStoreSchema.swift
@@ -43,7 +43,7 @@ import Foundation
      let pet = Relationship.ToOne<Animal>("pet", inverse: { $0.master })
  }
  
- CoreStore.defaultStack = DataStack(
+ CoreStoreDefaults.dataStack = DataStack(
      CoreStoreSchema(
          modelVersion: "V1",
          entities: [
@@ -76,7 +76,7 @@ public final class CoreStoreSchema: DynamicSchema {
          let pet = Relationship.ToOne<Animal>("pet", inverse: { $0.master })
      }
      
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          CoreStoreSchema(
              modelVersion: "V1",
              entities: [
@@ -120,7 +120,7 @@ public final class CoreStoreSchema: DynamicSchema {
          let name = Value.Required<String>("name", initial: "")
      }
      
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          CoreStoreSchema(
              modelVersion: "V1",
              entityConfigurations: [
diff --git a/Sources/DataStack.swift b/Sources/DataStack.swift
index 5336566..d2496ad 100644
--- a/Sources/DataStack.swift
+++ b/Sources/DataStack.swift
@@ -63,7 +63,7 @@ public final class DataStack: Equatable {
     /**
      Convenience initializer for `DataStack` that creates a `SchemaHistory` from a list of `DynamicSchema` versions.
      ```
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          XcodeDataModelSchema(modelName: "MyModelV1"),
          CoreStoreSchema(
              modelVersion: "MyModelV2",
@@ -92,7 +92,7 @@ public final class DataStack: Equatable {
     /**
      Initializes a `DataStack` from a `SchemaHistory` instance.
      ```
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          schemaHistory: SchemaHistory(
              XcodeDataModelSchema(modelName: "MyModelV1"),
              CoreStoreSchema(
@@ -472,7 +472,7 @@ public final class DataStack: Equatable {
      enum Static {
         static var myDataKey: Void?
      }
-     CoreStore.defaultStack.userInfo[&Static.myDataKey] = myObject
+     CoreStoreDefaults.dataStack.userInfo[&Static.myDataKey] = myObject
      ```
      - Important: Do not use this method to store thread-sensitive data.
      */
diff --git a/Sources/DiffableDataSource.CollectionView.swift b/Sources/DiffableDataSource.CollectionView-UIKit.swift
similarity index 64%
rename from Sources/DiffableDataSource.CollectionView.swift
rename to Sources/DiffableDataSource.CollectionView-UIKit.swift
index 34a0cb3..2c3e494 100644
--- a/Sources/DiffableDataSource.CollectionView.swift
+++ b/Sources/DiffableDataSource.CollectionView-UIKit.swift
@@ -1,5 +1,5 @@
 //
-//  DiffableDataSource.CollectionView.swift
+//  DiffableDataSource.CollectionView-UIKit.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -23,7 +23,7 @@
 //  SOFTWARE.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && (os(iOS) || os(tvOS))
 
 import UIKit
 import CoreData
@@ -41,7 +41,7 @@ extension DiffableDataSource {
      ```
      self.dataSource = DiffableDataSource.CollectionView<Person>(
          collectionView: self.collectionView,
-         dataStack: Shared.defaultStack,
+         dataStack: CoreStoreDefaults.dataStack,
          cellProvider: { (collectionView, indexPath, person) in
              let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PersonCell") as! PersonCell
              cell.setPerson(person)
@@ -74,7 +74,7 @@ extension DiffableDataSource {
          ```
          self.dataSource = DiffableDataSource.CollectionView<Person>(
              collectionView: self.collectionView,
-             dataStack: Shared.defaultStack,
+             dataStack: CoreStoreDefaults.dataStack,
              cellProvider: { (collectionView, indexPath, person) in
                  let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PersonCell") as! PersonCell
                  cell.setPerson(person)
@@ -94,32 +94,10 @@ extension DiffableDataSource {
             self.cellProvider = cellProvider
             self.supplementaryViewProvider = supplementaryViewProvider
             self.dataStack = dataStack
+            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
 
             super.init()
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                self.rawDataSource = UITableViewDiffableDataSource<String, O.ObjectID>(
-//                    tableView: tableView,
-//                    cellProvider: { [weak self] (tableView, indexPath, objectID) -> UITableViewCell? in
-//
-//                        guard let self = self else {
-//
-//                            return nil
-//                        }
-//                        guard let object = self.dataStack.fetchExisting(objectID) as O? else {
-//
-//                            return nil
-//                        }
-//                        return self.cellProvider(tableView, indexPath, object)
-//                    }
-//                )
-//            }
-//            else {
-
-                self.rawDataSource = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
-//            }
-
             collectionView.dataSource = self
         }
         
@@ -140,29 +118,18 @@ extension DiffableDataSource {
         public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
             let diffableSnapshot = snapshot.diffableSnapshot
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                self.modernDataSource.apply(
-//                    diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
-//                    animatingDifferences: animatingDifferences,
-//                    completion: nil
-//                )
-//            }
-//            else {
+            self.dispatcher.apply(
+                diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                view: self.collectionView,
+                animatingDifferences: animatingDifferences,
+                performUpdates: { collectionView, changeset, setSections in
 
-                self.legacyDataSource.apply(
-                    diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
-                    view: self.collectionView,
-                    animatingDifferences: animatingDifferences,
-                    performUpdates: { collectionView, changeset, setSections in
-
-                        collectionView.reload(
-                            using: changeset,
-                            setData: setSections
-                        )
-                    }
-                )
-//            }
+                    collectionView.reload(
+                        using: changeset,
+                        setData: setSections
+                    )
+                }
+            )
         }
         
         /**
@@ -174,14 +141,7 @@ extension DiffableDataSource {
         @nonobjc
         public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.itemIdentifier(for: indexPath)
-//            }
-//            else {
-
-                return self.legacyDataSource.itemIdentifier(for: indexPath)
-//            }
+            return self.dispatcher.itemIdentifier(for: indexPath)
         }
         
         /**
@@ -193,14 +153,7 @@ extension DiffableDataSource {
         @nonobjc
         public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.indexPath(for: itemIdentifier)
-//            }
-//            else {
-
-                return self.legacyDataSource.indexPath(for: itemID)
-//            }
+            return self.dispatcher.indexPath(for: itemID)
         }
 
 
@@ -209,52 +162,31 @@ extension DiffableDataSource {
         @objc
         public dynamic func numberOfSections(in collectionView: UICollectionView) -> Int {
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.numberOfSections(in: tableView)
-//            }
-//            else {
-
-                return self.legacyDataSource.numberOfSections()
-//            }
+            return self.dispatcher.numberOfSections()
         }
 
         @objc
         public dynamic func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.tableView(tableView, numberOfRowsInSection: section)
-//            }
-//            else {
-
-                return self.legacyDataSource.numberOfItems(inSection: section)
-//            }
+            return self.dispatcher.numberOfItems(inSection: section)
         }
 
         @objc
         open dynamic func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
 
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.tableView(tableView, cellForRowAt: indexPath)
-//            }
-//            else {
+            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
 
-                guard let objectID = self.legacyDataSource.itemIdentifier(for: indexPath) else {
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
+            }
+            guard let object = self.dataStack.fetchExisting(objectID) as O? else {
 
-                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
-                }
-                guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
+            }
+            guard let cell = self.cellProvider(collectionView, indexPath, object) else {
 
-                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
-                }
-                guard let cell = self.cellProvider(collectionView, indexPath, object) else {
-
-                    Internals.abort("\(Internals.typeName(UICollectionViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
-                }
-                return cell
-//            }
+                Internals.abort("\(Internals.typeName(UICollectionViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
+            }
+            return cell
         }
 
         @objc
@@ -275,18 +207,7 @@ extension DiffableDataSource {
         private let dataStack: DataStack
         private let cellProvider: (UICollectionView, IndexPath, O) -> UICollectionViewCell?
         private let supplementaryViewProvider: (UICollectionView, String, IndexPath) -> UICollectionReusableView?
-        private var rawDataSource: Any!
-
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//        private var modernDataSource: UITableViewDiffableDataSource<String, O.ObjectID> {
-//
-//            return self.rawDataSource as! UITableViewDiffableDataSource<String, O.ObjectID>
-//        }
-
-        private var legacyDataSource: Internals.DiffableDataUIDispatcher<O> {
-
-            return self.rawDataSource as! Internals.DiffableDataUIDispatcher<O>
-        }
+        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
     }
 }
 
@@ -340,19 +261,28 @@ extension UICollectionView {
                     }
                     if !changeset.elementDeleted.isEmpty {
 
-                        self.deleteItems(at: changeset.elementDeleted.map { IndexPath(row: $0.element, section: $0.section) })
+                        self.deleteItems(
+                            at: changeset.elementDeleted.map { IndexPath(item: $0.element, section: $0.section) }
+                        )
                     }
                     if !changeset.elementInserted.isEmpty {
 
-                        self.insertItems(at: changeset.elementInserted.map { IndexPath(row: $0.element, section: $0.section) })
+                        self.insertItems(
+                            at: changeset.elementInserted.map { IndexPath(item: $0.element, section: $0.section) }
+                        )
                     }
                     if !changeset.elementUpdated.isEmpty {
 
-                        self.reloadItems(at: changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) })
+                        self.reloadItems(
+                            at: changeset.elementUpdated.map { IndexPath(item: $0.element, section: $0.section) }
+                        )
                     }
                     for (source, target) in changeset.elementMoved {
 
-                        self.moveItem(at: IndexPath(row: source.element, section: source.section), to: IndexPath(row: target.element, section: target.section))
+                        self.moveItem(
+                            at: IndexPath(item: source.element, section: source.section),
+                            to: IndexPath(item: target.element, section: target.section)
+                        )
                     }
                 },
                 completion: nil
diff --git a/Sources/DiffableDataSource.TableView.swift b/Sources/DiffableDataSource.TableView-UIKit.swift
similarity index 74%
rename from Sources/DiffableDataSource.TableView.swift
rename to Sources/DiffableDataSource.TableView-UIKit.swift
index c100dc1..ad91c38 100644
--- a/Sources/DiffableDataSource.TableView.swift
+++ b/Sources/DiffableDataSource.TableView-UIKit.swift
@@ -1,5 +1,5 @@
 //
-//  DiffableDataSource.TableView.swift
+//  DiffableDataSource.TableView-UIKit.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -23,7 +23,7 @@
 //  SOFTWARE.
 //
 
-#if canImport(UIKit)
+#if canImport(UIKit) && (os(iOS) || os(tvOS))
 
 import UIKit
 import CoreData
@@ -41,7 +41,7 @@ extension DiffableDataSource {
      ```
      self.dataSource = DiffableDataSource.TableView<Person>(
          tableView: self.tableView,
-         dataStack: Shared.defaultStack,
+         dataStack: CoreStoreDefaults.dataStack,
          cellProvider: { (tableView, indexPath, person) in
              let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
              cell.setPerson(person)
@@ -83,7 +83,7 @@ extension DiffableDataSource {
          ```
          self.dataSource = DiffableDataSource.TableView<Person>(
              tableView: self.tableView,
-             dataStack: Shared.defaultStack,
+             dataStack: CoreStoreDefaults.dataStack,
              cellProvider: { (tableView, indexPath, person) in
                  let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
                  cell.setPerson(person)
@@ -101,31 +101,9 @@ extension DiffableDataSource {
             self.tableView = tableView
             self.cellProvider = cellProvider
             self.dataStack = dataStack
+            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
 
             super.init()
-            
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                self.rawDataSource = UITableViewDiffableDataSource<String, O.ObjectID>(
-//                    tableView: tableView,
-//                    cellProvider: { [weak self] (tableView, indexPath, objectID) -> UITableViewCell? in
-//
-//                        guard let self = self else {
-//
-//                            return nil
-//                        }
-//                        guard let object = self.dataStack.fetchExisting(objectID) as O? else {
-//
-//                            return nil
-//                        }
-//                        return self.cellProvider(tableView, indexPath, object)
-//                    }
-//                )
-//            }
-//            else {
-                
-                self.rawDataSource = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
-//            }
 
             tableView.dataSource = self
         }
@@ -159,7 +137,7 @@ extension DiffableDataSource {
 //            }
 //            else {
                 
-                self.legacyDataSource.apply(
+                self.dispatcher.apply(
                     diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
                     view: self.tableView,
                     animatingDifferences: animatingDifferences,
@@ -184,14 +162,7 @@ extension DiffableDataSource {
         @nonobjc
         public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.itemIdentifier(for: indexPath)
-//            }
-//            else {
-             
-                return self.legacyDataSource.itemIdentifier(for: indexPath)
-//            }
+            return self.dispatcher.itemIdentifier(for: indexPath)
         }
         
         /**
@@ -203,14 +174,7 @@ extension DiffableDataSource {
         @nonobjc
         public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.indexPath(for: itemIdentifier)
-//            }
-//            else {
-             
-                return self.legacyDataSource.indexPath(for: itemID)
-//            }
+            return self.dispatcher.indexPath(for: itemID)
         }
         
         
@@ -219,78 +183,43 @@ extension DiffableDataSource {
         @objc
         public dynamic func numberOfSections(in tableView: UITableView) -> Int {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.numberOfSections(in: tableView)
-//            }
-//            else {
-             
-                return self.legacyDataSource.numberOfSections()
-//            }
+            return self.dispatcher.numberOfSections()
         }
 
         @objc
         public dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.tableView(tableView, numberOfRowsInSection: section)
-//            }
-//            else {
-             
-                return self.legacyDataSource.numberOfItems(inSection: section)
-//            }
+            return self.dispatcher.numberOfItems(inSection: section)
         }
 
         @objc
         open dynamic func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.snapshot().sectionIdentifiers[section]
-//            }
-//            else {
-
-                return self.legacyDataSource.sectionIdentifier(inSection: section)
-//            }
+            return self.dispatcher.sectionIdentifier(inSection: section)
         }
 
         @objc
         open dynamic func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.tableView(tableView, titleForFooterInSection: section)
-//            }
-//            else {
-
-                return nil
-//            }
+            return nil
         }
         
         @objc
         open dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
             
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return self.modernDataSource.tableView(tableView, cellForRowAt: indexPath)
-//            }
-//            else {
-             
-                guard let objectID = self.legacyDataSource.itemIdentifier(for: indexPath) else {
-                    
-                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
-                }
-                guard let object = self.dataStack.fetchExisting(objectID) as O? else {
-                    
-                    Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
-                }
-                guard let cell = self.cellProvider(tableView, indexPath, object) else {
-                    
-                    Internals.abort("\(Internals.typeName(UITableViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
-                }
-                return cell
-//            }
+            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
+                
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
+            }
+            guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+                
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
+            }
+            guard let cell = self.cellProvider(tableView, indexPath, object) else {
+                
+                Internals.abort("\(Internals.typeName(UITableViewDataSource.self)) returned a `nil` cell for \(Internals.typeName(IndexPath.self)) \(indexPath)")
+            }
+            return cell
         }
 
         @objc
@@ -321,19 +250,7 @@ extension DiffableDataSource {
         private let cellProvider: (UITableView, IndexPath, O) -> UITableViewCell?
         
         @nonobjc
-        private var rawDataSource: Any!
-        
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//        private var modernDataSource: UITableViewDiffableDataSource<String, O.ObjectID> {
-//
-//            return self.rawDataSource as! UITableViewDiffableDataSource<String, O.ObjectID>
-//        }
-        
-        @nonobjc
-        private var legacyDataSource: Internals.DiffableDataUIDispatcher<O> {
-            
-            return self.rawDataSource as! Internals.DiffableDataUIDispatcher<O>
-        }
+        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
     }
 }
 
diff --git a/Sources/DiffableDataSource.swift b/Sources/DiffableDataSource.swift
index 82c487b..c111e6b 100644
--- a/Sources/DiffableDataSource.swift
+++ b/Sources/DiffableDataSource.swift
@@ -23,6 +23,7 @@
 //  SOFTWARE.
 //
 
+#if os(iOS) || os(tvOS) || os(macOS)
 
 // MARK: - DiffableDataSource
 
@@ -30,3 +31,5 @@
  Namespace for diffable data source types. See `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView` for actual implementations
  */
 public enum DiffableDataSource {}
+
+#endif
diff --git a/Sources/Entity.swift b/Sources/Entity.swift
index fb77f03..6845763 100644
--- a/Sources/Entity.swift
+++ b/Sources/Entity.swift
@@ -44,7 +44,7 @@ import ObjectiveC
      let pet = Relationship.ToOne<Animal>("pet", inverse: { $0.master })
  }
  
- CoreStore.defaultStack = DataStack(
+ CoreStoreDefaults.dataStack = DataStack(
      CoreStoreSchema(
          modelVersion: "V1",
          entities: [
diff --git a/Sources/EnvironmentValues+DataSources.swift b/Sources/EnvironmentValues+DataSources.swift
index ebc55a2..fd6a415 100644
--- a/Sources/EnvironmentValues+DataSources.swift
+++ b/Sources/EnvironmentValues+DataSources.swift
@@ -23,9 +23,12 @@
 //  SOFTWARE.
 //
 
-#if canImport(SwiftUI)
+#if canImport(SwiftUI) && canImport(Combine)
 
 import SwiftUI
+import Combine
+
+import CoreData
 
 
 // MARK: - EnvironmentValues
@@ -64,7 +67,7 @@ extension EnvironmentValues {
         
         fileprivate static var defaultValue: DataStack {
             
-            return Shared.defaultStack
+            return CoreStoreDefaults.dataStack
         }
     }
 }
diff --git a/Sources/ImportableObject.swift b/Sources/ImportableObject.swift
index b90c3c3..e447c5f 100644
--- a/Sources/ImportableObject.swift
+++ b/Sources/ImportableObject.swift
@@ -37,7 +37,7 @@ import CoreData
      // ...
  }
  
- CoreStore.perform(
+ dataStack.perform(
      asynchronous: { (transaction) -> Void in
          let json: NSDictionary = // ...
          let person = try transaction.importObject(
diff --git a/Sources/ImportableUniqueObject.swift b/Sources/ImportableUniqueObject.swift
index e0bf5c9..5c4eba0 100644
--- a/Sources/ImportableUniqueObject.swift
+++ b/Sources/ImportableUniqueObject.swift
@@ -38,7 +38,7 @@ import CoreData
      // ...
  }
  
- CoreStore.perform(
+ dataStack.perform(
      asynchronous: { (transaction) -> Void in
          let json: NSDictionary = // ...
          let person = try transaction.importUniqueObject(
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index 0da8f30..dc7bb05 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -568,10 +568,4 @@ extension Internals {
 }
 
 
-// MARK: - NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol
-
-@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 15.0, *)
-extension NSDiffableDataSourceSnapshot: DiffableDataSourceSnapshotProtocol where SectionIdentifierType == String, ItemIdentifierType == NSManagedObjectID {}
-
-
 #endif
diff --git a/Sources/KeyPath+Querying.swift b/Sources/KeyPath+Querying.swift
index da83f42..f83a8d5 100644
--- a/Sources/KeyPath+Querying.swift
+++ b/Sources/KeyPath+Querying.swift
@@ -32,7 +32,7 @@ import Foundation
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname == "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname == "John"))
  ```
  */
 public func == <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -43,7 +43,7 @@ public func == <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname != "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname != "John"))
  ```
  */
 public func != <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -54,7 +54,7 @@ public func != <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ key
 /**
  Creates a `Where` clause by checking if a sequence contains the value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
+ let dog = dataStack.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
  ```
  */
 public func ~= <O: NSManagedObject, V: QueryableAttributeType & Equatable, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, V>) -> Where<O> where S.Iterator.Element == V {
@@ -68,7 +68,7 @@ public func ~= <O: NSManagedObject, V: QueryableAttributeType & Equatable, S: Se
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname == "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname == "John"))
  ```
  */
 public func == <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -79,7 +79,7 @@ public func == <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname != "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname != "John"))
  ```
  */
 public func != <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -90,7 +90,7 @@ public func != <O: NSManagedObject, V: QueryableAttributeType & Equatable>(_ key
 /**
  Creates a `Where` clause by checking if a sequence contains the value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
+ let dog = dataStack.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
  ```
  */
 public func ~= <O: NSManagedObject, V: QueryableAttributeType & Equatable, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, Optional<V>>) -> Where<O> where S.Iterator.Element == V {
@@ -104,7 +104,7 @@ public func ~= <O: NSManagedObject, V: QueryableAttributeType & Equatable, S: Se
 /**
  Creates a `Where` clause by comparing if a property is less than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age < 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age < 20))
  ```
  */
 public func < <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -115,7 +115,7 @@ public func < <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is greater than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age > 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age > 20))
  ```
  */
 public func > <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -126,7 +126,7 @@ public func > <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is less than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age <= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age <= 20))
  ```
  */
 public func <= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -137,7 +137,7 @@ public func <= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ ke
 /**
  Creates a `Where` clause by comparing if a property is greater than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age >= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age >= 20))
  ```
  */
 public func >= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, V>, _ value: V) -> Where<O> {
@@ -151,7 +151,7 @@ public func >= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ ke
 /**
  Creates a `Where` clause by comparing if a property is less than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age < 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age < 20))
  ```
  */
 public func < <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -169,7 +169,7 @@ public func < <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is greater than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age > 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age > 20))
  ```
  */
 public func > <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -187,7 +187,7 @@ public func > <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ key
 /**
  Creates a `Where` clause by comparing if a property is less than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age <= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age <= 20))
  ```
  */
 public func <= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -205,7 +205,7 @@ public func <= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ ke
 /**
  Creates a `Where` clause by comparing if a property is greater than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age >= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age >= 20))
  ```
  */
 public func >= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ keyPath: KeyPath<O, Optional<V>>, _ value: V?) -> Where<O> {
@@ -226,7 +226,7 @@ public func >= <O: NSManagedObject, V: QueryableAttributeType & Comparable>(_ ke
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>, _ object: D) -> Where<O> {
@@ -237,7 +237,7 @@ public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>, _ object: D) -> Where<O> {
@@ -248,7 +248,7 @@ public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>
 /**
  Creates a `Where` clause by checking if a sequence contains a value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
+ let dog = dataStack.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
  ```
  */
 public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, D>) -> Where<O> where S.Iterator.Element == D {
@@ -259,7 +259,7 @@ public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence:
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>, _ objectID: NSManagedObjectID) -> Where<O> {
@@ -270,7 +270,7 @@ public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>, _ objectID: NSManagedObjectID) -> Where<O> {
@@ -281,7 +281,7 @@ public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, D>
 /**
  Creates a `Where` clause by checking if a sequence contains a value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
+ let dog = dataStack.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
  ```
  */
 public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, D>) -> Where<O> where S.Iterator.Element == NSManagedObjectID {
@@ -295,7 +295,7 @@ public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence:
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Optional<D>>, _ object: D?) -> Where<O> {
@@ -306,7 +306,7 @@ public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Op
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Optional<D>>, _ object: D?) -> Where<O> {
@@ -317,7 +317,7 @@ public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Op
 /**
  Creates a `Where` clause by checking if a sequence contains a value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
+ let dog = dataStack.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
  ```
  */
 public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, Optional<D>>) -> Where<O> where S.Iterator.Element == D {
@@ -328,7 +328,7 @@ public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence:
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Optional<D>>, _ objectID: NSManagedObjectID) -> Where<O> {
@@ -339,7 +339,7 @@ public func == <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Op
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Optional<D>>, _ objectID: NSManagedObjectID) -> Where<O> {
@@ -350,7 +350,7 @@ public func != <O: NSManagedObject, D: NSManagedObject>(_ keyPath: KeyPath<O, Op
 /**
  Creates a `Where` clause by checking if a sequence contains a value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
+ let dog = dataStack.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
  ```
  */
 public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, Optional<D>>) -> Where<O> where S.Iterator.Element == NSManagedObjectID {
@@ -364,7 +364,7 @@ public func ~= <O: NSManagedObject, D: NSManagedObject, S: Sequence>(_ sequence:
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname == "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname == "John"))
  ```
  */
 public func == <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -375,7 +375,7 @@ public func == <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ va
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname != "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname != "John"))
  ```
  */
 public func != <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -386,7 +386,7 @@ public func != <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ va
 /**
  Creates a `Where` clause by checking if a sequence contains the value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
+ let dog = dataStack.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
  ```
  */
 public func ~= <O, V, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>) -> Where<O> where S.Iterator.Element == V {
@@ -400,7 +400,7 @@ public func ~= <O, V, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, ValueCon
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname == "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname == "John"))
  ```
  */
 public func == <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -411,7 +411,7 @@ public func == <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ va
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.nickname != "John"))
+ let person = dataStack.fetchOne(From<Person>().where(\.nickname != "John"))
  ```
  */
 public func != <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -422,7 +422,7 @@ public func != <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ va
 /**
  Creates a `Where` clause by checking if a sequence contains the value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
+ let dog = dataStack.fetchOne(From<Dog>().where(["Pluto", "Snoopy", "Scooby"] ~= \.nickname))
  ```
  */
 public func ~= <O, V, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>) -> Where<O> where S.Iterator.Element == V {
@@ -436,7 +436,7 @@ public func ~= <O, V, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, ValueCon
 /**
  Creates a `Where` clause by comparing if a property is less than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age < 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age < 20))
  ```
  */
 public func < <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -447,7 +447,7 @@ public func < <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Require
 /**
  Creates a `Where` clause by comparing if a property is greater than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age > 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age > 20))
  ```
  */
 public func > <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -458,7 +458,7 @@ public func > <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Require
 /**
  Creates a `Where` clause by comparing if a property is less than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age <= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age <= 20))
  ```
  */
 public func <= <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -469,7 +469,7 @@ public func <= <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Requir
 /**
  Creates a `Where` clause by comparing if a property is greater than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age >= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age >= 20))
  ```
  */
 public func >= <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, _ value: V) -> Where<O> {
@@ -483,7 +483,7 @@ public func >= <O, V: Comparable>(_ keyPath: KeyPath<O, ValueContainer<O>.Requir
 /**
  Creates a `Where` clause by comparing if a property is less than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age < 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age < 20))
  ```
  */
 public func < <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -501,7 +501,7 @@ public func < <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ val
 /**
  Creates a `Where` clause by comparing if a property is greater than a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age > 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age > 20))
  ```
  */
 public func > <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -519,7 +519,7 @@ public func > <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ val
 /**
  Creates a `Where` clause by comparing if a property is less than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age <= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age <= 20))
  ```
  */
 public func <= <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -537,7 +537,7 @@ public func <= <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ va
 /**
  Creates a `Where` clause by comparing if a property is greater than or equal to a value
  ```
- let person = CoreStore.fetchOne(From<Person>().where(\.age >= 20))
+ let person = dataStack.fetchOne(From<Person>().where(\.age >= 20))
  ```
  */
 public func >= <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ value: V?) -> Where<O> {
@@ -558,7 +558,7 @@ public func >= <O, V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, _ va
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ object: D) -> Where<O> {
@@ -569,7 +569,7 @@ public func == <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>,
 /**
  Creates a `Where` clause by comparing if a property is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master == john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master == john))
  ```
  */
 public func == <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ object: D?) -> Where<O> {
@@ -580,7 +580,7 @@ public func == <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>,
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ object: D) -> Where<O> {
@@ -591,7 +591,7 @@ public func != <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>,
 /**
  Creates a `Where` clause by comparing if a property is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(\.master != john))
+ let dog = dataStack.fetchOne(From<Dog>().where(\.master != john))
  ```
  */
 public func != <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ object: D?) -> Where<O> {
@@ -602,7 +602,7 @@ public func != <O, D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>,
 /**
  Creates a `Where` clause by checking if a sequence contains a value of a property
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
+ let dog = dataStack.fetchOne(From<Dog>().where([john, bob, joe] ~= \.master))
  ```
  */
 public func ~= <O, D, S: Sequence>(_ sequence: S, _ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> Where<O> where S.Iterator.Element == D {
diff --git a/Sources/ListMonitor.swift b/Sources/ListMonitor.swift
index 85b2ab6..847cc06 100644
--- a/Sources/ListMonitor.swift
+++ b/Sources/ListMonitor.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  The `ListMonitor` monitors changes to a list of `DynamicObject` instances. Observers that implement the `ListObserver` protocol may then register themselves to the `ListMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorList(
+ let monitor = dataStack.monitorList(
      From<Person>(),
      Where("title", isEqualTo: "Engineer"),
      OrderBy(.ascending("lastName"))
@@ -50,7 +50,7 @@ import CoreData
  
  Creating a sectioned-list is also possible with the `monitorSectionedList(...)` method:
  ```
- let monitor = CoreStore.monitorSectionedList(
+ let monitor = dataStack.monitorSectionedList(
      From<Person>(),
      SectionBy("age") { "Age \($0)" },
      Where("title", isEqualTo: "Engineer"),
diff --git a/Sources/ListObserver.swift b/Sources/ListObserver.swift
index d7f8433..820767e 100644
--- a/Sources/ListObserver.swift
+++ b/Sources/ListObserver.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  Implement the `ListObserver` protocol to observe changes to a list of `NSManagedObject`s. `ListObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorList(
+ let monitor = dataStack.monitorList(
      From<Person>(),
      OrderBy(.ascending("lastName"))
  )
@@ -96,7 +96,7 @@ extension ListObserver {
 /**
  Implement the `ListObjectObserver` protocol to observe detailed changes to a list's object. `ListObjectObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorList(
+ let monitor = dataStack.monitorList(
      From<MyPersonEntity>(),
      OrderBy(.ascending("lastName"))
  )
@@ -169,7 +169,7 @@ extension ListObjectObserver {
 /**
  Implement the `ListSectionObserver` protocol to observe changes to a list's section info. `ListSectionObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorSectionedList(
+ let monitor = dataStack.monitorSectionedList(
      From<MyPersonEntity>(),
      SectionBy("age") { "Age \($0)" },
      OrderBy(.ascending("lastName"))
diff --git a/Sources/ListPublisher.swift b/Sources/ListPublisher.swift
index 4f14329..d09b7b2 100644
--- a/Sources/ListPublisher.swift
+++ b/Sources/ListPublisher.swift
@@ -41,7 +41,7 @@ import SwiftUI
 /**
  `ListPublisher` tracks a diffable list of `DynamicObject` instances. Unlike `ListMonitor`s, `ListPublisher` are more lightweight and access objects lazily. Objects that need to be notified of `ListPublisher` changes may register themselves to its `addObserver(_:_:)` method:
  ```
- let listPublisher = Shared.defaultStack.listPublisher(
+ let listPublisher = CoreStoreDefaults.dataStack.listPublisher(
      From<Person>()
          .where(\.title == "Engineer")
          .orderBy(.ascending(\.lastName))
@@ -55,7 +55,7 @@ import SwiftUI
  
  `ListPublisher`s may optionally be created with sections:
  ```
- let listPublisher = Shared.defaultStack.listPublisher(
+ let listPublisher = CoreStoreDefaults.dataStack.listPublisher(
      From<Person>()
          .sectionBy(\.age") { "Age \($0)" }
          .where(\.title == "Engineer")
diff --git a/Sources/MigrationResult.swift b/Sources/MigrationResult.swift
index b1da216..9943d9c 100644
--- a/Sources/MigrationResult.swift
+++ b/Sources/MigrationResult.swift
@@ -33,7 +33,7 @@ import Foundation
  `MigrationResult.success` indicates either the migration succeeded, or there were no migrations needed. The associated value is an array of `MigrationType`s reflecting the migration steps completed.
  `MigrationResult.failure` indicates that the migration failed. The associated object for this value is the a `CoreStoreError` enum value.
  ```
- CoreStore.upgradeStorageIfNeeded(SQLiteStorage(fileName: "data.sqlite")) { (result) in
+ dataStack.upgradeStorageIfNeeded(SQLiteStorage(fileName: "data.sqlite")) { (result) in
      switch result {
      case .success(let migrationSteps):
          // ...
diff --git a/Sources/ObjectMonitor.swift b/Sources/ObjectMonitor.swift
index f3367c0..8faac46 100644
--- a/Sources/ObjectMonitor.swift
+++ b/Sources/ObjectMonitor.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  The `ObjectMonitor` monitors changes to a single `DynamicObject` instance. Observers that implement the `ObjectObserver` protocol may then register themselves to the `ObjectMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorObject(object)
+ let monitor = dataStack.monitorObject(object)
  monitor.addObserver(self)
  ```
  The created `ObjectMonitor` instance needs to be held on (retained) for as long as the object needs to be observed.
diff --git a/Sources/ObjectObserver.swift b/Sources/ObjectObserver.swift
index e5dc377..e0cfbac 100644
--- a/Sources/ObjectObserver.swift
+++ b/Sources/ObjectObserver.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  Implement the `ObjectObserver` protocol to observe changes to a single `DynamicObject` instance. `ObjectObserver`s may register themselves to an `ObjectMonitor`'s `addObserver(_:)` method:
  ```
- let monitor = CoreStore.monitorObject(object)
+ let monitor = dataStack.monitorObject(object)
  monitor.addObserver(self)
  ```
  */
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index 7bc262c..0b3aec1 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -41,7 +41,7 @@ import SwiftUI
 /**
  The `ObjectPublisher` tracks changes to a single `DynamicObject` instance. Objects that need to be notified of `ObjectPublisher` changes may register themselves to its `addObserver(_:_:)` method:
  ```
- let objectPublisher = Shared.defaultStack.objectPublisher(object)
+ let objectPublisher = CoreStoreDefaults.dataStack.objectPublisher(object)
  objectPublisher.addObserver(self) { (objectPublisher) in
      // Handle changes
  }
@@ -307,6 +307,7 @@ extension ObjectPublisher {
         #if canImport(Combine)
 
         #if canImport(SwiftUI)
+        
         withAnimation {
 
             self.objectWillChange.send()
diff --git a/Sources/SectionBy.swift b/Sources/SectionBy.swift
index 1c77111..33388cf 100644
--- a/Sources/SectionBy.swift
+++ b/Sources/SectionBy.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  The `SectionBy` clause indicates the key path to use to group the `ListMonitor` objects into sections. An optional closure can also be provided to transform the value into an appropriate section name:
  ```
- let monitor = CoreStore.monitorSectionedList(
+ let monitor = dataStack.monitorSectionedList(
      From<Person>(),
      SectionBy("age") { "Age \($0)" },
      OrderBy(.ascending("lastName"))
diff --git a/Sources/Select.swift b/Sources/Select.swift
index c0f8627..8be74ca 100644
--- a/Sources/Select.swift
+++ b/Sources/Select.swift
@@ -57,7 +57,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying an entity attribute. A shorter way to do the same is to assign from the string keypath directly:
      ```
-     let fullName = CoreStore.queryValue(
+     let fullName = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<String>(.attribute("fullName")),
          Where("employeeID", isEqualTo: 1111)
@@ -65,7 +65,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
      ```
      is equivalent to:
      ```
-     let fullName = CoreStore.queryValue(
+     let fullName = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<String>("fullName"),
          Where("employeeID", isEqualTo: 1111)
@@ -82,7 +82,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying the average value of an attribute.
      ```
-     let averageAge = CoreStore.queryValue(
+     let averageAge = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<Int>(.average("age"))
      )
@@ -104,7 +104,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for a count query.
      ```
-     let numberOfEmployees = CoreStore.queryValue(
+     let numberOfEmployees = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<Int>(.count("employeeID"))
      )
@@ -126,7 +126,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute.
      ```
-     let maximumAge = CoreStore.queryValue(
+     let maximumAge = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<Int>(.maximum("age"))
      )
@@ -148,7 +148,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute.
      ```
-     let minimumAge = CoreStore.queryValue(
+     let minimumAge = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<Int>(.minimum("age"))
      )
@@ -170,7 +170,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying the sum value for an attribute.
      ```
-     let totalAge = CoreStore.queryValue(
+     let totalAge = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<Int>(.sum("age"))
      )
@@ -192,7 +192,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     /**
      Provides a `SelectTerm` to a `Select` clause for querying the `NSManagedObjectID`.
      ```
-     let objectID = CoreStore.queryValue(
+     let objectID = dataStack.queryValue(
          From<MyPersonEntity>(),
          Select<NSManagedObjectID>(),
          Where("employeeID", isEqualTo: 1111)
@@ -651,14 +651,14 @@ extension SelectTerm where D: CoreStoreObject {
  
  You can bind the return type by specializing the initializer:
  ```
- let maximumAge = CoreStore.queryValue(
+ let maximumAge = dataStack.queryValue(
      From<MyPersonEntity>(),
      Select<Int>(.maximum("age"))
  )
  ```
  or by casting the type of the return value:
  ```
- let maximumAge: Int = CoreStore.queryValue(
+ let maximumAge: Int = dataStack.queryValue(
      From<MyPersonEntity>(),
      Select(.maximum("age"))
  )
diff --git a/Sources/SetupResult.swift b/Sources/SetupResult.swift
index a93e7c5..27c0940 100644
--- a/Sources/SetupResult.swift
+++ b/Sources/SetupResult.swift
@@ -34,7 +34,7 @@ import CoreData
  `SetupResult.success` indicates that the storage setup succeeded. The associated object for this `enum` value is the related `StorageInterface` instance.
  `SetupResult.failure` indicates that the storage setup failed. The associated object for this value is the related `CoreStoreError` enum value.
  ```
- try! CoreStore.addStorage(
+ try! dataStack.addStorage(
      SQLiteStore(),
      completion: { (result: SetupResult) -> Void in
          switch result {
diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift
index 4f84a4f..9044de8 100644
--- a/Sources/SynchronousDataTransaction.swift
+++ b/Sources/SynchronousDataTransaction.swift
@@ -30,7 +30,7 @@ import CoreData
 // MARK: - SynchronousDataTransaction
 
 /**
- The `SynchronousDataTransaction` provides an interface for `DynamicObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`, or from `CoreStore.beginSynchronous(_:)`.
+ The `SynchronousDataTransaction` provides an interface for `DynamicObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`.
  */
 public final class SynchronousDataTransaction: BaseDataTransaction {
     
diff --git a/Sources/UnsafeDataModelSchema.swift b/Sources/UnsafeDataModelSchema.swift
index f84ebb6..494549d 100644
--- a/Sources/UnsafeDataModelSchema.swift
+++ b/Sources/UnsafeDataModelSchema.swift
@@ -37,7 +37,7 @@ public final class UnsafeDataModelSchema: DynamicSchema {
     /**
      Initializes a `UnsafeDataModelSchema` from an `NSManagedObjectModel`.
      ```
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          UnsafeDataModelSchema(modelName: "MyAppV1", model: model)
      )
      ```
diff --git a/Sources/UserInfo.swift b/Sources/UserInfo.swift
index b449771..133eee3 100644
--- a/Sources/UserInfo.swift
+++ b/Sources/UserInfo.swift
@@ -34,7 +34,7 @@ import Foundation
  enum Static {
      static var myDataKey: Void?
  }
- CoreStore.defaultStack.userInfo[&Static.myDataKey] = myObject
+ CoreStoreDefaults.dataStack.userInfo[&Static.myDataKey] = myObject
  ```
  - Important: Do not use this class to store thread-sensitive data.
  */
@@ -46,7 +46,7 @@ public final class UserInfo {
      enum Static {
         static var myDataKey: Void?
      }
-     CoreStore.defaultStack.userInfo[&Static.myDataKey] = myObject
+     CoreStoreDefaults.dataStack.userInfo[&Static.myDataKey] = myObject
      ```
      - Important: Do not use this method to store thread-sensitive data.
      - parameter key: the key for custom data. Make sure this is a static pointer that will never be changed.
@@ -79,7 +79,7 @@ public final class UserInfo {
      enum Static {
          static var myDataKey: Void?
      }
-     CoreStore.defaultStack.userInfo[&Static.myDataKey, lazyInit: { MyObject() }] = myObject
+     CoreStoreDefaults.dataStack.userInfo[&Static.myDataKey, lazyInit: { MyObject() }] = myObject
      ```
      - Important: Do not use this method to store thread-sensitive data.
      - parameter key: the key for custom data. Make sure this is a static pointer that will never be changed.
diff --git a/Sources/VersionLock.swift b/Sources/VersionLock.swift
index 7f7940f..5e5d705 100644
--- a/Sources/VersionLock.swift
+++ b/Sources/VersionLock.swift
@@ -41,7 +41,7 @@ import Foundation
      let pet = Relationship.ToOne<Animal>("pet", inverse: { $0.master })
  }
  
- CoreStore.defaultStack = DataStack(
+ CoreStoreDefaults.dataStack = DataStack(
      CoreStoreSchema(
          modelVersion: "V1",
          entities: [
diff --git a/Sources/Where.Expression.swift b/Sources/Where.Expression.swift
index 73c43b6..c4b5685 100644
--- a/Sources/Where.Expression.swift
+++ b/Sources/Where.Expression.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
 ```
-let owner = CoreStore.fetchOne(
+let owner = dataStack.fetchOne(
     From<Pet>().where(
         (\.master ~ \.name) == "John"
     )
@@ -60,7 +60,7 @@ extension Where {
      Type-safe keyPath chain usable in query/fetch expressions.
      ```
      let expression: Where<Pet>.Expression = (\.master ~ \.name)
-     let owner = CoreStore.fetchOne(
+     let owner = dataStack.fetchOne(
         From<Pet>().where(expression == "John")
      )
      ```
@@ -130,7 +130,7 @@ extension Where {
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let owner = CoreStore.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
+ let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func ~<D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<D, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.SingleTarget, V> {
@@ -141,7 +141,7 @@ public func ~<D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPat
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let owner = CoreStore.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
+ let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<D, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.SingleTarget, V> {
@@ -152,7 +152,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPa
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let happyPets = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
+ let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<D, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
@@ -163,7 +163,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToMan
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let happyPets = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
+ let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<D, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
@@ -174,7 +174,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToMan
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let johnsSonInLaw = CoreStore.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
+ let johnsSonInLaw = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<T, V> {
@@ -185,7 +185,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKe
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let johnsSonInLaw = CoreStore.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
+ let johnsSonInLaw = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<T, V> {
@@ -196,7 +196,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKe
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let spouseHasSiblings = CoreStore.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
+ let spouseHasSiblings = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
@@ -207,7 +207,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCTo
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let spouseHasSiblings = CoreStore.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
+ let spouseHasSiblings = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
@@ -218,7 +218,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCTo
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let spousesWithBadNamingSense = CoreStore.fetchAll(From<Person>().where((\.spouse ~ \.pets ~ \.name).any() == "Spot"))
+ let spousesWithBadNamingSense = dataStack.fetchAll(From<Person>().where((\.spouse ~ \.pets ~ \.name).any() == "Spot"))
  ```
  */
 public func ~ <D: NSManagedObject, O: NSManagedObject, T, C: AllowedObjectiveCToManyRelationshipKeyPathValue, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, C>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
@@ -232,7 +232,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, C: AllowedObjectiveCTo
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let owner = CoreStore.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
+ let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: KeyPathStringConvertible>(_ lhs: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.SingleTarget, K.DestinationValueType> where K.ObjectType == O {
@@ -246,7 +246,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: KeyPathStringConvertib
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let owner = CoreStore.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
+ let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<T, K.DestinationValueType> where K.ObjectType == O {
@@ -260,7 +260,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConver
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let owner = CoreStore.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
+ let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<T, K.DestinationValueType> where K.ObjectType == O {
@@ -274,7 +274,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConver
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let happyPets = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
+ let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
@@ -288,7 +288,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: ToManyRelationshipKeyP
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let happyPets = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
+ let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
@@ -302,7 +302,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipK
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let happyPets = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
+ let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
@@ -316,7 +316,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipK
 /**
  Connects multiple `KeyPathStringConvertible`s to create a type-safe chain usable in query/fetch expressions
  ```
- let spousesWithBadNamingSense = CoreStore.fetchAll(From<Pet>().where((\.master ~ \.pets ~ \.name).any() == "Spot"))
+ let spousesWithBadNamingSense = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets ~ \.name).any() == "Spot"))
  ```
  */
 public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, KC: ToManyRelationshipKeyPathStringConvertible, KV: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, KC>, _ rhs: KeyPath<O, KV>) -> Where<D>.Expression<Where<D>.CollectionTarget, KV.DestinationValueType> where KC.ObjectType == D, KV.ObjectType == O {
@@ -333,7 +333,7 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, KC: ToManyRelationship
 /**
  Creates a `Where` clause by comparing if an expression is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -344,7 +344,7 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by comparing if an expression is not equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
 public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -355,7 +355,7 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by checking if a sequence contains a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
+ let dog = dataStack.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
  ```
  */
 public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<D>.Expression<T, V>) -> Where<D> where S.Iterator.Element == V {
@@ -369,7 +369,7 @@ public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ e
 /**
  Creates a `Where` clause by comparing if an expression is less than a value
  ```
- let lonelyDog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.pets).count() < 2))
+ let lonelyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() < 2))
  ```
  */
 public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -380,7 +380,7 @@ public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
 /**
  Creates a `Where` clause by comparing if an expression is less than or equal to a value
  ```
- let lonelyDog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.pets).count() <= 1)
+ let lonelyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() <= 1)
  ```
  */
 public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -391,7 +391,7 @@ public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
 /**
  Creates a `Where` clause by comparing if an expression is greater than a value
  ```
- let happyDog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.pets).count() > 1)
+ let happyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() > 1)
  ```
  */
 public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -402,7 +402,7 @@ public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
 /**
  Creates a `Where` clause by comparing if an expression is greater than or equal to a value
  ```
- let happyDog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.pets).count() >= 2)
+ let happyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() >= 2)
  ```
  */
 public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
@@ -416,7 +416,7 @@ public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
 /**
  Creates a `Where` clause by comparing if an expression is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
@@ -427,7 +427,7 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by comparing if an expression is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
 public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
@@ -438,7 +438,7 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by comparing if an expression is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
 public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
@@ -449,7 +449,7 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by comparing if an expression is equal to a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
+ let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
 public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
@@ -460,7 +460,7 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
 /**
  Creates a `Where` clause by checking if a sequence contains a value
  ```
- let dog = CoreStore.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
+ let dog = dataStack.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
  ```
  */
 public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<D>.Expression<T, V?>) -> Where<D> where S.Iterator.Element == V {
@@ -474,7 +474,7 @@ public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ e
 /**
  Creates a `Where` clause by comparing if an expression is less than a value
  ```
- let childsPet = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.age) < 10))
+ let childsPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) < 10))
  ```
  */
 public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
@@ -485,7 +485,7 @@ public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
 /**
  Creates a `Where` clause by comparing if an expression is less than or equal to a value
  ```
- let childsPet = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.age) <= 10))
+ let childsPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) <= 10))
  ```
  */
 public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
@@ -496,7 +496,7 @@ public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
 /**
  Creates a `Where` clause by comparing if an expression is greater than a value
  ```
- let teensPet = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.age) > 10))
+ let teensPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) > 10))
  ```
  */
 public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
@@ -507,7 +507,7 @@ public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
 /**
  Creates a `Where` clause by comparing if an expression is greater than or equal to a value
  ```
- let teensPet = CoreStore.fetchOne(From<Dog>().where((\.master ~ \.age) >= 10))
+ let teensPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) >= 10))
  ```
  */
 public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
@@ -523,7 +523,7 @@ extension KeyPath where Root: NSManagedObject, Value: AllowedObjectiveCToManyRel
     /**
      Creates a `Where.Expression` clause for COUNT
      ```
-     let dogsWithPlaymates = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
+     let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
     public func count() -> Where<Root>.Expression<Where<Root>.CollectionTarget, Int> {
@@ -539,7 +539,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for COUNT
      ```
-     let dogsWithPlaymates = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
+     let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
     public func count() -> Where<D>.Expression<T, Int> {
@@ -556,7 +556,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for ANY
      ```
-     let dogsWithBadNamingSense = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
+     let dogsWithBadNamingSense = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
     public func any() -> Where<D>.Expression<T, V> {
@@ -567,7 +567,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for ALL
      ```
-     let allPlaymatePuppies = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
+     let allPlaymatePuppies = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
      ```
      */
     public func all() -> Where<D>.Expression<T, V> {
@@ -578,7 +578,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for NONE
      ```
-     let dogs = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
+     let dogs = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
     public func none() -> Where<D>.Expression<T, V> {
@@ -595,7 +595,7 @@ extension KeyPath where Root: CoreStoreObject, Value: ToManyRelationshipKeyPathS
     /**
      Creates a `Where.Expression` clause for COUNT
      ```
-     let dogsWithPlaymates = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
+     let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
     public func count() -> Where<Root>.Expression<Where<Root>.CollectionTarget, Int> {
@@ -612,7 +612,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for COUNT
      ```
-     let dogsWithPlaymates = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
+     let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
     public func count() -> Where<D>.Expression<T, Int> {
@@ -623,7 +623,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for ANY
      ```
-     let dogsWithBadNamingSense = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
+     let dogsWithBadNamingSense = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
     public func any() -> Where<D>.Expression<T, V> {
@@ -634,7 +634,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for ALL
      ```
-     let allPlaymatePuppies = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
+     let allPlaymatePuppies = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
      ```
      */
     public func all() -> Where<D>.Expression<T, V> {
@@ -645,7 +645,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
     /**
      Creates a `Where.Expression` clause for NONE
      ```
-     let dogs = CoreStore.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
+     let dogs = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
     public func none() -> Where<D>.Expression<T, V> {
diff --git a/Sources/XcodeDataModelSchema.swift b/Sources/XcodeDataModelSchema.swift
index 027b229..dea8ca5 100644
--- a/Sources/XcodeDataModelSchema.swift
+++ b/Sources/XcodeDataModelSchema.swift
@@ -32,7 +32,7 @@ import Foundation
 /**
  The `XcodeDataModelSchema` describes a model version declared in a single *.xcdatamodeld file.
  ```
- CoreStore.defaultStack = DataStack(
+ CoreStoreDefaults.dataStack = DataStack(
      XcodeDataModelSchema(modelName: "MyAppV1", bundle: .main)
  )
  ```
@@ -109,7 +109,7 @@ public final class XcodeDataModelSchema: DynamicSchema {
     /**
      Initializes an `XcodeDataModelSchema` from an *.xcdatamodeld version name and its containing `Bundle`.
      ```
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          XcodeDataModelSchema(modelName: "MyAppV1", bundle: .main)
      )
      ```
@@ -135,7 +135,7 @@ public final class XcodeDataModelSchema: DynamicSchema {
     /**
      Initializes an `XcodeDataModelSchema` from an *.xcdatamodeld file URL.
      ```
-     CoreStore.defaultStack = DataStack(
+     CoreStoreDefaults.dataStack = DataStack(
          XcodeDataModelSchema(modelName: "MyAppV1", modelVersionFileURL: fileURL)
      )
      ```
diff --git a/Sources/diffableDataSource.CollectionView-AppKit.swift b/Sources/diffableDataSource.CollectionView-AppKit.swift
new file mode 100644
index 0000000..3c20837
--- /dev/null
+++ b/Sources/diffableDataSource.CollectionView-AppKit.swift
@@ -0,0 +1,294 @@
+//
+//  DiffableDataSource.CollectionView-AppKit.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+#if canImport(AppKit) && os(macOS)
+
+import AppKit
+import CoreData
+
+
+// MARK: - DiffableDataSource
+
+extension DiffableDataSource {
+
+    // MARK: - CollectionView
+    
+    /**
+     The `DiffableDataSource.CollectionView` serves as a `NSCollectionViewDataSource` that handles `ListPublisher` snapshots for a `NSCollectionView`. Subclasses of `DiffableDataSource.CollectionView` may override some `NSCollectionViewDataSource` methods as needed.
+     The `DiffableDataSource.CollectionView` instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
+     ```
+     self.dataSource = DiffableDataSource.CollectionView<Person>(
+         collectionView: self.collectionView,
+         dataStack: CoreStoreDefaults.dataStack,
+         itemProvider: { (collectionView, indexPath, person) in
+             let item = collectionView.makeItem(withIdentifier: .collectionViewItem, for: indexPath) as! PersonItem
+             item.setPerson(person)
+             return item
+         }
+     )
+     ```
+     The dataSource can then apply changes from a `ListPublisher` as shown:
+     ```
+     listPublisher.addObserver(self) { [weak self] (listPublisher) in
+        self?.dataSource?.apply(
+            listPublisher.snapshot,
+            animatingDifferences: true
+        )
+     }
+     ```
+     `DiffableDataSource.CollectionView` fully handles the reload animations.
+     */
+    open class CollectionView<O: DynamicObject>: NSObject, NSCollectionViewDataSource {
+
+        // MARK: Public
+        
+        /**
+         The object type represented by this dataSource
+         */
+        public typealias ObjectType = O
+        
+        /**
+         Initializes the `DiffableDataSource.CollectionView`. This instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
+         ```
+         self.dataSource = DiffableDataSource.CollectionView<Person>(
+             collectionView: self.collectionView,
+             dataStack: CoreStoreDefaults.dataStack,
+             itemProvider: { (collectionView, indexPath, person) in
+                 let item = collectionView.makeItem(withIdentifier: .collectionViewItem, for: indexPath) as! PersonItem
+                 item.setPerson(person)
+                 return item
+             }
+         )
+         ```
+         - parameter collectionView: the `NSCollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionView`.
+         - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
+         - parameter itemProvider: a closure that configures and returns the `NSCollectionViewItem` for the object
+         */
+        @nonobjc
+        public init(collectionView: NSCollectionView, dataStack: DataStack, itemProvider: @escaping (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?, supplementaryViewProvider: @escaping (NSCollectionView, String, IndexPath) -> NSView? = { _, _, _ in nil }) {
+
+            self.collectionView = collectionView
+            self.itemProvider = itemProvider
+            self.supplementaryViewProvider = supplementaryViewProvider
+            self.dataStack = dataStack
+            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
+
+            super.init()
+
+            collectionView.dataSource = self
+        }
+        
+        /**
+         Reloads the `NSCollectionView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
+         ```
+         listPublisher.addObserver(self) { [weak self] (listPublisher) in
+            self?.dataSource?.apply(
+                listPublisher.snapshot,
+                animatingDifferences: true
+            )
+         }
+         ```
+         
+         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
+         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
+         */
+        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
+
+            let diffableSnapshot = snapshot.diffableSnapshot
+            self.dispatcher.apply(
+                diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                view: self.collectionView,
+                animatingDifferences: animatingDifferences,
+                performUpdates: { collectionView, changeset, setSections in
+
+                    collectionView.reload(
+                        using: changeset,
+                        setData: setSections
+                    )
+                }
+            )
+        }
+        
+        /**
+         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         
+         - parameter indexPath: the `IndexPath` to search for
+         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         */
+        @nonobjc
+        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
+
+            return self.dispatcher.itemIdentifier(for: indexPath)
+        }
+        
+        /**
+         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         
+         - parameter itemID: the object identifier to search for
+         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         */
+        @nonobjc
+        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
+
+            return self.dispatcher.indexPath(for: itemID)
+        }
+
+
+        // MARK: - NSCollectionViewDataSource
+
+        @objc
+        public dynamic func numberOfSections(in collectionView: NSCollectionView) -> Int {
+
+            return self.dispatcher.numberOfSections()
+        }
+
+        @objc
+        public dynamic func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
+
+            return self.dispatcher.numberOfItems(inSection: section)
+        }
+
+        @objc
+        open dynamic func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
+
+            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
+
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
+            }
+            guard let object = self.dataStack.fetchExisting(objectID) as O? else {
+
+                Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) has been deleted")
+            }
+            guard let item = self.itemProvider(collectionView, indexPath, object) else {
+
+                Internals.abort("\(Internals.typeName(NSCollectionViewDataSource.self)) returned a `nil` item for \(Internals.typeName(IndexPath.self)) \(indexPath)")
+            }
+            return item
+        }
+
+        @objc
+        open dynamic func collectionView(_ collectionView: NSCollectionView, viewForSupplementaryElementOfKind kind: NSCollectionView.SupplementaryElementKind, at indexPath: IndexPath) -> NSView {
+
+            guard let view = self.supplementaryViewProvider(collectionView, kind, indexPath) else {
+
+                return NSView()
+            }
+            return view
+        }
+
+
+        // MARK: Private
+
+        private weak var collectionView: NSCollectionView?
+
+        private let dataStack: DataStack
+        private let itemProvider: (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?
+        private let supplementaryViewProvider: (NSCollectionView, String, IndexPath) -> NSView?
+        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
+    }
+}
+
+
+// MARK: - NSCollectionView
+
+extension NSCollectionView {
+
+    // MARK: FilePrivate
+
+    @nonobjc
+    fileprivate func reload<C, O>(
+        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
+        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
+        setData: (C) -> Void
+    ) {
+
+        if case .none = window, let data = stagedChangeset.last?.data {
+
+            setData(data)
+            self.reloadData()
+            return
+        }
+        for changeset in stagedChangeset {
+
+            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
+
+                setData(data)
+                self.reloadData()
+                return
+            }
+            self.animator().performBatchUpdates(
+                {
+                    setData(changeset.data)
+
+                    if !changeset.sectionDeleted.isEmpty {
+
+                        self.deleteSections(IndexSet(changeset.sectionDeleted))
+                    }
+                    if !changeset.sectionInserted.isEmpty {
+
+                        self.insertSections(IndexSet(changeset.sectionInserted))
+                    }
+                    if !changeset.sectionUpdated.isEmpty {
+
+                        self.reloadSections(IndexSet(changeset.sectionUpdated))
+                    }
+                    for (source, target) in changeset.sectionMoved {
+
+                        self.moveSection(source, toSection: target)
+                    }
+                    if !changeset.elementDeleted.isEmpty {
+
+                        self.deleteItems(
+                            at: Set(changeset.elementDeleted.map { IndexPath(item: $0.element, section: $0.section) })
+                        )
+                    }
+                    if !changeset.elementInserted.isEmpty {
+
+                        self.insertItems(
+                            at: Set(changeset.elementInserted.map { IndexPath(item: $0.element, section: $0.section) })
+                        )
+                    }
+                    if !changeset.elementUpdated.isEmpty {
+
+                        self.reloadItems(
+                            at: Set(changeset.elementUpdated.map { IndexPath(item: $0.element, section: $0.section) })
+                        )
+                    }
+                    for (source, target) in changeset.elementMoved {
+
+                        self.moveItem(
+                            at: IndexPath(item: source.element, section: source.section),
+                            to: IndexPath(item: target.element, section: target.section)
+                        )
+                    }
+                },
+                completionHandler: nil
+            )
+        }
+    }
+}
+
+
+#endif
diff --git a/bitrise.yml b/bitrise.yml
deleted file mode 100644
index 99ac7f5..0000000
--- a/bitrise.yml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-format_version: '7'
-default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
-project_type: ios
-trigger_map:
-- push_branch: "*"
-  workflow: ci
-- pull_request_source_branch: "*"
-  workflow: ci
-workflows:
-  ci:
-    steps:
-    - activate-ssh-key:
-        run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
-    - git-clone: {}
-    - cache-pull: {}
-    - certificate-and-profile-installer: {}
-    ################ PLATFORM = tvOS
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore tvOS"
-        - is_clean_build: "yes"
-        - xcodebuild_test_options: "-configuration Debug"
-        - simulator_platform: "tvOS Simulator"
-        - simulator_device: "Apple TV"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore tvOS"
-        - is_clean_build: "yes"
-        - xcodebuild_test_options: "-configuration Release"
-        - simulator_platform: "tvOS Simulator"
-        - simulator_device: "Apple TV"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore tvOS"
-        - is_clean_build: "yes"
-        - simulator_platform: "tvOS Simulator"
-        - simulator_device: "Apple TV 4K"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore tvOS"
-        - is_clean_build: "yes"
-        - simulator_platform: "tvOS Simulator"
-        - simulator_device: "Apple TV 4K (at 1080p)"
-        - should_retry_test_on_fail: "yes"
-    ################ PLATFORM = iOS
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore iOS"
-        - is_clean_build: "yes"
-        - simulator_platform: "iOS Simulator"
-        - simulator_device: "iPhone XS"
-        - simulator_os_version: "12.0"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore iOS"
-        - is_clean_build: "yes"
-        - simulator_platform: "iOS Simulator"
-        - simulator_device: "iPhone 8"
-        - simulator_os_version: "11.4"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore iOS"
-        - is_clean_build: "yes"
-        - simulator_platform: "iOS Simulator"
-        - simulator_device: "iPhone 7"
-        - simulator_os_version: "10.3.1"
-        - should_retry_test_on_fail: "yes"
-    ################ PLATFORM = macOS
-    - xcode-test-mac:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore OSX"
-        - is_clean_build: "yes"
-        - xcodebuild_test_options: "-configuration Debug"
-        - destination: "platform=macos,arch=x86_64"
-        - should_retry_test_on_fail: "yes"
-    - xcode-test-mac:
-        inputs:
-        - project_path: "$BITRISE_PROJECT_PATH"
-        - scheme: "CoreStore OSX"
-        - is_clean_build: "yes"
-        - xcodebuild_test_options: "-configuration Release"
-        - destination: "platform=macos,arch=x86_64"
-        - should_retry_test_on_fail: "yes"
-    - cache-push: {}
-app:
-  envs:
-  - opts:
-      is_expand: false
-    BITRISE_PROJECT_PATH: CoreStore.xcworkspace

From 145edd5a7de8dddc889233fb473f44dcc1d22995 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 21 Oct 2019 21:15:46 +0900
Subject: [PATCH 28/58] README update

---
 .../xcschemes/CoreStore iOS.xcscheme          |   2 +-
 README.md                                     | 152 ++++++++++++------
 ...reStore+CustomDebugStringConvertible.swift |  44 -----
 Sources/CoreStore+Migration.swift             |  32 ----
 Sources/CoreStore+Setup.swift                 |  26 ---
 Sources/DataStack+Migration.swift             | 136 ----------------
 Sources/DataStack.swift                       |  93 -----------
 ...fableDataSource.CollectionView-UIKit.swift |   4 +-
 .../DiffableDataSource.TableView-UIKit.swift  |   3 +
 ...s.DiffableDataUIDispatcher.Changeset.swift |   1 +
 ....DiffableDataUIDispatcher.DiffResult.swift |  13 +-
 ...ableDataUIDispatcher.StagedChangeset.swift |   3 +-
 ...edDiffableDataSourceSnapshotDelegate.swift |  31 +---
 Sources/StorageInterface.swift                | 105 ------------
 ...ableDataSource.CollectionView-AppKit.swift |   4 +-
 15 files changed, 129 insertions(+), 520 deletions(-)

diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme
index fdef8e3..01ffb76 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
@@ -71,7 +71,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/README.md b/README.md
index 8e29bc1..7405262 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,10 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
     - [Logging and error reporting](#logging-and-error-reporting)
     - [Observing changes and notifications](#observing-changes-and-notifications)
         - [Observe a single property](#observe-a-single-property)
-        - [Observe a single object](#observe-a-single-object)
-        - [Observe a list of objects](#observe-a-list-of-objects)
+        - [Observe a single object's updates](#observe-a-single-objects-updates)
+        - [Observe a single object's per-property updates](#observe-a-single-objects-per-property-updates)
+        - [Observe a diffable list](#observe-a-diffable-list)
+        - [Observe detailed list changes](#observe-detailed-list-changes)
     - [Objective-C support](#objective-c-support)
     - [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects)
         - [`VersionLock`s](#versionlocks)
@@ -174,15 +176,15 @@ If you are already familiar with the inner workings of CoreData, here is a mappi
 
 | *Core Data* | *CoreStore* |
 | --- | --- |
-| `NSManagedObjectModel` / `NSPersistentStoreCoordinator`<br />(.xcdatamodeld file) | `DataStack` |
-| `NSPersistentStore`<br />("Configuration"s in the .xcdatamodeld file) | `StorageInterface` implementations<br />(`InMemoryStore`, `SQLiteStore`, `ICloudStore`) |
+| `NSPersistentContainer`<br />(.xcdatamodeld file) | `DataStack` |
+| `NSPersistentStoreDescription`<br />("Configuration"s in the .xcdatamodeld file) | `StorageInterface` implementations<br />(`InMemoryStore`, `SQLiteStore`) |
 | `NSManagedObjectContext` | `BaseDataTransaction` subclasses<br />(`SynchronousDataTransaction`, `AsynchronousDataTransaction`, `UnsafeDataTransaction`) |
 
 A lot of Core Data wrapper libraries set up their `NSManagedObjectContext`s this way:
 
 <img src="https://cloud.githubusercontent.com/assets/3029684/16707160/984ef25c-4600-11e6-869f-8db7d2c63668.png" alt="nested contexts" height=380 />
 
-Nesting saves from child context to the root context ensures maximum data integrity between contexts without blocking the main queue. But <a href="http://floriankugler.com/2013/04/29/concurrent-core-data-stack-performance-shootout/">in reality</a>, merging contexts is still by far faster than saving contexts. CoreStore's `DataStack` takes the best of both worlds by treating the main `NSManagedObjectContext` as a read-only context, and only allows changes to be made within *transactions* on the child context:
+Nesting saves from child context to the root context ensures maximum data integrity between contexts without blocking the main queue. But <a href="http://floriankugler.com/2013/04/29/concurrent-core-data-stack-performance-shootout/">in reality</a>, merging contexts is still by far faster than saving contexts. CoreStore's `DataStack` takes the best of both worlds by treating the main `NSManagedObjectContext` as a read-only context (or "viewContext"), and only allows changes to be made within *transactions* on the child context:
 
 <img src="https://cloud.githubusercontent.com/assets/3029684/16707161/9adeb962-4600-11e6-8bc8-4ec85764dba4.png" alt="nested contexts and merge hybrid" height=292 />
 
@@ -242,7 +244,7 @@ class MyViewController: UIViewController {
         }
     }
     func methodToBeCalledLaterOn() {
-        let objects = self.dataStack.fetchAll(From(MyEntity))
+        let objects = self.dataStack.fetchAll(From<MyEntity>())
         print(objects)
     }
 }
@@ -250,7 +252,7 @@ class MyViewController: UIViewController {
 
 > 💡By default, CoreStore will initialize `NSManagedObject`s from *.xcdatamodeld* files, but you can create models completely from source code using `CoreStoreObject`s and `CoreStoreSchema`.  To use this feature, refer to [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects).
 
-Notice that in our previous examples, `addStorageAndWait(_:)` and `addStorage(_:completion:)` both accept either `InMemoryStore`, `SQLiteStore`, or `ICloudStore`. These implement the `StorageInterface` protocol.
+Notice that in our previous examples, `addStorageAndWait(_:)` and `addStorage(_:completion:)` both accept either `InMemoryStore`, or `SQLiteStore`. These implement the `StorageInterface` protocol.
 
 ### In-memory store
 The most basic `StorageInterface` concrete type is the `InMemoryStore`, which just stores objects in memory. Since `InMemoryStore`s always start with a fresh empty data, they do not need any migration information.
@@ -298,16 +300,7 @@ If you have custom `NSIncrementalStore` or `NSAtomicStore` subclasses, you can i
 ## Migrations
 
 ### Declaring model versions
-Until CoreStore 4.0, model versions were always assumed to be declared in *.xcdatamodeld* files. The `DataStack` loads these for us by accepting the *.xcdatamodeld* file name and the `Bundle` where the files can be found:
-```swift
-CoreStoreDefaults.dataStack = DataStack(
-    xcodeModelName: "MyModel",
-    bundle: Bundle.main,
-    migrationChain: ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4"]
-)
-```
-
-Starting CoreStore 4.0, model versions are now expressed as a first-class protocol, `DynamicSchema`. CoreStore currently supports the following schema classes:
+Model versions are now expressed as a first-class protocol, `DynamicSchema`. CoreStore currently supports the following schema classes:
 - **`XcodeDataModelSchema`**: a model version with entities loaded from a *.xcdatamodeld* file.
 - **`CoreStoreSchema`**: a model version created with `CoreStoreObject` entities. *(See [Type-safe `CoreStoreObject`s](#type-safe-corestore-objects))*
 - **`UnsafeDataModelSchema`**: a model version created with an existing `NSManagedObjectModel` instance.
@@ -432,7 +425,7 @@ CoreStoreDefaults.dataStack = DataStack(
 
 
 ### Starting migrations
-We have seen `addStorageAndWait(...)` used to initialize our persistent store. As the method name's *~AndWait* suffix suggests though, this method blocks so it should not do long tasks such as store migrations. In fact CoreStore will only attempt a synchronous **lightweight** migration if you explicitly provide the `.allowSynchronousLightweightMigration` option:
+We have seen `addStorageAndWait(...)` used to initialize our persistent store. As the method name's *~AndWait* suffix suggests though, this method blocks so it should not do long tasks such as data migrations. In fact CoreStore will only attempt a synchronous **lightweight** migration if you explicitly provide the `.allowSynchronousLightweightMigration` option:
 ```swift
 try dataStack.addStorageAndWait(
     SQLiteStore(
@@ -542,11 +535,11 @@ Each `MigrationType` indicates the migration type for each step in the `Migratio
 
 ### Custom migrations
 
-Before CoreStore 4.0, the only way to implement custom migrations is to use Core Data's standard method: declaring entity mappings through *.xcmappingmodel* files. Starting CoreStore 4.0, new ways to declare migration mappings have been added:
+CoreStore offers several ways to declare migration mappings:
 
-- `InferredSchemaMappingProvider`: The default mapping provider which tries to infer model migration between two `DynamicSchema` versions either by searching all *.xcmappingmodel* files from `Bundle.allBundles`, or by relying on lightweight migration if possible.
-- `XcodeSchemaMappingProvider`: A mapping provider which loads entity mappings from *.xcmappingmodel* files in a specified `Bundle`.
 - `CustomSchemaMappingProvider`: A mapping provider that infers mapping initially, but also accepts custom mappings for specified entities. This was added to support custom migrations with `CoreStoreObject`s as well, but may also be used with `NSManagedObject`s.
+- `XcodeSchemaMappingProvider`: A mapping provider which loads entity mappings from *.xcmappingmodel* files in a specified `Bundle`.
+- `InferredSchemaMappingProvider`: The default mapping provider which tries to infer model migration between two `DynamicSchema` versions either by searching all *.xcmappingmodel* files from `Bundle.allBundles`, or by relying on lightweight migration if possible.
 
 These mapping providers conform to `SchemaMappingProvider` and can be passed to `SQLiteStore`'s initializer:
 ```swift
@@ -613,18 +606,7 @@ dataStack.perform(
     }
 )
 ```
-or for the default stack, directly from `CoreStore`:
-```swift
-dataStack.perform(
-    asynchronous: { (transaction) -> Void in
-        // make changes
-    },
-    completion: { (result) -> Void in
-        // ...
-    }
-)
-```
-Transaction blocks automatically save changes once the block completes. To cancel and rollback a transaction, throw a `CoreStoreError.userCancelled` from inside the closure by calling `try transaction.cancel()`:
+Transaction closures automatically save changes once the closures completes. To cancel and rollback a transaction, throw a `CoreStoreError.userCancelled` from inside the closure by calling `try transaction.cancel()`:
 ```swift
 dataStack.perform(
     asynchronous: { (transaction) -> Void in
@@ -907,7 +889,7 @@ dataStack.perform(
 
 
 ## Importing data
-Some times, if not most of the time, the data that we save to Core Data comes from external sources such as web servers or external files. If you have for example a JSON dictionary, you may be extracting values as such:
+Some times, if not most of the time, the data that we save to Core Data comes from external sources such as web servers or external files. If you have a JSON dictionary for example, you may be extracting values as such:
 ```swift
 let json: [String: Any] = // ...
 person.name = json["name"] as? NSString
@@ -1089,7 +1071,7 @@ dataStack.perform(
     completion: { _ in }
 )
 ```
-As with `ImportableObject`, you can control wether to skip importing an object by implementing 
+As with `ImportableObject`, you can control whether to skip importing an object by implementing 
 `shouldInsert(from:in:)` and `shouldUpdate(from:in:)`, or to cancel all objects by `throw`ing an error from the `uniqueID(from:in:)`, `didInsert(from:in:)` or `update(from:in:)` methods.
 
 
@@ -1154,7 +1136,7 @@ var people = dataStack.fetchAll(
     Where<MyPersonEntity>(predicate) // predicate initializer
 )
 ```
-⭐️Starting CoreStore 5.0, `Where` clauses became more type-safe and are now generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `Where` clause expression:
+ `Where` clauses are generic types. To avoid verbose repetition of the generic object type, fetch methods support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `Where` clause expression:
 ```swift
 var people = try dataStack.fetchAll(
     From<MyPersonEntity>()
@@ -1180,7 +1162,7 @@ var mostValuablePeople = try dataStack.fetchAll(
 )
 ```
 As seen above, `OrderBy` accepts a list of `SortKey` enumeration values, which can be either `.ascending` or `.descending`.
-⭐️As with `Where` clauses, CoreStore 5.0 turned `OrderBy` clauses into generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `OrderBy` clause expression:
+As with `Where` clauses, `OrderBy` clauses are also generic types. To avoid verbose repetition of the generic object type, fetch methods support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `OrderBy` clause expression:
 ```swift
 var people = try dataStack.fetchAll(
     From<MyPersonEntity>()
@@ -1251,7 +1233,7 @@ The `Select<T>` clause specifies the target attribute/aggregate key, as well as
 let johnsAge = try dataStack.queryValue(
     From<MyPersonEntity>(),
     Select<Int>("age"),
-    Where("name == %@", "John Smith")
+    Where<MyPersonEntity>("name == %@", "John Smith")
 )
 ```
 The example above queries the "age" property for the first object that matches the `Where` condition. `johnsAge` will be bound to type `Int?`, as indicated by the `Select<Int>` generic type. For `queryValue(...)`, types that conform to `QueryableAttributeType` are allowed as the return type (and therefore as the generic type for `Select<T>`).
@@ -1263,7 +1245,7 @@ let allAges = try dataStack.queryAttributes(
     Select("age")
 )
 ```
-⭐️Starting CoreStore 5.0, query methods now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
+query methods also support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
 let johnsAge = try dataStack.queryValue(
     From<MyPersonEntity>()
@@ -1357,7 +1339,7 @@ let personJSON = try dataStack.queryAttributes(
     GroupBy("age")
 )
 ```
-⭐️Starting CoreStore 5.0, `GroupBy` clauses are now also generic types and now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
+`GroupBy` clauses are also generic types and support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
 let personJSON = try dataStack.queryAttributes(
     From<MyPersonEntity>()
@@ -1401,8 +1383,7 @@ Take special care when implementing `CoreStoreLogger`'s `assert(...)` and `abort
 - `assert(...)`: The behavior between `DEBUG` and release builds, or `-O` and `-Onone`, are all left to the implementers' responsibility. CoreStore calls `CoreStoreLogger.assert(...)` only for invalid but usually recoverable errors (for example, early validation failures that may cause an error thrown and handled somewhere else)
 - `abort(...)`: This method is *the* last-chance for your app to *synchronously* log a fatal error within CoreStore. The app will be terminated right after this function is called (CoreStore calls `fatalError()` internally)
 
-Starting CoreStore 2.0, all CoreStore types now have very useful (and pretty formatted!) `print(...)` outputs. 
-
+All CoreStore types have very useful (and pretty formatted!) `print(...)` outputs. 
 A couple of examples, `ListMonitor`:
 
 <img width="369" alt="screen shot 2016-07-10 at 22 56 44" src="https://cloud.githubusercontent.com/assets/3029684/16713994/ae06e702-46f1-11e6-83a8-dee48b480bab.png" />
@@ -1417,8 +1398,15 @@ These are all implemented with `CustomDebugStringConvertible.debugDescription`,
 
 CoreStore provides type-safe wrappers for observing managed objects:
 
-- `ObjectMonitor`: use to monitor changes to a single `NSManagedObject` or `CoreStoreObject` instance (instead of Key-Value Observing)
-- `ListMonitor`: use to monitor changes to a list of `NSManagedObject` or `CoreStoreObject` instances (instead of `NSFetchedResultsController`)
+| | *ListMonitor* | 🆕*ListPublisher* | *ObjectMonitor* | 🆕*ObjectPublisher* |
+| --- | --- | --- | --- | --- |
+| *Number of objects* | N | N | 1 | 1 |
+| *Allows multiple observers* | ✅ | ✅ | ✅ | ✅ |
+| *Emits fine-grained changes* | ✅ | ❌ | ✅ | ❌ |
+| *Emits DiffableDataSource snapshots* | ❌ | ✅ | ❌ | ✅ |
+| *Closure callback* | ❌ | ✅ | ❌ | ✅ |
+| *Delegate methods* | ✅ | ❌ | ✅ | ❌ |
+| *SwiftUI support* | ❌ | ✅ | ❌ | ✅ |
 
 ### Observe a single property
 To get notifications for single property changes in an object, there are two methods depending on the object's base class.
@@ -1439,10 +1427,35 @@ let observer = person.age.observe(options: [.new]) { (person, change)
 
 For both methods, you will need to keep a reference to the returned `observer` for the duration of the observation.  
 
+### Observe a single object's updates
 
-### Observe a single object
+Observers of an  `ObjectPublisher` can receive notifications if any of the object's property changes. You can  create an `ObjectPublisher` from the object directly:
+```swift
+let objectPublisher: ObjectPublisher<Person> = person.asPublisher(in: dataStack)
+```
+or by indexing a `ListPublisher`'s `ListSnapshot`:
+```swift
+let listPublisher: ListPublisher<Person> = // ...
+// ...
+let objectPublisher = listPublisher.snapshot[indexPath]
+```
+(See [`ListPublisher` examples](#observe-a-diffable-list) below)
 
-To observe an object itself as a whole, implement the `ObjectObserver` protocol and specify the `EntityType`:
+To receive notifications, call the  `ObjectPublisher`'s `addObserve(...)` method passing the owner of the callback closure:
+```swift
+objectPublisher.addObserver(self) { [weak self] (objectPublisher) in
+    let snapshot: ObjectSnapshot<Person> = objectPublisher.snapshot
+    // handle changes
+}
+```
+Note that the owner instance will not be retained. You may call `ObjectPublisher.removeObserver(...)` explicitly to stop receiving notifications, but the `ObjectPublisher` also discontinues sending events to deallocated observers.
+
+The `ObjectSnapshot` returned from the `ObjectPublisher.snapshot` property returns a full-copy `struct` of all properties of the object. This is ideal for managing states as they are thread-safe and are not affected by further changes to the actual object.  `ObjectPublisher` automatically updates its `snapshot` value to the latest state of the object. 
+
+
+### Observe a single object's per-property updates
+
+If you need to track specifically which properties change in an object, implement the `ObjectObserver` protocol and specify the `EntityType`:
 ```swift
 class MyViewController: UIViewController, ObjectObserver {
     func objectMonitor(monitor: ObjectMonitor<MyPersonEntity>, willUpdateObject object: MyPersonEntity) {
@@ -1470,8 +1483,51 @@ You can get `ObjectMonitor`'s object through its `object` property. If the objec
 
 While `ObjectMonitor` exposes `removeObserver(...)` as well, it only stores `weak` references of the observers and will safely unregister deallocated observers. 
 
-### Observe a list of objects
-To observe a list of objects, implement one of the `ListObserver` protocols and specify the `EntityType`:
+### Observe a diffable list
+
+Observers of a  `ListPublisher` can receive notifications whenever its fetched result set changes. You can  create a `ListPublisher` by fetching from the `DataStack`:
+```swift
+let listPublisher = dataStack.listPublisher(
+    From<Person>()
+        .sectionBy(\.age") { "Age \($0)" } // sections are optional
+        .where(\.title == "Engineer")
+        .orderBy(.ascending(\.lastName))
+)
+```
+To receive notifications, call the  `ListPublisher`'s `addObserve(...)` method passing the owner of the callback closure:
+```swift
+listPublisher.addObserver(self) { [weak self] (listPublisher) in
+    let snapshot: ListSnapshot<Person> = listPublisher.snapshot
+    // handle changes
+}
+```
+Note that the owner instance will not be retained. You may call `ListPublisher.removeObserver(...)` explicitly to stop receiving notifications, but the `ListPublisher` also discontinues sending events to deallocated observers.
+
+The `ListSnapshot` returned from the `ListPublisher.snapshot` property returns a full-copy `struct` of all sections and `NSManagedObject` items in the list. This is ideal for managing states as they are thread-safe and are not affected by further changes to the result set.  `ListPublisher` automatically updates its `snapshot` value to the latest state of the fetch. 
+
+Unlike  `ListMonitor`s (See [`ListMonitor` examples](#observe-detailed-list-changes) below), a `ListPublisher` does not track detailed inserts, deletes, and moves. In return, a `ListPublisher` is a lot more lightweight and are designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s:
+```swift
+self.dataSource = DiffableDataSource.CollectionView<Person>(
+    collectionView: self.collectionView,
+    dataStack: CoreStoreDefaults.dataStack,
+    cellProvider: { (collectionView, indexPath, person) in
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PersonCell") as! PersonCell
+        cell.setPerson(person)
+        return cell
+    }
+)
+
+// ...
+
+listPublisher.addObserver(self) { [weak self] (listPublisher) in
+   self?.dataSource?.apply(
+       listPublisher.snapshot, animatingDifferences: true
+   )
+}
+```
+
+### Observe detailed list changes
+If you need to track each object's inserts, deletes, moves, and updates, implement one of the `ListObserver` protocols and specify the `EntityType`:
 ```swift
 class MyViewController: UIViewController, ListObserver {
     func listMonitorDidChange(monitor: ListMonitor<MyPersonEntity>) {
diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift
index 4502f4b..a6fab80 100644
--- a/Sources/CoreStore+CustomDebugStringConvertible.swift
+++ b/Sources/CoreStore+CustomDebugStringConvertible.swift
@@ -54,50 +54,6 @@ extension AsynchronousDataTransaction: CustomDebugStringConvertible, CoreStoreDe
 }
 
 
-// MARK: - CloudStorageOptions
-
-extension CloudStorageOptions: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
-    
-    // MARK: CustomDebugStringConvertible
-    
-    public var debugDescription: String {
-        
-        return formattedDebugDescription(self)
-    }
-    
-    
-    // MARK: CoreStoreDebugStringConvertible
-    
-    public var coreStoreDumpString: String {
-        
-        var flags = [String]()
-        if self.contains(.recreateLocalStoreOnModelMismatch) {
-            
-            flags.append(".recreateLocalStoreOnModelMismatch")
-        }
-        if self.contains(.allowSynchronousLightweightMigration) {
-            
-            flags.append(".allowSynchronousLightweightMigration")
-        }
-        switch flags.count {
-            
-        case 0:
-            return "[.none]"
-            
-        case 1:
-            return "[.\(flags[0])]"
-            
-        default:
-            var string = "[\n"
-            string.append(flags.joined(separator: ",\n"))
-            string.indent(1)
-            string.append("\n]")
-            return string
-        }
-    }
-}
-
-
 // MARK: - CoreStoreError
 
 extension CoreStoreError: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
diff --git a/Sources/CoreStore+Migration.swift b/Sources/CoreStore+Migration.swift
index e0dac94..dd31d5d 100644
--- a/Sources/CoreStore+Migration.swift
+++ b/Sources/CoreStore+Migration.swift
@@ -74,38 +74,6 @@ extension CoreStore {
         
         return CoreStoreDefaults.dataStack.addStorage(storage, completion: completion)
     }
-    
-    /**
-     Asynchronously adds a `CloudStorage` to the `CoreStoreDefaults.dataStack`. Migrations are also initiated by default.
-     ```
-     guard let storage = ICloudStore(
-         ubiquitousContentName: "MyAppCloudData",
-         ubiquitousContentTransactionLogsSubdirectory: "logs/config1",
-         ubiquitousContainerID: "iCloud.com.mycompany.myapp.containername",
-         ubiquitousPeerToken: "9614d658014f4151a95d8048fb717cf0",
-         configuration: "Config1",
-         cloudStorageOptions: .recreateLocalStoreOnModelMismatch
-     ) else {
-         // iCloud is not available on the device
-         return
-     }
-     let migrationProgress = dataStack.addStorage(
-         storage,
-         completion: { result in
-             switch result {
-             case .success(let storage): // ...
-             case .failure(let error): // ...
-             }
-         }
-     )
-     ```
-     - parameter storage: the cloud 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 `CloudStorage` associated to the `SetupResult.success` may not always be the same instance as the parameter argument if a previous `CloudStorage` was already added at the same URL and with the same configuration.
-     */
-    public static func addStorage<T: CloudStorage>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void) {
-        
-        CoreStoreDefaults.dataStack.addStorage(storage, completion: completion)
-    }
 
     /**
      Migrates a local storage to match the `CoreStoreDefaults.dataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
diff --git a/Sources/CoreStore+Setup.swift b/Sources/CoreStore+Setup.swift
index 4db95f0..b55260f 100644
--- a/Sources/CoreStore+Setup.swift
+++ b/Sources/CoreStore+Setup.swift
@@ -114,30 +114,4 @@ extension CoreStore {
         
         return try CoreStoreDefaults.dataStack.addStorageAndWait(storage)
     }
-    
-    /**
-     Adds a `CloudStorage` to the `CoreStoreDefaults.dataStack` and blocks until completion.
-     ```
-     guard let storage = ICloudStore(
-         ubiquitousContentName: "MyAppCloudData",
-         ubiquitousContentTransactionLogsSubdirectory: "logs/config1",
-         ubiquitousContainerID: "iCloud.com.mycompany.myapp.containername",
-         ubiquitousPeerToken: "9614d658014f4151a95d8048fb717cf0",
-         configuration: "Config1",
-         cloudStorageOptions: .recreateLocalStoreOnModelMismatch
-     ) else {
-         // iCloud is not available on the device
-         return
-     }
-     try CoreStore.addStorageAndWait(storage)
-     ```
-     - parameter storage: the local storage
-     - throws: a `CoreStoreError` value indicating the failure
-     - returns: the cloud storage added to the stack. Note that this may not always be the same instance as the parameter argument if a previous `CloudStorage` was already added at the same URL and with the same configuration.
-     */
-    @discardableResult
-    public static func addStorageAndWait<T: CloudStorage>(_ storage: T) throws -> T {
-        
-        return try CoreStoreDefaults.dataStack.addStorageAndWait(storage)
-    }
 }
diff --git a/Sources/DataStack+Migration.swift b/Sources/DataStack+Migration.swift
index ab2eb75..8ffe463 100644
--- a/Sources/DataStack+Migration.swift
+++ b/Sources/DataStack+Migration.swift
@@ -248,142 +248,6 @@ extension DataStack {
         }
     }
     
-    /**
-     Asynchronously adds a `CloudStorage` to the stack. Migrations are also initiated by default.
-     ```
-     guard let storage = ICloudStore(
-         ubiquitousContentName: "MyAppCloudData",
-         ubiquitousContentTransactionLogsSubdirectory: "logs/config1",
-         ubiquitousContainerID: "iCloud.com.mycompany.myapp.containername",
-         ubiquitousPeerToken: "9614d658014f4151a95d8048fb717cf0",
-         configuration: "Config1",
-         cloudStorageOptions: .recreateLocalStoreOnModelMismatch
-     ) else {
-         // iCloud is not available on the device
-         return
-     }
-     dataStack.addStorage(
-         storage,
-         completion: { result in
-             switch result {
-             case .success(let storage): // ...
-             case .failure(let error): // ...
-             }
-         }
-     )
-     ```
-     - parameter storage: the cloud 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 `CloudStorage` associated to the `SetupResult.success` may not always be the same instance as the parameter argument if a previous `CloudStorage` was already added at the same URL and with the same configuration.
-     */
-    public func addStorage<T: CloudStorage>(_ storage: T, completion: @escaping (SetupResult<T>) -> Void)  {
-        
-        let cacheFileURL = storage.cacheFileURL
-        self.coordinator.performSynchronously {
-            
-            if let _ = self.persistentStoreForStorage(storage) {
-                
-                DispatchQueue.main.async {
-                    
-                    completion(.success(storage))
-                }
-                return
-            }
-            
-            if let persistentStore = self.coordinator.persistentStore(for: cacheFileURL as URL) {
-                
-                if let existingStorage = persistentStore.storageInterface as? T,
-                    storage.matchesPersistentStore(persistentStore) {
-                    
-                    DispatchQueue.main.async {
-                        
-                        completion(.success(existingStorage))
-                    }
-                    return
-                }
-                
-                let error = CoreStoreError.differentStorageExistsAtURL(existingPersistentStoreURL: cacheFileURL)
-                Internals.log(
-                    error,
-                    "Failed to add \(Internals.typeName(storage)) at \"\(cacheFileURL)\" because a different \(Internals.typeName(NSPersistentStore.self)) at that URL already exists."
-                )
-                DispatchQueue.main.async {
-                    
-                    completion(.failure(error))
-                }
-                return
-            }
-            
-            do {
-                
-                var cloudStorageOptions = storage.cloudStorageOptions
-                cloudStorageOptions.remove(.recreateLocalStoreOnModelMismatch)
-                
-                let storeOptions = storage.dictionary(forOptions: cloudStorageOptions)
-                do {
-                    
-                    _ = try self.createPersistentStoreFromStorage(
-                        storage,
-                        finalURL: cacheFileURL,
-                        finalStoreOptions: storeOptions
-                    )
-                    DispatchQueue.main.async {
-                        
-                        completion(.success(storage))
-                    }
-                }
-                catch let error as NSError where storage.cloudStorageOptions.contains(.recreateLocalStoreOnModelMismatch) && error.isCoreDataMigrationError {
-                    
-                    let finalStoreOptions = storage.dictionary(forOptions: storage.cloudStorageOptions)
-                    let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStore(
-                        ofType: type(of: storage).storeType,
-                        at: cacheFileURL,
-                        options: storeOptions
-                    )
-                    _ = try self.schemaHistory
-                        .schema(for: metadata)
-                        .flatMap({ try storage.cs_eraseStorageAndWait(soureModel: $0.rawModel()) })
-                    _ = try self.createPersistentStoreFromStorage(
-                        storage,
-                        finalURL: cacheFileURL,
-                        finalStoreOptions: finalStoreOptions
-                    )
-                }
-            }
-            catch let error as NSError
-                where error.code == NSFileReadNoSuchFileError && error.domain == NSCocoaErrorDomain {
-                    
-                    do {
-                        
-                        _ = try self.addStorageAndWait(storage)
-                        
-                        DispatchQueue.main.async {
-                            
-                            completion(.success(storage))
-                        }
-                    }
-                    catch {
-                        
-                        DispatchQueue.main.async {
-                            
-                            completion(.failure(CoreStoreError(error)))
-                        }
-                    }
-            }
-            catch {
-                
-                let storeError = CoreStoreError(error)
-                Internals.log(
-                    storeError,
-                    "Failed to load \(Internals.typeName(NSPersistentStore.self)) metadata."
-                )
-                DispatchQueue.main.async {
-                    
-                    completion(.failure(storeError))
-                }
-            }
-        }
-    }
-    
     /**
      Migrates a local storage to match the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
      
diff --git a/Sources/DataStack.swift b/Sources/DataStack.swift
index d2496ad..3010cda 100644
--- a/Sources/DataStack.swift
+++ b/Sources/DataStack.swift
@@ -370,99 +370,6 @@ public final class DataStack: Equatable {
         }
     }
     
-    /**
-     Adds a `CloudStorage` to the stack and blocks until completion.
-     ```
-     guard let storage = ICloudStore(
-         ubiquitousContentName: "MyAppCloudData",
-         ubiquitousContentTransactionLogsSubdirectory: "logs/config1",
-         ubiquitousContainerID: "iCloud.com.mycompany.myapp.containername",
-         ubiquitousPeerToken: "9614d658014f4151a95d8048fb717cf0",
-         configuration: "Config1",
-         cloudStorageOptions: .recreateLocalStoreOnModelMismatch
-     ) else {
-         // iCloud is not available on the device
-         return
-     }
-     try dataStack.addStorageAndWait(storage)
-     ```
-     - parameter storage: the local storage
-     - throws: a `CoreStoreError` value indicating the failure
-     - returns: the cloud storage added to the stack. Note that this may not always be the same instance as the parameter argument if a previous `CloudStorage` was already added at the same URL and with the same configuration.
-     */
-    @discardableResult
-    public func addStorageAndWait<T: CloudStorage>(_ storage: T) throws -> T {
-        
-        return try self.coordinator.performSynchronously {
-            
-            if let _ = self.persistentStoreForStorage(storage) {
-                
-                return storage
-            }
-            
-            let cacheFileURL = storage.cacheFileURL
-            if let persistentStore = self.coordinator.persistentStore(for: cacheFileURL as URL) {
-                
-                if let existingStorage = persistentStore.storageInterface as? T,
-                    storage.matchesPersistentStore(persistentStore) {
-                    
-                    return existingStorage
-                }
-                
-                let error = CoreStoreError.differentStorageExistsAtURL(existingPersistentStoreURL: cacheFileURL)
-                Internals.log(
-                    error,
-                    "Failed to add \(Internals.typeName(storage)) at \"\(cacheFileURL)\" because a different \(Internals.typeName(NSPersistentStore.self)) at that URL already exists."
-                )
-                throw error
-            }
-            
-            do {
-                
-                var cloudStorageOptions = storage.cloudStorageOptions
-                cloudStorageOptions.remove(.recreateLocalStoreOnModelMismatch)
-                
-                let storeOptions = storage.dictionary(forOptions: cloudStorageOptions)
-                do {
-                    
-                    _ = try self.createPersistentStoreFromStorage(
-                        storage,
-                        finalURL: cacheFileURL,
-                        finalStoreOptions: storeOptions
-                    )
-                    return storage
-                }
-                catch let error as NSError where storage.cloudStorageOptions.contains(.recreateLocalStoreOnModelMismatch) && error.isCoreDataMigrationError {
-                    
-                    let finalStoreOptions = storage.dictionary(forOptions: storage.cloudStorageOptions)
-                    let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStore(
-                        ofType: type(of: storage).storeType,
-                        at: cacheFileURL,
-                        options: storeOptions
-                    )
-                    _ = try self.schemaHistory
-                        .schema(for: metadata)
-                        .flatMap({ try storage.cs_eraseStorageAndWait(soureModel: $0.rawModel()) })
-                    _ = try self.createPersistentStoreFromStorage(
-                        storage,
-                        finalURL: cacheFileURL,
-                        finalStoreOptions: finalStoreOptions
-                    )
-                    return storage
-                }
-            }
-            catch {
-                
-                let storeError = CoreStoreError(error)
-                Internals.log(
-                    storeError,
-                    "Failed to add \(Internals.typeName(storage)) to the stack."
-                )
-                throw storeError
-            }
-        }
-    }
-    
     
     // MARK: 3rd Party Utilities
     
diff --git a/Sources/DiffableDataSource.CollectionView-UIKit.swift b/Sources/DiffableDataSource.CollectionView-UIKit.swift
index 2c3e494..985905f 100644
--- a/Sources/DiffableDataSource.CollectionView-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionView-UIKit.swift
@@ -59,6 +59,7 @@ extension DiffableDataSource {
      }
      ```
      `DiffableDataSource.CollectionView` fully handles the reload animations.
+     - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources     
      */
     open class CollectionView<O: DynamicObject>: NSObject, UICollectionViewDataSource {
 
@@ -217,7 +218,8 @@ extension DiffableDataSource {
 extension UICollectionView {
 
     // MARK: FilePrivate
-
+    
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
     @nonobjc
     fileprivate func reload<C, O>(
         using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
diff --git a/Sources/DiffableDataSource.TableView-UIKit.swift b/Sources/DiffableDataSource.TableView-UIKit.swift
index ad91c38..a57cb89 100644
--- a/Sources/DiffableDataSource.TableView-UIKit.swift
+++ b/Sources/DiffableDataSource.TableView-UIKit.swift
@@ -59,6 +59,7 @@ extension DiffableDataSource {
      }
      ```
      `DiffableDataSource.TableView` fully handles the reload animations. To turn change the default animation, set the `defaultRowAnimation`.
+     - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources
      */
     open class TableView<O: DynamicObject>: NSObject, UITableViewDataSource {
         
@@ -261,6 +262,7 @@ extension UITableView {
 
     // MARK: FilePrivate
     
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
     @nonobjc
     fileprivate func reload<C, O>(
         using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
@@ -282,6 +284,7 @@ extension UITableView {
         )
     }
     
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
     @nonobjc
     fileprivate func reload<C, O>(
         using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
diff --git a/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift b/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
index 510905b..bc972be 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.Changeset.swift
@@ -34,6 +34,7 @@ extension Internals.DiffableDataUIDispatcher {
     
     // MARK: - ChangeSet
     
+    // Implementation based on https://github.com/ra1028/DifferenceKit
     internal struct Changeset<C: Collection>: Equatable where C: Equatable {
         
         var data: C
diff --git a/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
index 01e8df9..17b7bd7 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.DiffResult.swift
@@ -34,6 +34,7 @@ extension Internals.DiffableDataUIDispatcher {
     
     // MARK: - DiffResult
     
+    // Implementation based on https://github.com/ra1028/DifferenceKit
     @usableFromInline
     internal struct DiffResult<Index> {
         
@@ -209,7 +210,8 @@ extension Internals.DiffableDataUIDispatcher {
         
         
         // MARK: - Trace
-        
+
+        // Implementation based on https://github.com/ra1028/DifferenceKit
         @usableFromInline
         internal struct Trace<Index> {
             
@@ -228,7 +230,8 @@ extension Internals.DiffableDataUIDispatcher {
         
         
         // MARK: - Occurrence
-        
+
+        // Implementation based on https://github.com/ra1028/DifferenceKit
         @usableFromInline
         internal enum Occurrence {
             
@@ -238,7 +241,8 @@ extension Internals.DiffableDataUIDispatcher {
         
         
         // MARK: - IndicesReference
-        
+
+        // Implementation based on https://github.com/ra1028/DifferenceKit
         @usableFromInline
         internal final class IndicesReference {
             
@@ -277,7 +281,8 @@ extension Internals.DiffableDataUIDispatcher {
         
         
         // MARK: - TableKey
-        
+
+        // Implementation based on https://github.com/ra1028/DifferenceKit
         @usableFromInline
         internal struct TableKey<T: Hashable>: Hashable {
             
diff --git a/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift b/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
index 7ba2359..9d533b3 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.StagedChangeset.swift
@@ -33,7 +33,8 @@ import Foundation
 extension Internals.DiffableDataUIDispatcher {
     
     // MARK: - StagedChangeset
-
+    
+    // Implementation based on https://github.com/ra1028/DifferenceKit
     internal struct StagedChangeset<C: Collection>: ExpressibleByArrayLiteral, Equatable, RandomAccessCollection, RangeReplaceableCollection where C: Equatable {
         
         @usableFromInline
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 3a06159..4348422 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -142,38 +142,13 @@ extension Internals {
         @objc
         dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) {
 
-            switch type {
-
-            case .update,
-                 .move where indexPath == newIndexPath:
-                let object = anObject as! NSManagedObject
-                self.reloadedItemIDs.append(object.objectID)
-
-            case .insert,
-                 .delete,
-                 .move:
-                 return
-
-            @unknown default:
-                return
-            }
+            let object = anObject as! NSManagedObject
+            self.reloadedItemIDs.append(object.objectID)
         }
 
         func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) {
 
-            switch type {
-
-            case .update:
-                self.reloadedSectionIDs.append(sectionInfo.name)
-
-            case .insert,
-                 .delete,
-                 .move:
-                return
-
-            @unknown default:
-                return
-            }
+            self.reloadedSectionIDs.append(sectionInfo.name)
         }
         
         
diff --git a/Sources/StorageInterface.swift b/Sources/StorageInterface.swift
index 14787c8..3eb8581 100644
--- a/Sources/StorageInterface.swift
+++ b/Sources/StorageInterface.swift
@@ -161,108 +161,3 @@ extension LocalStorage {
             && persistentStore.url == self.fileURL
     }
 }
-
-
-// MARK: - CloudStorageOptions
-
-/**
- The `CloudStorageOptions` provides settings that tells the `DataStack` how to setup the persistent store for `LocalStorage` implementers.
- */
-public struct CloudStorageOptions: OptionSet, ExpressibleByNilLiteral {
-    
-    /**
-     Tells the `DataStack` that the store should not be migrated or recreated, and should simply fail on model mismatch
-     */
-    public static let none = CloudStorageOptions(rawValue: 0)
-    
-    /**
-     Tells the `DataStack` to delete and recreate the local store from the cloud store on model mismatch, otherwise exceptions will be thrown on failure instead
-     */
-    public static let recreateLocalStoreOnModelMismatch = CloudStorageOptions(rawValue: 1 << 0)
-    
-    /**
-     Tells the `DataStack` to allow lightweight migration for the store when added synchronously
-     */
-    public static let allowSynchronousLightweightMigration = CloudStorageOptions(rawValue: 1 << 2)
-    
-    
-    // MARK: OptionSetType
-    
-    public init(rawValue: Int) {
-        
-        self.rawValue = rawValue
-    }
-    
-    
-    // MARK: RawRepresentable
-    
-    public let rawValue: Int
-    
-    
-    // MARK: ExpressibleByNilLiteral
-    
-    public init(nilLiteral: ()) {
-        
-        self.rawValue = 0
-    }
-}
-
-
-// MARK: - CloudStorage
-
-/**
- The `CloudStorage` represents `StorageInterface`s that are synchronized from a cloud-based store.
- */
-public protocol CloudStorage: StorageInterface {
-    
-    /**
-     The `NSURL` that points to the store file
-     */
-    var cacheFileURL: URL { get }
-    
-    /**
-     Options that tell the `DataStack` how to setup the persistent store
-     */
-    var cloudStorageOptions: CloudStorageOptions { get }
-    
-    /**
-     The options dictionary for the specified `CloudStorageOptions`
-     */
-    func dictionary(forOptions options: CloudStorageOptions) -> [AnyHashable: Any]?
-    
-    /**
-     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. (Cloud stores for example, can set the NSPersistentStoreRemoveUbiquitousMetadataOption option before deleting)
-     */
-    func cs_eraseStorageAndWait(soureModel: NSManagedObjectModel) throws
-}
-
-
-// MARK: - Internal
-
-extension CloudStorage {
-    
-    internal func matchesPersistentStore(_ persistentStore: NSPersistentStore) -> Bool {
-        
-        guard persistentStore.type == Self.storeType
-            && persistentStore.configurationName == (self.configuration ?? DataStack.defaultConfigurationName) else {
-                
-                return false
-        }
-        guard persistentStore.url == self.cacheFileURL else {
-            
-            return false
-        }
-        guard let persistentStoreOptions = persistentStore.options,
-            let storeOptions = self.storeOptions else {
-                
-                return persistentStore.options == nil && self.storeOptions == nil
-        }
-        return storeOptions.reduce(true) { (isMatch, tuple) in
-            
-            let (key, value) = tuple
-            let obj1 = persistentStoreOptions[key] as? NSObject
-            let obj2 = value as? NSObject
-            return isMatch && (obj1 == obj2)
-        }
-    }
-}
diff --git a/Sources/diffableDataSource.CollectionView-AppKit.swift b/Sources/diffableDataSource.CollectionView-AppKit.swift
index 3c20837..4baafe2 100644
--- a/Sources/diffableDataSource.CollectionView-AppKit.swift
+++ b/Sources/diffableDataSource.CollectionView-AppKit.swift
@@ -59,6 +59,7 @@ extension DiffableDataSource {
      }
      ```
      `DiffableDataSource.CollectionView` fully handles the reload animations.
+     - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources     
      */
     open class CollectionView<O: DynamicObject>: NSObject, NSCollectionViewDataSource {
 
@@ -216,7 +217,8 @@ extension DiffableDataSource {
 extension NSCollectionView {
 
     // MARK: FilePrivate
-
+    
+    // Implementation based on https://github.com/ra1028/DiffableDataSources
     @nonobjc
     fileprivate func reload<C, O>(
         using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,

From e4e664d8ce7f0d0b5b4237987f26c5c471f4c5bf Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 21 Oct 2019 21:24:34 +0900
Subject: [PATCH 29/58] README update

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7405262..7024f6c 100644
--- a/README.md
+++ b/README.md
@@ -1398,15 +1398,15 @@ These are all implemented with `CustomDebugStringConvertible.debugDescription`,
 
 CoreStore provides type-safe wrappers for observing managed objects:
 
-| | *ListMonitor* | 🆕*ListPublisher* | *ObjectMonitor* | 🆕*ObjectPublisher* |
+| | 🆕[*ObjectPublisher*](#observe-a-single-objects-updates) | [*ObjectMonitor*](#observe-a-single-objects-per-property-updates) | 🆕[*ListPublisher*](#observe-a-diffable-list) | [*ListMonitor*](#observe-detailed-list-changes) |
 | --- | --- | --- | --- | --- |
-| *Number of objects* | N | N | 1 | 1 |
+| *Number of objects* | 1 | 1 | N | N |
 | *Allows multiple observers* | ✅ | ✅ | ✅ | ✅ |
-| *Emits fine-grained changes* | ✅ | ❌ | ✅ | ❌ |
+| *Emits fine-grained changes* | ❌ | ✅ | ❌ | ✅ |
 | *Emits DiffableDataSource snapshots* | ❌ | ✅ | ❌ | ✅ |
-| *Closure callback* | ❌ | ✅ | ❌ | ✅ |
-| *Delegate methods* | ✅ | ❌ | ✅ | ❌ |
-| *SwiftUI support* | ❌ | ✅ | ❌ | ✅ |
+| *Closure callback* | ✅ | ❌ | ✅ | ❌ |
+| *Delegate methods* | ❌ | ✅ | ❌ | ✅ |
+| *SwiftUI support* | ✅ | ❌ | ✅ | ❌ |
 
 ### Observe a single property
 To get notifications for single property changes in an object, there are two methods depending on the object's base class.
@@ -1839,8 +1839,8 @@ Once the version lock is set, any changes in the properties or to the model will
 # Installation
 - Requires:
     - iOS 10 SDK and above
-    - Swift 5.0 (Xcode 10+)
-    - For previous Swift versions: [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1)
+    - Swift 5.1 (Xcode 11+)
+    - For previous Swift versions: [Swift 3.2](https://github.com/JohnEstropia/CoreStore/tree/4.2.3), [Swift 4.2](https://github.com/JohnEstropia/CoreStore/tree/6.2.1), [Swift 5.0](https://github.com/JohnEstropia/CoreStore/tree/6.3.2)
 - Dependencies:
     - *None*
 - Other notes:

From 7a1600fac40143d88f03ba8237d288e9d19577d2 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 21 Oct 2019 21:34:45 +0900
Subject: [PATCH 30/58] README ok for now

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7024f6c..ab8f30b 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
 
 ### Features
 
+- 🆕**Backwards-portable DiffableDataSources implementation!** `UITableViews` and `UICollectionViews` now have a new ally: `ListPublisher`s provide diffable snapshots that make reloading animations very easy and very safe. Say goodbye to `UITableViews` and `UICollectionViews` reload errors!
 - **💎Tight design around Swift’s code elegance and type safety.** CoreStore fully utilizes Swift's community-driven language features.
 - **🚦Safer concurrency architecture.** CoreStore makes it hard to fall into common concurrency mistakes. The main `NSManagedObjectContext` is strictly read-only, while all updates are done through serial *transactions*. *(See [Saving and processing transactions](#saving-and-processing-transactions))*
 - **🔍Clean fetching and querying API.** Fetching objects is easy, but querying for raw aggregates (`min`, `max`, etc.) and raw property values is now just as convenient. *(See [Fetching and querying](#fetching-and-querying))*
@@ -87,9 +88,9 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
     - [Logging and error reporting](#logging-and-error-reporting)
     - [Observing changes and notifications](#observing-changes-and-notifications)
         - [Observe a single property](#observe-a-single-property)
-        - [Observe a single object's updates](#observe-a-single-objects-updates)
+        - 🆕[Observe a single object's updates](#observe-a-single-objects-updates)
         - [Observe a single object's per-property updates](#observe-a-single-objects-per-property-updates)
-        - [Observe a diffable list](#observe-a-diffable-list)
+        - 🆕[Observe a diffable list](#observe-a-diffable-list)
         - [Observe detailed list changes](#observe-detailed-list-changes)
     - [Objective-C support](#objective-c-support)
     - [Type-safe `CoreStoreObject`s](#type-safe-corestoreobjects)

From 1ddce5aa8dd3d2730cf4df4ae5ae0a22d1fde911 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 21 Oct 2019 22:39:54 +0900
Subject: [PATCH 31/58] Package.swift update

---
 CoreStore.podspec                             |  2 +-
 CoreStore.xcodeproj/project.pbxproj           | 72 +++++++++++++------
 .../xcschemes/CoreStore iOS.xcscheme          |  2 +-
 .../{BaseTests => }/BaseTestCase.swift        |  0
 .../BaseTestDataTestCase.swift                |  0
 .../{TestEntities => }/TestEntity1.swift      |  0
 .../{TestEntities => }/TestEntity2.swift      |  0
 Package.swift                                 |  8 ++-
 8 files changed, 61 insertions(+), 23 deletions(-)
 rename CoreStoreTests/{BaseTests => }/BaseTestCase.swift (100%)
 rename CoreStoreTests/{BaseTests => }/BaseTestDataTestCase.swift (100%)
 rename CoreStoreTests/{TestEntities => }/TestEntity1.swift (100%)
 rename CoreStoreTests/{TestEntities => }/TestEntity2.swift (100%)

diff --git a/CoreStore.podspec b/CoreStore.podspec
index 549d04e..2876fb0 100644
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
     s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine' }
 end
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index c767761..8227e2d 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -1248,7 +1248,7 @@
 		2F03A53C19C5C6DA005002A5 /* CoreStoreTests */ = {
 			isa = PBXGroup;
 			children = (
-				B5489F4A1CF5F743008B4978 /* BaseTests */,
+				B5AA37FE235DEBD700FFD4B9 /* BaseTests */,
 				B5DBE2DD1C9939E100B5CEFA /* BridgingTests.h */,
 				B5DBE2DE1C9939E100B5CEFA /* BridgingTests.m */,
 				B5D339B31E925C2B00C880DE /* DynamicModelTests.swift */,
@@ -1270,7 +1270,7 @@
 				B596BBAD1DD59FDB001DCDD9 /* ConvenienceTests.swift */,
 				B5DC47C91C93D9C800FA3BF3 /* StorageInterfaceTests.swift */,
 				2F03A53D19C5C6DA005002A5 /* Supporting Files */,
-				B5489F3C1CF5EEBC008B4978 /* TestEntities */,
+				B5AA37FF235DEBF500FFD4B9 /* TestEntities */,
 				B5489F451CF5F017008B4978 /* TransactionTests.swift */,
 				B525577F1D029D2500E51965 /* TweakTests.swift */,
 				B59A51822256C85E00CEF3C5 /* VersionLockTests.swift */,
@@ -1406,24 +1406,6 @@
 			name = StorageInterfaces;
 			sourceTree = "<group>";
 		};
-		B5489F3C1CF5EEBC008B4978 /* TestEntities */ = {
-			isa = PBXGroup;
-			children = (
-				B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */,
-				B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */,
-			);
-			path = TestEntities;
-			sourceTree = "<group>";
-		};
-		B5489F4A1CF5F743008B4978 /* BaseTests */ = {
-			isa = PBXGroup;
-			children = (
-				B5489F4B1CF5F743008B4978 /* BaseTestCase.swift */,
-				B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */,
-			);
-			path = BaseTests;
-			sourceTree = "<group>";
-		};
 		B5519A5D1CA20093002BEF78 /* Transactions */ = {
 			isa = PBXGroup;
 			children = (
@@ -1539,6 +1521,24 @@
 			name = Swift;
 			sourceTree = "<group>";
 		};
+		B5AA37FE235DEBD700FFD4B9 /* BaseTests */ = {
+			isa = PBXGroup;
+			children = (
+				B5489F4B1CF5F743008B4978 /* BaseTestCase.swift */,
+				B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */,
+			);
+			name = BaseTests;
+			sourceTree = "<group>";
+		};
+		B5AA37FF235DEBF500FFD4B9 /* TestEntities */ = {
+			isa = PBXGroup;
+			children = (
+				B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */,
+				B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */,
+			);
+			name = TestEntities;
+			sourceTree = "<group>";
+		};
 		B5DBE2CB1C99148100B5CEFA /* ObjectiveC */ = {
 			isa = PBXGroup;
 			children = (
@@ -3106,6 +3106,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 7.0.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3125,6 +3129,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 7.0.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3180,6 +3188,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3201,6 +3213,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3261,6 +3277,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3285,6 +3305,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3346,6 +3370,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3369,6 +3397,10 @@
 				GCC_NO_COMMON_BLOCKS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					Combine,
+				);
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
diff --git a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme
index 01ffb76..fdef8e3 100644
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore iOS.xcscheme	
@@ -71,7 +71,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/CoreStoreTests/BaseTests/BaseTestCase.swift b/CoreStoreTests/BaseTestCase.swift
similarity index 100%
rename from CoreStoreTests/BaseTests/BaseTestCase.swift
rename to CoreStoreTests/BaseTestCase.swift
diff --git a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift b/CoreStoreTests/BaseTestDataTestCase.swift
similarity index 100%
rename from CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
rename to CoreStoreTests/BaseTestDataTestCase.swift
diff --git a/CoreStoreTests/TestEntities/TestEntity1.swift b/CoreStoreTests/TestEntity1.swift
similarity index 100%
rename from CoreStoreTests/TestEntities/TestEntity1.swift
rename to CoreStoreTests/TestEntity1.swift
diff --git a/CoreStoreTests/TestEntities/TestEntity2.swift b/CoreStoreTests/TestEntity2.swift
similarity index 100%
rename from CoreStoreTests/TestEntities/TestEntity2.swift
rename to CoreStoreTests/TestEntity2.swift
diff --git a/Package.swift b/Package.swift
index f6ec31f..662641a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -41,6 +41,12 @@ let package = Package(
             dependencies: [],
             path: "Sources",
             exclude: ["CoreStoreBridge.h", "CoreStoreBridge.m"]
+        ),
+        .testTarget(
+            name: "CoreStoreTests",
+            dependencies: ["CoreStore"],
+            path: "CoreStoreTests"
         )
-    ]
+    ],
+    swiftLanguageVersions: [.v5_1]
 )

From 3d8bdf1cf3d49253337080a65490eb1429feddc8 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 22 Oct 2019 11:48:09 +0900
Subject: [PATCH 32/58] Remove references to OSAtomic to silence deprecation
 warnings

---
 .../Internals.DiffableDataUIDispatcher.swift  | 54 ++++++++++++++-----
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/Sources/Internals.DiffableDataUIDispatcher.swift b/Sources/Internals.DiffableDataUIDispatcher.swift
index 295e9aa..de370fb 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.swift
@@ -184,24 +184,15 @@ extension Internals {
 
             // MARK: FilePrivate
 
-            fileprivate init() {
-
-                self.executingCount.initialize(to: 0)
-            }
-
-            deinit {
-
-                self.executingCount.deinitialize(count: 1)
-                self.executingCount.deallocate()
-            }
+            fileprivate init() {}
 
             fileprivate func dispatch(_ action: @escaping () -> Void) {
 
-                let count = OSAtomicIncrement32(self.executingCount)
+                let count = self.executingCount.incrementAndGet()
                 if Thread.isMainThread && count == 1 {
 
                     action()
-                    OSAtomicDecrement32(executingCount)
+                    self.executingCount.decrement()
                 }
                 else {
 
@@ -212,7 +203,7 @@ extension Internals {
                             return
                         }
                         action()
-                        OSAtomicDecrement32(self.executingCount)
+                        self.executingCount.decrement()
                     }
                 }
             }
@@ -220,7 +211,42 @@ extension Internals {
 
             // MARK: Private
 
-            private let executingCount: UnsafeMutablePointer<Int32> = .allocate(capacity: 1)
+            private let executingCount: AtomicInt = .init()
+
+            
+            // MARK: - AtomicInt
+            
+            fileprivate class AtomicInt {
+                
+                // MARK: FilePrivate
+
+                fileprivate func incrementAndGet() -> Int {
+
+                    self.lock.wait()
+                    defer {
+                        
+                        self.lock.signal()
+                    }
+                    self.value += 1
+                    return self.value
+                }
+
+                fileprivate func decrement() {
+
+                    self.lock.wait()
+                    defer {
+                        
+                        self.lock.signal()
+                    }
+                    self.value -= 1
+                }
+
+                
+                // MARK: Private
+
+                private let lock = DispatchSemaphore(value: 1)
+                private var value = 0
+            }
         }
         
     }

From 80166a42bb2e9bbed0cd478e9e1cb634364c6a8b Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 22 Oct 2019 16:16:47 +0900
Subject: [PATCH 33/58] Unify generic labeling

---
 CoreStoreTests/WhereTests.swift               |   4 +-
 Sources/AsynchronousDataTransaction.swift     |   6 +-
 Sources/BaseDataTransaction+Importing.swift   |  48 ++--
 Sources/BaseDataTransaction+Querying.swift    |  40 +--
 Sources/BaseDataTransaction.swift             |  20 +-
 Sources/CSFrom.swift                          |   4 +-
 Sources/CSGroupBy.swift                       |   4 +-
 Sources/CSInto.swift                          |   4 +-
 Sources/CSOrderBy.swift                       |   4 +-
 Sources/CSSectionBy.swift                     |   2 +-
 Sources/CSSelect.swift                        |  10 +-
 Sources/CSWhere.swift                         |   4 +-
 Sources/CoreStore+Observing.swift             |  16 +-
 Sources/CoreStore+Querying.swift              |  36 +--
 Sources/DataStack+DataSources.swift           |  12 +-
 Sources/DataStack+Observing.swift             |  24 +-
 Sources/DataStack+Querying.swift              |  36 +--
 Sources/FetchChainBuilder.swift               |  12 +-
 Sources/FetchableSource.swift                 |  28 +-
 Sources/From+Querying.swift                   | 260 +++++++++---------
 Sources/From.swift                            |  26 +-
 Sources/GroupBy.swift                         |  32 ++-
 ...ls.CoreStoreFetchedResultsController.swift |   4 +-
 Sources/Into.swift                            |  20 +-
 ...FetchedResultsController+Convenience.swift |  20 +-
 .../NSManagedObjectContext+CoreStore.swift    |   6 +-
 Sources/NSManagedObjectContext+Querying.swift |  56 ++--
 Sources/OrderBy.swift                         |  58 ++--
 Sources/QueryChainBuilder.swift               |  14 +-
 Sources/QueryableSource.swift                 |   8 +-
 Sources/SectionBy.swift                       |  40 +--
 Sources/SectionMonitorBuilder.swift           |  12 +-
 Sources/Select.swift                          | 190 +++++++------
 Sources/SynchronousDataTransaction.swift      |   6 +-
 Sources/UnsafeDataTransaction+Observing.swift |  24 +-
 Sources/Where.Expression.swift                | 158 ++++++-----
 Sources/Where.swift                           | 102 +++----
 37 files changed, 711 insertions(+), 639 deletions(-)

diff --git a/CoreStoreTests/WhereTests.swift b/CoreStoreTests/WhereTests.swift
index da7aaaf..d9b2ed5 100644
--- a/CoreStoreTests/WhereTests.swift
+++ b/CoreStoreTests/WhereTests.swift
@@ -31,12 +31,12 @@ import CoreStore
 
 // MARK: - XCTAssertAllEqual
 
-private func XCTAssertAllEqual<D>(_ whereClauses: Where<D>...) {
+private func XCTAssertAllEqual<O>(_ whereClauses: Where<O>...) {
     
     XCTAssertAllEqual(whereClauses)
 }
 
-private func XCTAssertAllEqual<D>(_ whereClauses: [Where<D>]) {
+private func XCTAssertAllEqual<O>(_ whereClauses: [Where<O>]) {
     
     for i in whereClauses.indices {
         
diff --git a/Sources/AsynchronousDataTransaction.swift b/Sources/AsynchronousDataTransaction.swift
index 002f566..874f098 100644
--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -66,7 +66,7 @@ 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<D>(_ into: Into<D>) -> D {
+    public override func create<O>(_ into: Into<O>) -> O {
         
         Internals.assert(
             !self.isCommitted,
@@ -82,7 +82,7 @@ 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<D: DynamicObject>(_ object: D?) -> D? {
+    public override func edit<O: DynamicObject>(_ object: O?) -> O? {
         
         Internals.assert(
             !self.isCommitted,
@@ -99,7 +99,7 @@ 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<D>(_ into: Into<D>, _ objectID: NSManagedObjectID) -> D? {
+    public override func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
         
         Internals.assert(
             !self.isCommitted,
diff --git a/Sources/BaseDataTransaction+Importing.swift b/Sources/BaseDataTransaction+Importing.swift
index c18e78f..3d6e742 100644
--- a/Sources/BaseDataTransaction+Importing.swift
+++ b/Sources/BaseDataTransaction+Importing.swift
@@ -39,9 +39,9 @@ extension BaseDataTransaction {
      - throws: an `Error` thrown from any of the `ImportableObject` methods
      - returns: the created `ImportableObject` instance, or `nil` if the import was ignored
      */
-    public func importObject<D: ImportableObject>(
-        _ into: Into<D>,
-        source: D.ImportSource) throws -> D? {
+    public func importObject<O: ImportableObject>(
+        _ into: Into<O>,
+        source: O.ImportSource) throws -> O? {
             
             Internals.assert(
                 self.isRunningInAllowedQueue(),
@@ -65,13 +65,13 @@ extension BaseDataTransaction {
     /**
      Updates an existing `ImportableObject` by importing values from the specified import source.
      
-     - parameter object: the `NSManagedObject` to update
+     - parameter object: the `ImportableObject` to update
      - parameter source: the object to import values from
      - throws: an `Error` thrown from any of the `ImportableObject` methods
      */
-    public func importObject<D: ImportableObject>(
-        _ object: D,
-        source: D.ImportSource) throws {
+    public func importObject<O: ImportableObject>(
+        _ object: O,
+        source: O.ImportSource) throws {
             
             Internals.assert(
                 self.isRunningInAllowedQueue(),
@@ -97,9 +97,9 @@ extension BaseDataTransaction {
      - throws: an `Error` thrown from any of the `ImportableObject` methods
      - returns: the array of created `ImportableObject` instances
      */
-    public func importObjects<D: ImportableObject, S: Sequence>(
-        _ into: Into<D>,
-        sourceArray: S) throws -> [D] where S.Iterator.Element == D.ImportSource {
+    public func importObjects<O: ImportableObject, S: Sequence>(
+        _ into: Into<O>,
+        sourceArray: S) throws -> [O] where S.Iterator.Element == O.ImportSource {
             
             Internals.assert(
                 self.isRunningInAllowedQueue(),
@@ -108,7 +108,7 @@ extension BaseDataTransaction {
             
             return try autoreleasepool {
                 
-                return try sourceArray.compactMap { (source) -> D? in
+                return try sourceArray.compactMap { (source) -> O? in
                   
                     let entityType = into.entityClass 
                     guard entityType.shouldInsert(from: source, in: self) else {
@@ -133,9 +133,9 @@ extension BaseDataTransaction {
      - throws: an `Error` thrown from any of the `ImportableUniqueObject` methods
      - returns: the created/updated `ImportableUniqueObject` instance, or `nil` if the import was ignored
      */
-    public func importUniqueObject<D: ImportableUniqueObject>(
-        _ into: Into<D>,
-        source: D.ImportSource) throws -> D? {
+    public func importUniqueObject<O: ImportableUniqueObject>(
+        _ into: Into<O>,
+        source: O.ImportSource) throws -> O? {
             
             Internals.assert(
                 self.isRunningInAllowedQueue(),
@@ -151,7 +151,7 @@ extension BaseDataTransaction {
                     return nil
                 }
                 
-                if let object = try self.fetchOne(From(entityType), Where<D>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
+                if let object = try self.fetchOne(From(entityType), Where<O>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                     
                     guard entityType.shouldUpdate(from: source, in: self) else {
                         
@@ -185,10 +185,10 @@ extension BaseDataTransaction {
      - throws: an `Error` thrown from any of the `ImportableUniqueObject` methods
      - returns: the array of created/updated `ImportableUniqueObject` instances
      */
-    public func importUniqueObjects<D: ImportableUniqueObject, S: Sequence>(
-        _ into: Into<D>,
+    public func importUniqueObjects<O: ImportableUniqueObject, S: Sequence>(
+        _ into: Into<O>,
         sourceArray: S,
-        preProcess: @escaping (_ mapping: [D.UniqueIDType: D.ImportSource]) throws -> [D.UniqueIDType: D.ImportSource] = { $0 }) throws -> [D] where S.Iterator.Element == D.ImportSource {
+        preProcess: @escaping (_ mapping: [O.UniqueIDType: O.ImportSource]) throws -> [O.UniqueIDType: O.ImportSource] = { $0 }) throws -> [O] where S.Iterator.Element == O.ImportSource {
             
             Internals.assert(
                 self.isRunningInAllowedQueue(),
@@ -198,10 +198,10 @@ extension BaseDataTransaction {
             return try autoreleasepool {
               
                 let entityType = into.entityClass 
-                var importSourceByID = Dictionary<D.UniqueIDType, D.ImportSource>()
+                var importSourceByID = Dictionary<O.UniqueIDType, O.ImportSource>()
                 let sortedIDs = try autoreleasepool {
                   
-                    return try sourceArray.compactMap { (source) -> D.UniqueIDType? in
+                    return try sourceArray.compactMap { (source) -> O.UniqueIDType? in
                         
                         guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
                             
@@ -214,13 +214,13 @@ extension BaseDataTransaction {
                 
                 importSourceByID = try autoreleasepool { try preProcess(importSourceByID) }
 
-                var existingObjectsByID = Dictionary<D.UniqueIDType, D>()
+                var existingObjectsByID = Dictionary<O.UniqueIDType, O>()
                 try self
-                    .fetchAll(From(entityType), Where<D>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
+                    .fetchAll(From(entityType), Where<O>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
                     .forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
               
-                var processedObjectIDs = Set<D.UniqueIDType>()
-                var result = [D]()
+                var processedObjectIDs = Set<O.UniqueIDType>()
+                var result = [O]()
               
                 for objectID in sortedIDs where !processedObjectIDs.contains(objectID) {
                     
diff --git a/Sources/BaseDataTransaction+Querying.swift b/Sources/BaseDataTransaction+Querying.swift
index 7485e76..7345acf 100644
--- a/Sources/BaseDataTransaction+Querying.swift
+++ b/Sources/BaseDataTransaction+Querying.swift
@@ -39,7 +39,7 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - returns: the number of `DynamicObject`s deleted
      */
     @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: DeleteClause...) throws -> Int {
+    public func deleteAll<O>(_ from: From<O>, _ deleteClauses: DeleteClause...) throws -> Int {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -56,7 +56,7 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
      - returns: the number of `DynamicObject`s deleted
      */
     @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: [DeleteClause]) throws -> Int {
+    public func deleteAll<O>(_ from: From<O>, _ deleteClauses: [DeleteClause]) throws -> Int {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -93,7 +93,7 @@ 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<D: DynamicObject>(_ object: D) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
         
         return self.context.fetchExisting(object)
     }
@@ -104,7 +104,7 @@ 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<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
         
         return self.context.fetchExisting(objectID)
     }
@@ -115,7 +115,7 @@ 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<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
         
         return self.context.fetchExisting(objects)
     }
@@ -126,7 +126,7 @@ 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<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] 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,7 +139,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -156,7 +156,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -195,7 +195,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -212,7 +212,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -251,7 +251,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -268,7 +268,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -307,7 +307,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -324,7 +324,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -363,7 +363,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -380,7 +380,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -425,7 +425,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -445,7 +445,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -489,7 +489,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -509,7 +509,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
diff --git a/Sources/BaseDataTransaction.swift b/Sources/BaseDataTransaction.swift
index 08879d8..59fe52f 100644
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -50,7 +50,7 @@ public /*abstract*/ class 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 func create<D>(_ into: Into<D>) -> D {
+    public func create<O>(_ into: Into<O>) -> O {
         
         let entityClass = into.entityClass
         Internals.assert(
@@ -121,7 +121,7 @@ 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<D: DynamicObject>(_ object: D?) -> D? {
+    public func edit<O: DynamicObject>(_ object: O?) -> O? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -141,7 +141,7 @@ 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<D>(_ into: Into<D>, _ objectID: NSManagedObjectID) -> D? {
+    public func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -227,7 +227,7 @@ public /*abstract*/ class BaseDataTransaction {
      - parameter object: the `DynamicObject` instance
      - returns: `true` if the object has any property values changed.
      */
-    public func objectHasPersistentChangedValues<D: DynamicObject>(_ object: D) -> Bool {
+    public func objectHasPersistentChangedValues<O: DynamicObject>(_ object: O) -> Bool {
 
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -246,7 +246,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
+    public func insertedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -283,7 +283,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
+    public func insertedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -302,7 +302,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
+    public func updatedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -339,7 +339,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
+    public func updatedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -358,7 +358,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
+    public func deletedObjects<O: DynamicObject>(_ entity: O.Type) -> Set<O> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
@@ -396,7 +396,7 @@ 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<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
+    public func deletedObjectIDs<O: DynamicObject>(_ entity: O.Type) -> Set<NSManagedObjectID> {
         
         Internals.assert(
             self.isRunningInAllowedQueue(),
diff --git a/Sources/CSFrom.swift b/Sources/CSFrom.swift
index ab42aa8..ced12dd 100644
--- a/Sources/CSFrom.swift
+++ b/Sources/CSFrom.swift
@@ -145,7 +145,7 @@ public final class CSFrom: NSObject {
     
     public let bridgeToSwift: From<NSManagedObject>
     
-    public init<D: NSManagedObject>(_ swiftValue: From<D>) {
+    public init<O: NSManagedObject>(_ swiftValue: From<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -155,7 +155,7 @@ public final class CSFrom: NSObject {
 
 // MARK: - From
 
-extension From where D: NSManagedObject {
+extension From where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CSGroupBy.swift b/Sources/CSGroupBy.swift
index 73c19dc..9a7cff9 100644
--- a/Sources/CSGroupBy.swift
+++ b/Sources/CSGroupBy.swift
@@ -104,7 +104,7 @@ public final class CSGroupBy: NSObject, CSQueryClause {
     
     public let bridgeToSwift: GroupBy<NSManagedObject>
     
-    public init<D: NSManagedObject>(_ swiftValue: GroupBy<D>) {
+    public init<O: NSManagedObject>(_ swiftValue: GroupBy<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -114,7 +114,7 @@ public final class CSGroupBy: NSObject, CSQueryClause {
 
 // MARK: - GroupBy
 
-extension GroupBy where D: NSManagedObject {
+extension GroupBy where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CSInto.swift b/Sources/CSInto.swift
index 9c0203b..a49e602 100644
--- a/Sources/CSInto.swift
+++ b/Sources/CSInto.swift
@@ -112,7 +112,7 @@ public final class CSInto: NSObject {
     
     public let bridgeToSwift: Into<NSManagedObject>
     
-    public required init<D: NSManagedObject>(_ swiftValue: Into<D>) {
+    public required init<O: NSManagedObject>(_ swiftValue: Into<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -122,7 +122,7 @@ public final class CSInto: NSObject {
 
 // MARK: - Into
 
-extension Into where D: NSManagedObject {
+extension Into where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CSOrderBy.swift b/Sources/CSOrderBy.swift
index cb094f8..7355596 100644
--- a/Sources/CSOrderBy.swift
+++ b/Sources/CSOrderBy.swift
@@ -112,7 +112,7 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl
     
     public let bridgeToSwift: OrderBy<NSManagedObject>
     
-    public init<D: NSManagedObject>(_ swiftValue: OrderBy<D>) {
+    public init<O: NSManagedObject>(_ swiftValue: OrderBy<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -122,7 +122,7 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl
 
 // MARK: - OrderBy
 
-extension OrderBy where D: NSManagedObject {
+extension OrderBy where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CSSectionBy.swift b/Sources/CSSectionBy.swift
index c94cd2a..0f2751a 100644
--- a/Sources/CSSectionBy.swift
+++ b/Sources/CSSectionBy.swift
@@ -76,7 +76,7 @@ public final class CSSectionBy: NSObject {
     
     public let bridgeToSwift: SectionBy<NSManagedObject>
     
-    public init<D>(_ swiftValue: SectionBy<D>) {
+    public init<O>(_ swiftValue: SectionBy<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
diff --git a/Sources/CSSelect.swift b/Sources/CSSelect.swift
index a73fc41..d41371f 100644
--- a/Sources/CSSelect.swift
+++ b/Sources/CSSelect.swift
@@ -177,7 +177,7 @@ public final class CSSelectTerm: NSObject {
     
     public let bridgeToSwift: SelectTerm<NSManagedObject>
     
-    public init<D: NSManagedObject>(_ swiftValue: SelectTerm<D>) {
+    public init<O: NSManagedObject>(_ swiftValue: SelectTerm<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -187,7 +187,7 @@ public final class CSSelectTerm: NSObject {
 
 // MARK: - SelectTerm
 
-extension SelectTerm where D: NSManagedObject {
+extension SelectTerm where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
@@ -383,7 +383,7 @@ public final class CSSelect: NSObject {
     
     // MARK: CoreStoreObjectiveCType
     
-    public init<D: NSManagedObject, T: QueryableAttributeType>(_ swiftValue: Select<D, T>) {
+    public init<O: NSManagedObject, T: QueryableAttributeType>(_ swiftValue: Select<O, T>) {
         
         self.attributeType = T.cs_rawAttributeType
         self.selectTerms = swiftValue.selectTerms.map({ $0.downcast() })
@@ -391,7 +391,7 @@ public final class CSSelect: NSObject {
         super.init()
     }
     
-    public init<D: NSManagedObject, T>(_ swiftValue: Select<D, T>) {
+    public init<O: NSManagedObject, T>(_ swiftValue: Select<O, T>) {
         
         self.attributeType = .undefinedAttributeType
         self.selectTerms = swiftValue.selectTerms.map({ $0.downcast() })
@@ -502,7 +502,7 @@ public final class CSSelect: NSObject {
 
 // MARK: - Select
 
-extension Select where D: NSManagedObject {
+extension Select where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CSWhere.swift b/Sources/CSWhere.swift
index 7cb0f7c..b77aeeb 100644
--- a/Sources/CSWhere.swift
+++ b/Sources/CSWhere.swift
@@ -151,7 +151,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
     
     public let bridgeToSwift: Where<NSManagedObject>
     
-    public init<D: NSManagedObject>(_ swiftValue: Where<D>) {
+    public init<O: NSManagedObject>(_ swiftValue: Where<O>) {
         
         self.bridgeToSwift = swiftValue.downcast()
         super.init()
@@ -161,7 +161,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
 
 // MARK: - Where
 
-extension Where where D: NSManagedObject {
+extension Where where O: NSManagedObject {
     
     // MARK: CoreStoreSwiftType
     
diff --git a/Sources/CoreStore+Observing.swift b/Sources/CoreStore+Observing.swift
index 94fd5b7..0e0ca9c 100644
--- a/Sources/CoreStore+Observing.swift
+++ b/Sources/CoreStore+Observing.swift
@@ -51,7 +51,7 @@ extension CoreStore {
      - 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 static func monitorList<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public static func monitorList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return CoreStoreDefaults.dataStack.monitorList(from, fetchClauses)
     }
@@ -63,7 +63,7 @@ extension CoreStore {
      - 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 static func monitorList<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public static func monitorList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         return CoreStoreDefaults.dataStack.monitorList(from, fetchClauses)
     }
@@ -92,7 +92,7 @@ extension CoreStore {
      - 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 static func monitorList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
+    public static func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: FetchClause...) {
         
         CoreStoreDefaults.dataStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
     }
@@ -104,7 +104,7 @@ extension CoreStore {
      - 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 static func monitorList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
+    public static func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: [FetchClause])  {
         
         CoreStoreDefaults.dataStack.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
     }
@@ -142,7 +142,7 @@ extension CoreStore {
      - 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 static func monitorSectionedList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public static func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return CoreStoreDefaults.dataStack.monitorSectionedList(from, sectionBy, fetchClauses)
     }
@@ -155,7 +155,7 @@ extension CoreStore {
      - 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 static func monitorSectionedList<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public static func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         return CoreStoreDefaults.dataStack.monitorSectionedList(from, sectionBy, fetchClauses)
     }
@@ -190,7 +190,7 @@ extension CoreStore {
      - 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 static func monitorSectionedList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
+    public static func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) {
         
         CoreStoreDefaults.dataStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
     }
@@ -203,7 +203,7 @@ extension CoreStore {
      - 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 static func monitorSectionedList<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
+    public static func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) {
         
         CoreStoreDefaults.dataStack.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
     }
diff --git a/Sources/CoreStore+Querying.swift b/Sources/CoreStore+Querying.swift
index 9ccb96e..bbb098a 100644
--- a/Sources/CoreStore+Querying.swift
+++ b/Sources/CoreStore+Querying.swift
@@ -38,7 +38,7 @@ extension CoreStore {
      - 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 static func fetchExisting<D: DynamicObject>(_ object: D) -> D? {
+    public static func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
         
         return CoreStoreDefaults.dataStack.fetchExisting(object)
     }
@@ -49,7 +49,7 @@ extension CoreStore {
      - parameter objectID: the `NSManagedObjectID` for the object
      - returns: the `DynamicObject` instance if the object exists in the `DataStack`, or `nil` if not found.
      */
-    public static func fetchExisting<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D? {
+    public static func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
         
         return CoreStoreDefaults.dataStack.fetchExisting(objectID)
     }
@@ -60,7 +60,7 @@ extension CoreStore {
      - parameter objects: an array of `DynamicObject`s created/fetched outside the `DataStack`
      - returns: the `DynamicObject` array for objects that exists in the `DataStack`
      */
-    public static func fetchExisting<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D {
+    public static func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
         
         return CoreStoreDefaults.dataStack.fetchExisting(objects)
     }
@@ -71,7 +71,7 @@ extension CoreStore {
      - parameter objectIDs: the `NSManagedObjectID` array for the objects
      - returns: the `DynamicObject` array for objects that exists in the `DataStack`
      */
-    public static func fetchExisting<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] where S.Iterator.Element == NSManagedObjectID {
+    public static func fetchExisting<O: DynamicObject, S: Sequence>(_ objectIDs: S) -> [O] where S.Iterator.Element == NSManagedObjectID {
         
         return CoreStoreDefaults.dataStack.fetchExisting(objectIDs)
     }
@@ -84,7 +84,7 @@ extension CoreStore {
      - 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 static func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
+    public static func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
         
         return try CoreStoreDefaults.dataStack.fetchOne(from, fetchClauses)
     }
@@ -97,7 +97,7 @@ extension CoreStore {
      - 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 static func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
+    public static func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
         
         return try CoreStoreDefaults.dataStack.fetchOne(from, fetchClauses)
     }
@@ -128,7 +128,7 @@ extension CoreStore {
      - 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 static func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
+    public static func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
         
         return try CoreStoreDefaults.dataStack.fetchAll(from, fetchClauses)
     }
@@ -141,7 +141,7 @@ extension CoreStore {
      - 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 static func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
+    public static func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
         
         return try CoreStoreDefaults.dataStack.fetchAll(from, fetchClauses)
     }
@@ -172,7 +172,7 @@ extension CoreStore {
      - 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 static func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
+    public static func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
         
         return try CoreStoreDefaults.dataStack.fetchCount(from, fetchClauses)
     }
@@ -185,7 +185,7 @@ extension CoreStore {
      - 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 static func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public static func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
         
         return try CoreStoreDefaults.dataStack.fetchCount(from, fetchClauses)
     }
@@ -216,7 +216,7 @@ extension CoreStore {
      - 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 static func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public static func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
         return try CoreStoreDefaults.dataStack.fetchObjectID(from, fetchClauses)
     }
@@ -229,7 +229,7 @@ extension CoreStore {
      - 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 static func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public static func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
         return try CoreStoreDefaults.dataStack.fetchObjectID(from, fetchClauses)
     }
@@ -260,7 +260,7 @@ extension CoreStore {
      - 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 static func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public static func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
         return try CoreStoreDefaults.dataStack.fetchObjectIDs(from, fetchClauses)
     }
@@ -273,7 +273,7 @@ extension CoreStore {
      - 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 static func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public static func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
         
         return try CoreStoreDefaults.dataStack.fetchObjectIDs(from, fetchClauses)
     }
@@ -307,7 +307,7 @@ extension CoreStore {
      - 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 static func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public static func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
         
         return try CoreStoreDefaults.dataStack.queryValue(from, selectClause, queryClauses)
     }
@@ -323,7 +323,7 @@ extension CoreStore {
      - 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 static func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public static func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
         return try CoreStoreDefaults.dataStack.queryValue(from, selectClause, queryClauses)
     }
@@ -359,7 +359,7 @@ extension CoreStore {
      - 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 static func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public static func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
         return try CoreStoreDefaults.dataStack.queryAttributes(from, selectClause, queryClauses)
     }
@@ -375,7 +375,7 @@ extension CoreStore {
      - 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 static func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public static func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
         return try CoreStoreDefaults.dataStack.queryAttributes(from, selectClause, queryClauses)
     }
diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 1b1ad43..cb3684a 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -51,7 +51,7 @@ 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 listPublisher<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
+    public func listPublisher<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
 
         return self.listPublisher(from, fetchClauses)
     }
@@ -63,7 +63,7 @@ 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 listPublisher<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
+    public func listPublisher<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
 
         return ListPublisher(
             dataStack: self,
@@ -75,7 +75,7 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
@@ -115,7 +115,7 @@ 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 listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListPublisher<D> {
+    public func listPublisher<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
 
         return self.listPublisher(
             from,
@@ -132,7 +132,7 @@ 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 listPublisher<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListPublisher<D> {
+    public func listPublisher<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
 
         return ListPublisher(
             dataStack: self,
@@ -144,7 +144,7 @@ extension DataStack {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListPublisher<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListPublisher<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
diff --git a/Sources/DataStack+Observing.swift b/Sources/DataStack+Observing.swift
index 78b4069..8c7adba 100644
--- a/Sources/DataStack+Observing.swift
+++ b/Sources/DataStack+Observing.swift
@@ -54,7 +54,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public func monitorList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return self.monitorList(from, fetchClauses)
     }
@@ -66,7 +66,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public func monitorList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         Internals.assert(
             Thread.isMainThread,
@@ -82,7 +82,7 @@ extension DataStack {
                 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListMonitor<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListMonitor<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
@@ -115,7 +115,7 @@ 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
+    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: FetchClause...) {
         
         self.monitorList(
             createAsynchronously: createAsynchronously,
@@ -131,7 +131,7 @@ 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
+    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: [FetchClause])  {
         
         Internals.assert(
             Thread.isMainThread,
@@ -147,7 +147,7 @@ extension DataStack {
                 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListMonitor<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListMonitor<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             },
             createAsynchronously: createAsynchronously
@@ -187,7 +187,7 @@ 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<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return self.monitorSectionedList(
             from,
@@ -204,7 +204,7 @@ 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<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         Internals.assert(
             Thread.isMainThread,
@@ -221,7 +221,7 @@ extension DataStack {
                 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListMonitor<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListMonitor<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
@@ -257,7 +257,7 @@ 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
+    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) {
         
         self.monitorSectionedList(
             createAsynchronously: createAsynchronously,
@@ -275,7 +275,7 @@ 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
+    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) {
         
         Internals.assert(
             Thread.isMainThread,
@@ -292,7 +292,7 @@ extension DataStack {
                 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(ListMonitor<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(ListMonitor<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             },
             createAsynchronously: createAsynchronously
diff --git a/Sources/DataStack+Querying.swift b/Sources/DataStack+Querying.swift
index 3a46102..e885ee3 100644
--- a/Sources/DataStack+Querying.swift
+++ b/Sources/DataStack+Querying.swift
@@ -39,7 +39,7 @@ 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<D: DynamicObject>(_ object: D) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
         
         return self.mainContext.fetchExisting(object)
     }
@@ -50,7 +50,7 @@ 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<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
         
         return self.mainContext.fetchExisting(objectID)
     }
@@ -61,7 +61,7 @@ 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<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D {
+    public func fetchExisting<O: DynamicObject, S: Sequence>(_ objects: S) -> [O] where S.Iterator.Element == O {
         
         return self.mainContext.fetchExisting(objects)
     }
@@ -72,7 +72,7 @@ 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<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] 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,7 +85,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -102,7 +102,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -141,7 +141,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
         
         Internals.assert(
             Thread.isMainThread,
@@ -158,7 +158,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
         
         Internals.assert(
             Thread.isMainThread,
@@ -197,7 +197,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
         
         Internals.assert(
             Thread.isMainThread,
@@ -214,7 +214,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
         
         Internals.assert(
             Thread.isMainThread,
@@ -253,7 +253,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -270,7 +270,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -309,7 +309,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
         Internals.assert(
             Thread.isMainThread,
@@ -326,7 +326,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
         
         Internals.assert(
             Thread.isMainThread,
@@ -371,7 +371,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -391,7 +391,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
         Internals.assert(
             Thread.isMainThread,
@@ -435,7 +435,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
         Internals.assert(
             Thread.isMainThread,
@@ -455,7 +455,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
         Internals.assert(
             Thread.isMainThread,
diff --git a/Sources/FetchChainBuilder.swift b/Sources/FetchChainBuilder.swift
index 9c30ae2..1071e08 100644
--- a/Sources/FetchChainBuilder.swift
+++ b/Sources/FetchChainBuilder.swift
@@ -39,14 +39,20 @@ import CoreData
  )
  ```
  */
-public struct FetchChainBuilder<D: DynamicObject>: FetchChainableBuilderType {
+public struct FetchChainBuilder<O: DynamicObject>: FetchChainableBuilderType {
     
     // MARK: FetchChainableBuilderType
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
-    public var from: From<D>
+    public var from: From<O>
     public var fetchClauses: [FetchClause] = []
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
diff --git a/Sources/FetchableSource.swift b/Sources/FetchableSource.swift
index c2cb82c..1c9c60c 100644
--- a/Sources/FetchableSource.swift
+++ b/Sources/FetchableSource.swift
@@ -40,7 +40,7 @@ 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<D: DynamicObject>(_ object: D) -> D?
+    func fetchExisting<O: DynamicObject>(_ object: O) -> O?
     
     /**
      Fetches the `DynamicObject` instance in the `FetchableSource`'s context from an `NSManagedObjectID`.
@@ -48,7 +48,7 @@ public protocol FetchableSource: AnyObject {
      - 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<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D?
+    func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O?
     
     /**
      Fetches the `DynamicObject` instances in the `FetchableSource`'s context from references created from another managed object context.
@@ -56,7 +56,7 @@ public protocol FetchableSource: AnyObject {
      - 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<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D
+    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 +64,7 @@ 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<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] 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 +74,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D?
+    func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O?
 
     /**
      Fetches the first `DynamicObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -84,7 +84,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D?
+    func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O?
     
     /**
      Fetches the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
@@ -109,7 +109,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D]
+    func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O]
 
     /**
      Fetches all `DynamicObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -119,7 +119,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D]
+    func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O]
     
     /**
      Fetches all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
@@ -144,7 +144,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int
+    func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int
 
     /**
      Fetches the number of `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -154,7 +154,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int
+    func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int
     
     /**
      Fetches the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
@@ -179,7 +179,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID?
+    func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID?
 
     /**
      Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -189,7 +189,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID?
+    func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID?
     
     /**
      Fetches the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType` built from a chain of clauses.
@@ -214,7 +214,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID]
+    func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID]
 
     /**
      Fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
@@ -224,7 +224,7 @@ 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID]
+    func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID]
     
     /**
      Fetches the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType` built from a chain of clauses.
diff --git a/Sources/From+Querying.swift b/Sources/From+Querying.swift
index ad89e3c..82ee3e1 100644
--- a/Sources/From+Querying.swift
+++ b/Sources/From+Querying.swift
@@ -37,7 +37,7 @@ extension From {
      - parameter clause: the `Where` clause to create a `FetchChainBuilder` with
      - returns: a `FetchChainBuilder` that starts with the specified `Where` clause
      */
-    public func `where`(_ clause: Where<D>) -> FetchChainBuilder<D> {
+    public func `where`(_ clause: Where<O>) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: clause)
     }
@@ -49,9 +49,9 @@ extension From {
      - parameter args: the arguments for `format`
      - returns: a `FetchChainBuilder` with a predicate using the specified string format and arguments
      */
-    public func `where`(format: String, _ args: Any...) -> FetchChainBuilder<D> {
+    public func `where`(format: String, _ args: Any...) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: Where<D>(format, argumentArray: args))
+        return self.fetchChain(appending: Where<O>(format, argumentArray: args))
     }
     
     /**
@@ -61,9 +61,9 @@ extension From {
      - parameter argumentArray: the arguments for `format`
      - returns: a `FetchChainBuilder` with a predicate using the specified string format and arguments
      */
-    public func `where`(format: String, argumentArray: [Any]?) -> FetchChainBuilder<D> {
+    public func `where`(format: String, argumentArray: [Any]?) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: Where<D>(format, argumentArray: argumentArray))
+        return self.fetchChain(appending: Where<O>(format, argumentArray: argumentArray))
     }
 
     /**
@@ -72,7 +72,7 @@ extension From {
      - parameter clause: the `OrderBy` clause to create a `FetchChainBuilder` with
      - returns: a `FetchChainBuilder` that starts with the specified `OrderBy` clause
      */
-    public func orderBy(_ clause: OrderBy<D>) -> FetchChainBuilder<D> {
+    public func orderBy(_ clause: OrderBy<O>) -> FetchChainBuilder<O> {
 
         return self.fetchChain(appending: clause)
     }
@@ -84,9 +84,9 @@ extension From {
      - parameter sortKeys: a series of other `SortKey`s
      - returns: a `FetchChainBuilder` with a series of `SortKey`s
      */
-    public func orderBy(_ sortKey: OrderBy<D>.SortKey, _ sortKeys: OrderBy<D>.SortKey...) -> FetchChainBuilder<D> {
+    public func orderBy(_ sortKey: OrderBy<O>.SortKey, _ sortKeys: OrderBy<O>.SortKey...) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: OrderBy<D>([sortKey] + sortKeys))
+        return self.fetchChain(appending: OrderBy<O>([sortKey] + sortKeys))
     }
 
     /**
@@ -95,9 +95,9 @@ extension From {
      - parameter sortKeys: a series of `SortKey`s
      - returns: a `FetchChainBuilder` with a series of `SortKey`s
      */
-    public func orderBy(_ sortKeys: [OrderBy<D>.SortKey]) -> FetchChainBuilder<D> {
+    public func orderBy(_ sortKeys: [OrderBy<O>.SortKey]) -> FetchChainBuilder<O> {
 
-        return self.fetchChain(appending: OrderBy<D>(sortKeys))
+        return self.fetchChain(appending: OrderBy<O>(sortKeys))
     }
     
     /**
@@ -106,7 +106,7 @@ extension From {
      - parameter fetchRequest: the block to customize the `NSFetchRequest`
      - returns: a `FetchChainBuilder` with closure where the `NSFetchRequest` may be configured
      */
-    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> FetchChainBuilder<D> {
+    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: Tweak(fetchRequest))
     }
@@ -117,7 +117,7 @@ extension From {
      - parameter clause: the `FetchClause` to add to the `FetchChainBuilder`
      - returns: a `FetchChainBuilder` containing the specified `FetchClause`
      */
-    public func appending(_ clause: FetchClause) -> FetchChainBuilder<D> {
+    public func appending(_ clause: FetchClause) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: clause)
     }
@@ -128,7 +128,7 @@ extension From {
      - parameter clauses: the `FetchClause`s to add to the `FetchChainBuilder`
      - returns: a `FetchChainBuilder` containing the specified `FetchClause`s
      */
-    public func appending<S: Sequence>(contentsOf clauses: S) -> FetchChainBuilder<D> where S.Element == FetchClause {
+    public func appending<S: Sequence>(contentsOf clauses: S) -> FetchChainBuilder<O> where S.Element == FetchClause {
         
         return self.fetchChain(appending: clauses)
     }
@@ -139,7 +139,7 @@ extension From {
      - parameter clause: the `Select` clause to create a `QueryChainBuilder` with
      - returns: a `QueryChainBuilder` that starts with the specified `Select` clause
      */
-    public func select<R>(_ clause: Select<D, R>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ clause: Select<O, R>) -> QueryChainBuilder<O, R> {
         
         return .init(
             from: self,
@@ -156,7 +156,7 @@ extension From {
      - parameter selectTerms: a series of `SelectTerm`s
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified `SelectTerm`s
      */
-    public func select<R>(_ resultType: R.Type, _ selectTerm: SelectTerm<D>, _ selectTerms: SelectTerm<D>...) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ resultType: R.Type, _ selectTerm: SelectTerm<O>, _ selectTerms: SelectTerm<O>...) -> QueryChainBuilder<O, R> {
         
         return self.select(resultType, [selectTerm] + selectTerms)
     }
@@ -168,7 +168,7 @@ extension From {
      - parameter selectTerms: a series of `SelectTerm`s
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified `SelectTerm`s
      */
-    public func select<R>(_ resultType: R.Type, _ selectTerms: [SelectTerm<D>]) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ resultType: R.Type, _ selectTerms: [SelectTerm<O>]) -> QueryChainBuilder<O, R> {
         
         return .init(
             from: self,
@@ -184,7 +184,7 @@ extension From {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy(_ clause: SectionBy<D>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy(_ clause: SectionBy<O>) -> SectionMonitorChainBuilder<O> {
         
         return .init(
             from: self,
@@ -200,7 +200,7 @@ extension From {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy(_ sectionKeyPath: KeyPathString) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy(_ sectionKeyPath: KeyPathString) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionBy(sectionKeyPath, { $0 })
     }
@@ -214,7 +214,7 @@ extension From {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy(_ sectionKeyPath: KeyPathString, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy(_ sectionKeyPath: KeyPathString, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
         return .init(
             from: self,
@@ -226,21 +226,21 @@ extension From {
     
     // MARK: Private
     
-    private func fetchChain(appending clause: FetchClause) -> FetchChainBuilder<D> {
+    private func fetchChain(appending clause: FetchClause) -> FetchChainBuilder<O> {
         
         return .init(from: self, fetchClauses: [clause])
     }
     
-    private func fetchChain<S: Sequence>(appending clauses: S) -> FetchChainBuilder<D> where S.Element == FetchClause {
+    private func fetchChain<S: Sequence>(appending clauses: S) -> FetchChainBuilder<O> where S.Element == FetchClause {
         
         return .init(from: self, fetchClauses: Array(clauses))
     }
 }
 
 
-// MARK: - From where D: NSManagedObject
+// MARK: - From where O: NSManagedObject
 
-extension From where D: NSManagedObject {
+extension From where O: NSManagedObject {
     
     /**
      Creates a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
@@ -248,9 +248,9 @@ extension From where D: NSManagedObject {
      - parameter keyPath: the keyPath to query the value for
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
      */
-    public func select<R>(_ keyPath: KeyPath<D, R>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ keyPath: KeyPath<O, R>) -> QueryChainBuilder<O, R> {
         
-        return self.select(R.self, [SelectTerm<D>.attribute(keyPath)])
+        return self.select(R.self, [SelectTerm<O>.attribute(keyPath)])
     }
     
     /**
@@ -260,7 +260,7 @@ extension From where D: NSManagedObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, T>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, T>) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionBy(sectionKeyPath._kvcKeyPathString!, { $0 })
     }
@@ -274,16 +274,16 @@ extension From where D: NSManagedObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, T>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, T>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionBy(sectionKeyPath._kvcKeyPathString!, sectionIndexTransformer)
     }
 }
 
 
-// MARK: - From where D: CoreStoreObject
+// MARK: - From where O: CoreStoreObject
 
-extension From where D: CoreStoreObject {
+extension From where O: CoreStoreObject {
     
     /**
      Creates a `FetchChainBuilder` that starts with the specified `Where` clause
@@ -291,12 +291,12 @@ extension From where D: CoreStoreObject {
      - parameter clause: a closure that returns a `Where` clause
      - returns: a `FetchChainBuilder` that starts with the specified `Where` clause
      */
-    public func `where`<T: AnyWhereClause>(_ clause: (D) -> T) -> FetchChainBuilder<D> {
+    public func `where`<T: AnyWhereClause>(_ clause: (O) -> T) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: clause(D.meta))
+        return self.fetchChain(appending: clause(O.meta))
     }
 
-    public func `where`(combinedByAnd clause: Where<D>, _ others: Where<D>...) -> FetchChainBuilder<D> {
+    public func `where`(combinedByAnd clause: Where<O>, _ others: Where<O>...) -> FetchChainBuilder<O> {
 
         return self.fetchChain(appending: ([clause] + others).combinedByAnd())
     }
@@ -307,9 +307,9 @@ extension From where D: CoreStoreObject {
      - parameter keyPath: the keyPath to query the value for
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
      */
-    public func select<R>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<R>>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<R>>) -> QueryChainBuilder<O, R> {
         
-        return self.select(R.self, [SelectTerm<D>.attribute(keyPath)])
+        return self.select(R.self, [SelectTerm<O>.attribute(keyPath)])
     }
     
     /**
@@ -318,9 +318,9 @@ extension From where D: CoreStoreObject {
      - parameter keyPath: the keyPath to query the value for
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
      */
-    public func select<R>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<R>>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<R>>) -> QueryChainBuilder<O, R> {
         
-        return self.select(R.self, [SelectTerm<D>.attribute(keyPath)])
+        return self.select(R.self, [SelectTerm<O>.attribute(keyPath)])
     }
     
     /**
@@ -329,9 +329,9 @@ extension From where D: CoreStoreObject {
      - parameter keyPath: the keyPath to query the value for
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
      */
-    public func select<R>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<R>>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<R>>) -> QueryChainBuilder<O, R> {
         
-        return self.select(R.self, [SelectTerm<D>.attribute(keyPath)])
+        return self.select(R.self, [SelectTerm<O>.attribute(keyPath)])
     }
     
     /**
@@ -340,9 +340,9 @@ extension From where D: CoreStoreObject {
      - parameter keyPath: the keyPath to query the value for
      - returns: a `QueryChainBuilder` that starts with a `Select` clause created from the specified key path
      */
-    public func select<R>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<R>>) -> QueryChainBuilder<D, R> {
+    public func select<R>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<R>>) -> QueryChainBuilder<O, R> {
         
-        return self.select(R.self, [SelectTerm<D>.attribute(keyPath)])
+        return self.select(R.self, [SelectTerm<O>.attribute(keyPath)])
     }
     
     /**
@@ -352,9 +352,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Required<T>>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 })
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, { $0 })
     }
     
     /**
@@ -364,9 +364,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Optional<T>>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 })
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, { $0 })
     }
     
     /**
@@ -376,9 +376,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Required<T>>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 })
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, { $0 })
     }
     
     /**
@@ -388,9 +388,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, { $0 })
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, { $0 })
     }
     
     /**
@@ -402,9 +402,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -416,9 +416,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -430,9 +430,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -444,9 +444,9 @@ extension From where D: CoreStoreObject {
      - returns: a `SectionMonitorChainBuilder` that is sectioned by the specified key path
      */
     @available(macOS 10.12, *)
-    public func sectionBy<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<D> {
+    public func sectionBy<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionBy(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        return self.sectionBy(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
 }
 
@@ -461,7 +461,7 @@ extension FetchChainBuilder {
      - parameter clause: a `Where` clause to add to the fetch builder
      - returns: a new `FetchChainBuilder` containing the `Where` clause
      */
-    public func `where`(_ clause: Where<D>) -> FetchChainBuilder<D> {
+    public func `where`(_ clause: Where<O>) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: clause)
     }
@@ -473,9 +473,9 @@ extension FetchChainBuilder {
      - parameter args: the arguments for `format`
      - returns: a new `FetchChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, _ args: Any...) -> FetchChainBuilder<D> {
+    public func `where`(format: String, _ args: Any...) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: Where<D>(format, argumentArray: args))
+        return self.fetchChain(appending: Where<O>(format, argumentArray: args))
     }
     
     /**
@@ -485,9 +485,9 @@ extension FetchChainBuilder {
      - parameter argumentArray: the arguments for `format`
      - returns: a new `FetchChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, argumentArray: [Any]?) -> FetchChainBuilder<D> {
+    public func `where`(format: String, argumentArray: [Any]?) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: Where<D>(format, argumentArray: argumentArray))
+        return self.fetchChain(appending: Where<O>(format, argumentArray: argumentArray))
     }
 
     /**
@@ -496,7 +496,7 @@ extension FetchChainBuilder {
      - parameter clause: the `OrderBy` clause to add
      - returns: a new `FetchChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ clause: OrderBy<D>) -> FetchChainBuilder<D> {
+    public func orderBy(_ clause: OrderBy<O>) -> FetchChainBuilder<O> {
 
         return self.fetchChain(appending: clause)
     }
@@ -508,9 +508,9 @@ extension FetchChainBuilder {
      - parameter sortKeys: a series of other `SortKey`s
      - returns: a new `FetchChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKey: OrderBy<D>.SortKey, _ sortKeys: OrderBy<D>.SortKey...) -> FetchChainBuilder<D> {
+    public func orderBy(_ sortKey: OrderBy<O>.SortKey, _ sortKeys: OrderBy<O>.SortKey...) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: OrderBy<D>([sortKey] + sortKeys))
+        return self.fetchChain(appending: OrderBy<O>([sortKey] + sortKeys))
     }
 
     /**
@@ -519,9 +519,9 @@ extension FetchChainBuilder {
      - parameter sortKeys: a series of `SortKey`s
      - returns: a new `FetchChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKeys: [OrderBy<D>.SortKey]) -> FetchChainBuilder<D> {
+    public func orderBy(_ sortKeys: [OrderBy<O>.SortKey]) -> FetchChainBuilder<O> {
 
-        return self.fetchChain(appending: OrderBy<D>(sortKeys))
+        return self.fetchChain(appending: OrderBy<O>(sortKeys))
     }
     
     /**
@@ -530,7 +530,7 @@ extension FetchChainBuilder {
      - parameter fetchRequest: the block to customize the `NSFetchRequest`
      - returns: a new `FetchChainBuilder` containing the `Tweak` clause
      */
-    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> FetchChainBuilder<D> {
+    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: Tweak(fetchRequest))
     }
@@ -541,7 +541,7 @@ extension FetchChainBuilder {
      - parameter clause: the `FetchClause` to add to the `FetchChainBuilder`
      - returns: a new `FetchChainBuilder` containing the `FetchClause`
      */
-    public func appending(_ clause: FetchClause) -> FetchChainBuilder<D> {
+    public func appending(_ clause: FetchClause) -> FetchChainBuilder<O> {
         
         return self.fetchChain(appending: clause)
     }
@@ -552,7 +552,7 @@ extension FetchChainBuilder {
      - parameter clauses: the `FetchClause`s to add to the `FetchChainBuilder`
      - returns: a new `FetchChainBuilder` containing the `FetchClause`s
      */
-    public func appending<S: Sequence>(contentsOf clauses: S) -> FetchChainBuilder<D> where S.Element == FetchClause {
+    public func appending<S: Sequence>(contentsOf clauses: S) -> FetchChainBuilder<O> where S.Element == FetchClause {
         
         return self.fetchChain(appending: clauses)
     }
@@ -560,7 +560,7 @@ extension FetchChainBuilder {
     
     // MARK: Private
     
-    private func fetchChain(appending clause: FetchClause) -> FetchChainBuilder<D> {
+    private func fetchChain(appending clause: FetchClause) -> FetchChainBuilder<O> {
         
         return .init(
             from: self.from,
@@ -568,7 +568,7 @@ extension FetchChainBuilder {
         )
     }
     
-    private func fetchChain<S: Sequence>(appending clauses: S) -> FetchChainBuilder<D> where S.Element == FetchClause {
+    private func fetchChain<S: Sequence>(appending clauses: S) -> FetchChainBuilder<O> where S.Element == FetchClause {
         
         return .init(
             from: self.from,
@@ -578,13 +578,13 @@ extension FetchChainBuilder {
 }
 
 
-// MARK: - FetchChainBuilder where D: CoreStoreObject
+// MARK: - FetchChainBuilder where O: CoreStoreObject
 
-extension FetchChainBuilder where D: CoreStoreObject {
+extension FetchChainBuilder where O: CoreStoreObject {
     
-    public func `where`<T: AnyWhereClause>(_ clause: (D) -> T) -> FetchChainBuilder<D> {
+    public func `where`<T: AnyWhereClause>(_ clause: (O) -> T) -> FetchChainBuilder<O> {
         
-        return self.fetchChain(appending: clause(D.meta))
+        return self.fetchChain(appending: clause(O.meta))
     }
 }
 
@@ -599,7 +599,7 @@ extension QueryChainBuilder {
      - parameter clause: a `Where` clause to add to the query builder
      - returns: a new `QueryChainBuilder` containing the `Where` clause
      */
-    public func `where`(_ clause: Where<D>) -> QueryChainBuilder<D, R> {
+    public func `where`(_ clause: Where<O>) -> QueryChainBuilder<O, R> {
         
         return self.queryChain(appending: clause)
     }
@@ -611,9 +611,9 @@ extension QueryChainBuilder {
      - parameter args: the arguments for `format`
      - returns: a new `QueryChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, _ args: Any...) -> QueryChainBuilder<D, R> {
+    public func `where`(format: String, _ args: Any...) -> QueryChainBuilder<O, R> {
         
-        return self.queryChain(appending: Where<D>(format, argumentArray: args))
+        return self.queryChain(appending: Where<O>(format, argumentArray: args))
     }
     
     /**
@@ -623,9 +623,9 @@ extension QueryChainBuilder {
      - parameter argumentArray: the arguments for `format`
      - returns: a new `QueryChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, argumentArray: [Any]?) -> QueryChainBuilder<D, R> {
+    public func `where`(format: String, argumentArray: [Any]?) -> QueryChainBuilder<O, R> {
         
-        return self.queryChain(appending: Where<D>(format, argumentArray: argumentArray))
+        return self.queryChain(appending: Where<O>(format, argumentArray: argumentArray))
     }
 
     /**
@@ -634,7 +634,7 @@ extension QueryChainBuilder {
      - parameter clause: the `OrderBy` clause to add
      - returns: a new `QueryChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ clause: OrderBy<D>) -> QueryChainBuilder<D, R> {
+    public func orderBy(_ clause: OrderBy<O>) -> QueryChainBuilder<O, R> {
 
         return self.queryChain(appending: clause)
     }
@@ -646,9 +646,9 @@ extension QueryChainBuilder {
      - parameter sortKeys: a series of other `SortKey`s
      - returns: a new `QueryChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKey: OrderBy<D>.SortKey, _ sortKeys: OrderBy<D>.SortKey...) -> QueryChainBuilder<D, R> {
+    public func orderBy(_ sortKey: OrderBy<O>.SortKey, _ sortKeys: OrderBy<O>.SortKey...) -> QueryChainBuilder<O, R> {
         
-        return self.queryChain(appending: OrderBy<D>([sortKey] + sortKeys))
+        return self.queryChain(appending: OrderBy<O>([sortKey] + sortKeys))
     }
 
     /**
@@ -657,9 +657,9 @@ extension QueryChainBuilder {
      - parameter sortKeys: a series of `SortKey`s
      - returns: a new `QueryChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKeys: [OrderBy<D>.SortKey]) -> QueryChainBuilder<D, R> {
+    public func orderBy(_ sortKeys: [OrderBy<O>.SortKey]) -> QueryChainBuilder<O, R> {
 
-        return self.queryChain(appending: OrderBy<D>(sortKeys))
+        return self.queryChain(appending: OrderBy<O>(sortKeys))
     }
     
     /**
@@ -668,7 +668,7 @@ extension QueryChainBuilder {
      - parameter fetchRequest: the block to customize the `NSFetchRequest`
      - returns: a new `QueryChainBuilder` containing the `Tweak` clause
      */
-    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> QueryChainBuilder<D, R> {
+    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> QueryChainBuilder<O, R> {
         
         return self.queryChain(appending: Tweak(fetchRequest))
     }
@@ -679,7 +679,7 @@ extension QueryChainBuilder {
      - parameter clause: a `GroupBy` clause to add to the query builder
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy(_ clause: GroupBy<D>) -> QueryChainBuilder<D, R> {
+    public func groupBy(_ clause: GroupBy<O>) -> QueryChainBuilder<O, R> {
         
         return self.queryChain(appending: clause)
     }
@@ -691,9 +691,9 @@ extension QueryChainBuilder {
      - parameter keyPaths: other key paths to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy(_ keyPath: KeyPathString, _ keyPaths: KeyPathString...) -> QueryChainBuilder<D, R> {
+    public func groupBy(_ keyPath: KeyPathString, _ keyPaths: KeyPathString...) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>([keyPath] + keyPaths))
+        return self.groupBy(GroupBy<O>([keyPath] + keyPaths))
     }
     
     /**
@@ -702,9 +702,9 @@ extension QueryChainBuilder {
      - parameter keyPaths: a series of key paths to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy(_ keyPaths: [KeyPathString]) -> QueryChainBuilder<D, R> {
+    public func groupBy(_ keyPaths: [KeyPathString]) -> QueryChainBuilder<O, R> {
         
-        return self.queryChain(appending: GroupBy<D>(keyPaths))
+        return self.queryChain(appending: GroupBy<O>(keyPaths))
     }
     
     /**
@@ -713,7 +713,7 @@ extension QueryChainBuilder {
      - parameter clause: the `QueryClause` to add to the `QueryChainBuilder`
      - returns: a new `QueryChainBuilder` containing the `QueryClause`
      */
-    public func appending(_ clause: QueryClause) -> QueryChainBuilder<D, R> {
+    public func appending(_ clause: QueryClause) -> QueryChainBuilder<O, R> {
         
         return self.queryChain(appending: clause)
     }
@@ -724,7 +724,7 @@ extension QueryChainBuilder {
      - parameter clauses: the `QueryClause`s to add to the `QueryChainBuilder`
      - returns: a new `QueryChainBuilder` containing the `QueryClause`s
      */
-    public func appending<S: Sequence>(contentsOf clauses: S) -> QueryChainBuilder<D, R> where S.Element == QueryClause {
+    public func appending<S: Sequence>(contentsOf clauses: S) -> QueryChainBuilder<O, R> where S.Element == QueryClause {
         
         return self.queryChain(appending: clauses)
     }
@@ -732,7 +732,7 @@ extension QueryChainBuilder {
     
     // MARK: Private
     
-    private func queryChain(appending clause: QueryClause) -> QueryChainBuilder<D, R> {
+    private func queryChain(appending clause: QueryClause) -> QueryChainBuilder<O, R> {
         
         return .init(
             from: self.from,
@@ -741,7 +741,7 @@ extension QueryChainBuilder {
         )
     }
     
-    private func queryChain<S: Sequence>(appending clauses: S) -> QueryChainBuilder<D, R> where S.Element == QueryClause {
+    private func queryChain<S: Sequence>(appending clauses: S) -> QueryChainBuilder<O, R> where S.Element == QueryClause {
         
         return .init(
             from: self.from,
@@ -752,9 +752,9 @@ extension QueryChainBuilder {
 }
 
 
-// MARK: - QueryChainBuilder where D: NSManagedObject
+// MARK: - QueryChainBuilder where O: NSManagedObject
 
-extension QueryChainBuilder where D: NSManagedObject {
+extension QueryChainBuilder where O: NSManagedObject {
     
     /**
      Adds a `GroupBy` clause to the `QueryChainBuilder`
@@ -762,16 +762,16 @@ extension QueryChainBuilder where D: NSManagedObject {
      - parameter keyPath: a key path to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy<T>(_ keyPath: KeyPath<D, T>) -> QueryChainBuilder<D, R> {
+    public func groupBy<T>(_ keyPath: KeyPath<O, T>) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>(keyPath))
+        return self.groupBy(GroupBy<O>(keyPath))
     }
 }
 
 
-// MARK: - QueryChainBuilder where D: CoreStoreObject
+// MARK: - QueryChainBuilder where O: CoreStoreObject
 
-extension QueryChainBuilder where D: CoreStoreObject {
+extension QueryChainBuilder where O: CoreStoreObject {
     
     /**
      Adds a `Where` clause to the `QueryChainBuilder`
@@ -779,9 +779,9 @@ extension QueryChainBuilder where D: CoreStoreObject {
      - parameter clause: a `Where` clause to add to the query builder
      - returns: a new `QueryChainBuilder` containing the `Where` clause
      */
-    public func `where`<T: AnyWhereClause>(_ clause: (D) -> T) -> QueryChainBuilder<D, R> {
+    public func `where`<T: AnyWhereClause>(_ clause: (O) -> T) -> QueryChainBuilder<O, R> {
         
-        return self.queryChain(appending: clause(D.meta))
+        return self.queryChain(appending: clause(O.meta))
     }
     
     /**
@@ -790,9 +790,9 @@ extension QueryChainBuilder where D: CoreStoreObject {
      - parameter keyPath: a key path to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy<T>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<T>>) -> QueryChainBuilder<D, R> {
+    public func groupBy<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>(keyPath))
+        return self.groupBy(GroupBy<O>(keyPath))
     }
     
     /**
@@ -801,9 +801,9 @@ extension QueryChainBuilder where D: CoreStoreObject {
      - parameter keyPath: a key path to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy<T>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<T>>) -> QueryChainBuilder<D, R> {
+    public func groupBy<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>(keyPath))
+        return self.groupBy(GroupBy<O>(keyPath))
     }
     
     /**
@@ -812,9 +812,9 @@ extension QueryChainBuilder where D: CoreStoreObject {
      - parameter keyPath: a key path to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy<T>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<T>>) -> QueryChainBuilder<D, R> {
+    public func groupBy<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>(keyPath))
+        return self.groupBy(GroupBy<O>(keyPath))
     }
     
     /**
@@ -823,9 +823,9 @@ extension QueryChainBuilder where D: CoreStoreObject {
      - parameter keyPath: a key path to group the query results with
      - returns: a new `QueryChainBuilder` containing the `GroupBy` clause
      */
-    public func groupBy<T>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>) -> QueryChainBuilder<D, R> {
+    public func groupBy<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> QueryChainBuilder<O, R> {
         
-        return self.groupBy(GroupBy<D>(keyPath))
+        return self.groupBy(GroupBy<O>(keyPath))
     }
 }
 
@@ -841,7 +841,7 @@ extension SectionMonitorChainBuilder {
      - parameter clause: a `Where` clause to add to the fetch builder
      - returns: a new `SectionMonitorChainBuilder` containing the `Where` clause
      */
-    public func `where`(_ clause: Where<D>) -> SectionMonitorChainBuilder<D> {
+    public func `where`(_ clause: Where<O>) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionMonitorChain(appending: clause)
     }
@@ -853,9 +853,9 @@ extension SectionMonitorChainBuilder {
      - parameter args: the arguments for `format`
      - returns: a new `SectionMonitorChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, _ args: Any...) -> SectionMonitorChainBuilder<D> {
+    public func `where`(format: String, _ args: Any...) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionMonitorChain(appending: Where<D>(format, argumentArray: args))
+        return self.sectionMonitorChain(appending: Where<O>(format, argumentArray: args))
     }
     
     /**
@@ -865,9 +865,9 @@ extension SectionMonitorChainBuilder {
      - parameter argumentArray: the arguments for `format`
      - returns: a new `SectionMonitorChainBuilder` containing the `Where` clause
      */
-    public func `where`(format: String, argumentArray: [Any]?) -> SectionMonitorChainBuilder<D> {
+    public func `where`(format: String, argumentArray: [Any]?) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionMonitorChain(appending: Where<D>(format, argumentArray: argumentArray))
+        return self.sectionMonitorChain(appending: Where<O>(format, argumentArray: argumentArray))
     }
 
     /**
@@ -876,7 +876,7 @@ extension SectionMonitorChainBuilder {
      - parameter clause: the `OrderBy` clause to add
      - returns: a new `SectionMonitorChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ clause: OrderBy<D>) -> SectionMonitorChainBuilder<D> {
+    public func orderBy(_ clause: OrderBy<O>) -> SectionMonitorChainBuilder<O> {
 
         return self.sectionMonitorChain(appending: clause)
     }
@@ -888,9 +888,9 @@ extension SectionMonitorChainBuilder {
      - parameter sortKeys: a series of other `SortKey`s
      - returns: a new `SectionMonitorChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKey: OrderBy<D>.SortKey, _ sortKeys: OrderBy<D>.SortKey...) -> SectionMonitorChainBuilder<D> {
+    public func orderBy(_ sortKey: OrderBy<O>.SortKey, _ sortKeys: OrderBy<O>.SortKey...) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionMonitorChain(appending: OrderBy<D>([sortKey] + sortKeys))
+        return self.sectionMonitorChain(appending: OrderBy<O>([sortKey] + sortKeys))
     }
 
     /**
@@ -899,9 +899,9 @@ extension SectionMonitorChainBuilder {
      - parameter sortKeys: a series of `SortKey`s
      - returns: a new `SectionMonitorChainBuilder` containing the `OrderBy` clause
      */
-    public func orderBy(_ sortKeys: [OrderBy<D>.SortKey]) -> SectionMonitorChainBuilder<D> {
+    public func orderBy(_ sortKeys: [OrderBy<O>.SortKey]) -> SectionMonitorChainBuilder<O> {
 
-        return self.sectionMonitorChain(appending: OrderBy<D>(sortKeys))
+        return self.sectionMonitorChain(appending: OrderBy<O>(sortKeys))
     }
     
     /**
@@ -910,7 +910,7 @@ extension SectionMonitorChainBuilder {
      - parameter fetchRequest: the block to customize the `NSFetchRequest`
      - returns: a new `SectionMonitorChainBuilder` containing the `Tweak` clause
      */
-    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> SectionMonitorChainBuilder<D> {
+    public func tweak(_ fetchRequest: @escaping (NSFetchRequest<NSFetchRequestResult>) -> Void) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionMonitorChain(appending: Tweak(fetchRequest))
     }
@@ -921,7 +921,7 @@ extension SectionMonitorChainBuilder {
      - parameter clause: the `QueryClause` to add to the `SectionMonitorChainBuilder`
      - returns: a new `SectionMonitorChainBuilder` containing the `QueryClause`
      */
-    public func appending(_ clause: FetchClause) -> SectionMonitorChainBuilder<D> {
+    public func appending(_ clause: FetchClause) -> SectionMonitorChainBuilder<O> {
         
         return self.sectionMonitorChain(appending: clause)
     }
@@ -932,7 +932,7 @@ extension SectionMonitorChainBuilder {
      - parameter clauses: the `QueryClause`s to add to the `SectionMonitorChainBuilder`
      - returns: a new `SectionMonitorChainBuilder` containing the `QueryClause`s
      */
-    public func appending<S: Sequence>(contentsOf clauses: S) -> SectionMonitorChainBuilder<D> where S.Element == FetchClause {
+    public func appending<S: Sequence>(contentsOf clauses: S) -> SectionMonitorChainBuilder<O> where S.Element == FetchClause {
         
         return self.sectionMonitorChain(appending: clauses)
     }
@@ -940,7 +940,7 @@ extension SectionMonitorChainBuilder {
     
     // MARK: Private
     
-    private func sectionMonitorChain(appending clause: FetchClause) -> SectionMonitorChainBuilder<D> {
+    private func sectionMonitorChain(appending clause: FetchClause) -> SectionMonitorChainBuilder<O> {
         
         return .init(
             from: self.from,
@@ -949,7 +949,7 @@ extension SectionMonitorChainBuilder {
         )
     }
     
-    private func sectionMonitorChain<S: Sequence>(appending clauses: S) -> SectionMonitorChainBuilder<D> where S.Element == FetchClause {
+    private func sectionMonitorChain<S: Sequence>(appending clauses: S) -> SectionMonitorChainBuilder<O> where S.Element == FetchClause {
         
         return .init(
             from: self.from,
@@ -960,10 +960,10 @@ extension SectionMonitorChainBuilder {
 }
 
 
-// MARK: - SectionMonitorChainBuilder where D: CoreStoreObject
+// MARK: - SectionMonitorChainBuilder where O: CoreStoreObject
 
 @available(macOS 10.12, *)
-extension SectionMonitorChainBuilder where D: CoreStoreObject {
+extension SectionMonitorChainBuilder where O: CoreStoreObject {
     
     /**
      Adds a `Where` clause to the `SectionMonitorChainBuilder`
@@ -971,8 +971,8 @@ extension SectionMonitorChainBuilder where D: CoreStoreObject {
      - parameter clause: a `Where` clause to add to the fetch builder
      - returns: a new `SectionMonitorChainBuilder` containing the `Where` clause
      */
-    public func `where`<T: AnyWhereClause>(_ clause: (D) -> T) -> SectionMonitorChainBuilder<D> {
+    public func `where`<T: AnyWhereClause>(_ clause: (O) -> T) -> SectionMonitorChainBuilder<O> {
         
-        return self.sectionMonitorChain(appending: clause(D.meta))
+        return self.sectionMonitorChain(appending: clause(O.meta))
     }
 }
diff --git a/Sources/From.swift b/Sources/From.swift
index 5eaaa35..c12bbef 100644
--- a/Sources/From.swift
+++ b/Sources/From.swift
@@ -39,12 +39,12 @@ import CoreData
  let person = transaction.fetchOne(From<Person>("Configuration1"))
  ```
  */
-public struct From<D: DynamicObject> {
+public struct From<O: DynamicObject> {
     
     /**
      The associated `NSManagedObject` or `CoreStoreObject` entity class
      */
-    public let entityClass: D.Type
+    public let entityClass: O.Type
     
     /**
      The `NSPersistentStore` configuration names to associate objects from.
@@ -60,7 +60,7 @@ public struct From<D: DynamicObject> {
      */
     public init() {
         
-        self.init(entityClass: D.self, configurations: nil)
+        self.init(entityClass: O.self, configurations: nil)
     }
     
     /**
@@ -70,7 +70,7 @@ public struct From<D: DynamicObject> {
      ```
      - parameter entity: the associated `NSManagedObject` or `CoreStoreObject` type
      */
-    public init(_ entity: D.Type) {
+    public init(_ entity: O.Type) {
         
         self.init(entityClass: entity, configurations: nil)
     }
@@ -85,7 +85,7 @@ public struct From<D: DynamicObject> {
      */
     public init(_ configuration: ModelConfiguration, _ otherConfigurations: ModelConfiguration...) {
         
-        self.init(entityClass: D.self, configurations: [configuration] + otherConfigurations)
+        self.init(entityClass: O.self, configurations: [configuration] + otherConfigurations)
     }
     
     /**
@@ -97,7 +97,7 @@ public struct From<D: DynamicObject> {
      */
     public init(_ configurations: [ModelConfiguration]) {
         
-        self.init(entityClass: D.self, configurations: configurations)
+        self.init(entityClass: O.self, configurations: configurations)
     }
     
     /**
@@ -109,7 +109,7 @@ public struct From<D: 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: D.Type, _ configuration: ModelConfiguration, _ otherConfigurations: ModelConfiguration...) {
+    public init(_ entity: O.Type, _ configuration: ModelConfiguration, _ otherConfigurations: ModelConfiguration...) {
         
         self.init(entityClass: entity, configurations: [configuration] + otherConfigurations)
     }
@@ -122,7 +122,7 @@ public struct From<D: 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: D.Type, _ configurations: [ModelConfiguration]) {
+    public init(_ entity: O.Type, _ configurations: [ModelConfiguration]) {
         
         self.init(entityClass: entity, configurations: configurations)
     }
@@ -132,7 +132,7 @@ public struct From<D: DynamicObject> {
     
     internal let findPersistentStores: (_ context: NSManagedObjectContext) -> [NSPersistentStore]?
     
-    internal init(entityClass: D.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
@@ -186,7 +186,7 @@ public struct From<D: DynamicObject> {
     
     // MARK: Private
     
-    private init(entityClass: D.Type, configurations: [ModelConfiguration]?) {
+    private init(entityClass: O.Type, configurations: [ModelConfiguration]?) {
         
         self.entityClass = entityClass
         self.configurations = configurations
@@ -211,4 +211,10 @@ public struct From<D: DynamicObject> {
             }
         }
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
diff --git a/Sources/GroupBy.swift b/Sources/GroupBy.swift
index a4750e1..4b80a2b 100644
--- a/Sources/GroupBy.swift
+++ b/Sources/GroupBy.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  The `GroupBy` clause specifies that the result of a query be grouped accoording to the specified key path.
  */
-public struct GroupBy<D: DynamicObject>: GroupByClause, QueryClause, Hashable {
+public struct GroupBy<O: DynamicObject>: GroupByClause, QueryClause, Hashable {
     
     /**
      Initializes a `GroupBy` clause with an empty list of key path strings
@@ -66,7 +66,7 @@ public struct GroupBy<D: DynamicObject>: GroupByClause, QueryClause, Hashable {
     
     // MARK: GroupByClause
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
     public let keyPaths: [KeyPathString]
     
@@ -101,31 +101,37 @@ public struct GroupBy<D: DynamicObject>: GroupByClause, QueryClause, Hashable {
 
         hasher.combine(self.keyPaths)
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
-extension GroupBy where D: NSManagedObject {
+extension GroupBy where O: NSManagedObject {
     
     /**
      Initializes a `GroupBy` clause with a key path
      
      - parameter keyPath: a key path to group results with
      */
-    public init<T>(_ keyPath: KeyPath<D, T>) {
+    public init<T>(_ keyPath: KeyPath<O, T>) {
         
         self.init([keyPath._kvcKeyPathString!])
     }
 }
 
-extension GroupBy where D: CoreStoreObject {
+extension GroupBy where O: CoreStoreObject {
     
     /**
      Initializes a `GroupBy` clause with a key path
      
      - parameter keyPath: a key path to group results with
      */
-    public init<T>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<T>>) {
+    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
         
-        self.init([D.meta[keyPath: keyPath].keyPath])
+        self.init([O.meta[keyPath: keyPath].keyPath])
     }
     
     /**
@@ -133,9 +139,9 @@ extension GroupBy where D: CoreStoreObject {
      
      - parameter keyPath: a key path to group results with
      */
-    public init<T>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<T>>) {
+    public init<T>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
         
-        self.init([D.meta[keyPath: keyPath].keyPath])
+        self.init([O.meta[keyPath: keyPath].keyPath])
     }
     
     /**
@@ -143,9 +149,9 @@ extension GroupBy where D: CoreStoreObject {
      
      - parameter keyPath: a key path to group results with
      */
-    public init<T>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<T>>) {
+    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
         
-        self.init([D.meta[keyPath: keyPath].keyPath])
+        self.init([O.meta[keyPath: keyPath].keyPath])
     }
     
     /**
@@ -153,9 +159,9 @@ extension GroupBy where D: CoreStoreObject {
      
      - parameter keyPath: a key path to group results with
      */
-    public init<T>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>) {
+    public init<T>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
         
-        self.init([D.meta[keyPath: keyPath].keyPath])
+        self.init([O.meta[keyPath: keyPath].keyPath])
     }
 }
 
diff --git a/Sources/Internals.CoreStoreFetchedResultsController.swift b/Sources/Internals.CoreStoreFetchedResultsController.swift
index e27bf45..699b7db 100644
--- a/Sources/Internals.CoreStoreFetchedResultsController.swift
+++ b/Sources/Internals.CoreStoreFetchedResultsController.swift
@@ -42,7 +42,7 @@ extension Internals {
         internal let typedFetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>
         
         @nonobjc
-        internal convenience init<D>(dataStack: DataStack, fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+        internal convenience init<O>(dataStack: DataStack, fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>, from: From<O>, sectionBy: SectionBy<O>? = nil, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
             
             self.init(
                 context: dataStack.mainContext,
@@ -54,7 +54,7 @@ extension Internals {
         }
         
         @nonobjc
-        internal init<D>(context: NSManagedObjectContext, fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>, from: From<D>, sectionBy: SectionBy<D>? = nil, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
+        internal init<O>(context: NSManagedObjectContext, fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>, from: From<O>, sectionBy: SectionBy<O>? = nil, applyFetchClauses: @escaping (_ fetchRequest: Internals.CoreStoreFetchRequest<NSManagedObject>) -> Void) {
             
             _ = try? from.applyToFetchRequest(
                 fetchRequest,
diff --git a/Sources/Into.swift b/Sources/Into.swift
index a2fa9ec..73c8705 100644
--- a/Sources/Into.swift
+++ b/Sources/Into.swift
@@ -39,12 +39,12 @@ import CoreData
  let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
  ```
  */
-public struct Into<D: DynamicObject>: Hashable {
+public struct Into<O: DynamicObject>: Hashable {
     
     /**
      The associated `NSManagedObject` or `CoreStoreObject` entity class
      */
-    public let entityClass: D.Type
+    public let entityClass: O.Type
     
     /**
      The `NSPersistentStore` configuration name to associate objects from.
@@ -60,7 +60,7 @@ public struct Into<D: DynamicObject>: Hashable {
      */
     public init() {
         
-        self.init(entityClass: D.self, configuration: nil, inferStoreIfPossible: true)
+        self.init(entityClass: O.self, configuration: nil, inferStoreIfPossible: true)
     }
     
     /**
@@ -70,7 +70,7 @@ public struct Into<D: DynamicObject>: Hashable {
      ```
      - parameter entity: the `NSManagedObject` or `CoreStoreObject` type to be created
      */
-    public init(_ entity: D.Type) {
+    public init(_ entity: O.Type) {
         
         self.init(entityClass: entity, configuration: nil, inferStoreIfPossible: true)
     }
@@ -84,7 +84,7 @@ public struct Into<D: DynamicObject>: Hashable {
      */
     public init(_ configuration: ModelConfiguration) {
         
-        self.init(entityClass: D.self, configuration: configuration, inferStoreIfPossible: false)
+        self.init(entityClass: O.self, configuration: configuration, inferStoreIfPossible: false)
     }
     
     /**
@@ -95,7 +95,7 @@ public struct Into<D: 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: D.Type, _ configuration: ModelConfiguration) {
+    public init(_ entity: O.Type, _ configuration: ModelConfiguration) {
         
         self.init(entityClass: entity, configuration: configuration, inferStoreIfPossible: false)
     }
@@ -125,10 +125,16 @@ public struct Into<D: DynamicObject>: Hashable {
     
     internal let inferStoreIfPossible: Bool
     
-    internal init(entityClass: D.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
 }
diff --git a/Sources/NSFetchedResultsController+Convenience.swift b/Sources/NSFetchedResultsController+Convenience.swift
index 7c96fd4..e94c291 100644
--- a/Sources/NSFetchedResultsController+Convenience.swift
+++ b/Sources/NSFetchedResultsController+Convenience.swift
@@ -42,7 +42,7 @@ extension DataStack {
      - returns: an `NSFetchedResultsController` that observes the `DataStack`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.mainContext,
@@ -62,7 +62,7 @@ extension DataStack {
      - returns: an `NSFetchedResultsController` that observes the `DataStack`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.mainContext,
@@ -81,7 +81,7 @@ extension DataStack {
      - returns: an `NSFetchedResultsController` that observes the `DataStack`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.mainContext,
@@ -100,7 +100,7 @@ extension DataStack {
      - returns: an `NSFetchedResultsController` that observes the `DataStack`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(forDataStack dataStack: DataStack, _ from: From<D>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(forDataStack dataStack: DataStack, _ from: From<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.mainContext,
@@ -127,7 +127,7 @@ extension UnsafeDataTransaction {
      - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.context,
@@ -147,7 +147,7 @@ extension UnsafeDataTransaction {
      - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.context,
@@ -166,7 +166,7 @@ extension UnsafeDataTransaction {
      - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: FetchClause...) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.context,
@@ -185,7 +185,7 @@ extension UnsafeDataTransaction {
      - returns: an `NSFetchedResultsController` that observes the `UnsafeDataTransaction`
      */
     @nonobjc
-    public func createFetchedResultsController<D: NSManagedObject>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<D> {
+    public func createFetchedResultsController<O: NSManagedObject>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> NSFetchedResultsController<O> {
         
         return Internals.createFRC(
             fromContext: self.context,
@@ -205,7 +205,7 @@ extension Internals {
     // MARK: FilePrivate
 
     @available(macOS 10.12, *)
-    fileprivate static func createFRC<D: NSManagedObject>(fromContext context: NSManagedObjectContext, from: From<D>, sectionBy: SectionBy<D>? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController<D> {
+    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,
@@ -218,7 +218,7 @@ extension Internals {
 
                 Internals.assert(
                     fetchRequest.sortDescriptors?.isEmpty == false,
-                    "An \(Internals.typeName(NSFetchedResultsController<D>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<D>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
+                    "An \(Internals.typeName(NSFetchedResultsController<O>.self)) requires a sort information. Specify from a \(Internals.typeName(OrderBy<O>.self)) clause or any custom \(Internals.typeName(FetchClause.self)) that provides a sort descriptor."
                 )
             }
         )
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 0e0be6c..66114d2 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -87,9 +87,9 @@ extension NSManagedObjectContext {
     }
 
     @nonobjc
-    internal func objectPublisher<D: DynamicObject>(objectID: NSManagedObjectID) -> ObjectPublisher<D> {
+    internal func objectPublisher<O: DynamicObject>(objectID: NSManagedObjectID) -> ObjectPublisher<O> {
 
-        let cache: NSMapTable<NSManagedObjectID, ObjectPublisher<D>> = self.userInfo(for: .objectPublishersCache(D.self)) {
+        let cache: NSMapTable<NSManagedObjectID, ObjectPublisher<O>> = self.userInfo(for: .objectPublishersCache(O.self)) {
 
             return .strongToWeakObjects()
         }
@@ -99,7 +99,7 @@ extension NSManagedObjectContext {
 
                 return objectPublisher
             }
-            let objectPublisher = ObjectPublisher<D>(objectID: objectID, context: self)
+            let objectPublisher = ObjectPublisher<O>(objectID: objectID, context: self)
             cache.setObject(objectPublisher, forKey: objectID)
             return objectPublisher
         }
diff --git a/Sources/NSManagedObjectContext+Querying.swift b/Sources/NSManagedObjectContext+Querying.swift
index fa69c87..f54e9b6 100644
--- a/Sources/NSManagedObjectContext+Querying.swift
+++ b/Sources/NSManagedObjectContext+Querying.swift
@@ -34,7 +34,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     // MARK: FetchableSource
     
     @nonobjc
-    public func fetchExisting<D: DynamicObject>(_ object: D) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ object: O) -> O? {
         
         let rawObject = object.cs_toRaw()
         if rawObject.objectID.isTemporaryID {
@@ -75,12 +75,12 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchExisting<D: DynamicObject>(_ objectID: NSManagedObjectID) -> D? {
+    public func fetchExisting<O: DynamicObject>(_ objectID: NSManagedObjectID) -> O? {
         
         do {
             
             let existingObject = try self.existingObject(with: objectID)
-            return D.cs_fromRaw(object: existingObject)
+            return O.cs_fromRaw(object: existingObject)
         }
         catch _ {
             
@@ -89,25 +89,25 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchExisting<D: DynamicObject, S: Sequence>(_ objects: S) -> [D] where S.Iterator.Element == D {
+    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<D: DynamicObject, S: Sequence>(_ objectIDs: S) -> [D] 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> O? {
         
         return try self.fetchOne(from, fetchClauses)
     }
     
     @nonobjc
-    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
+    public func fetchOne<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> O? {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -126,13 +126,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [O] {
         
         return try self.fetchAll(from, fetchClauses)
     }
     
     @nonobjc
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
+    public func fetchAll<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [O] {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -152,13 +152,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> Int {
     
         return try self.fetchCount(from, fetchClauses)
     }
     
     @nonobjc
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
+    public func fetchCount<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> Int {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSNumber>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -176,13 +176,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
         
         return try self.fetchObjectID(from, fetchClauses)
     }
     
     @nonobjc
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
+    public func fetchObjectID<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObjectID>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -201,13 +201,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
         
         return try self.fetchObjectIDs(from, fetchClauses)
     }
     
     @nonobjc
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
+    public func fetchObjectIDs<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
 
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObjectID>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -257,13 +257,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     // MARK: QueryableSource
     
     @nonobjc
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> U? {
         
         return try self.queryValue(from, selectClause, queryClauses)
     }
     
     @nonobjc
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
+    public func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U? {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSDictionary>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -283,13 +283,13 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     }
     
     @nonobjc
-    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
         
         return try self.queryAttributes(from, selectClause, queryClauses)
     }
     
     @nonobjc
-    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
+    public func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSDictionary>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -320,7 +320,7 @@ extension NSManagedObjectContext: FetchableSource, QueryableSource {
     // MARK: Deleting
     
     @nonobjc
-    internal func deleteAll<D>(_ from: From<D>, _ deleteClauses: [FetchClause]) throws -> Int {
+    internal func deleteAll<O>(_ from: From<O>, _ deleteClauses: [FetchClause]) throws -> Int {
         
         let fetchRequest = Internals.CoreStoreFetchRequest<NSManagedObject>()
         try from.applyToFetchRequest(fetchRequest, context: self)
@@ -343,9 +343,9 @@ extension NSManagedObjectContext {
     // MARK: Fetching
     
     @nonobjc
-    internal func fetchOne<D: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<D>) throws -> D? {
+    internal func fetchOne<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> O? {
         
-        var fetchResults: [D]?
+        var fetchResults: [O]?
         var fetchError: Error?
         self.performAndWait {
             
@@ -371,9 +371,9 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func fetchAll<D: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<D>) throws -> [D] {
+    internal func fetchAll<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> [O] {
         
-        var fetchResults: [D]?
+        var fetchResults: [O]?
         var fetchError: Error?
         self.performAndWait {
             
@@ -458,7 +458,7 @@ extension NSManagedObjectContext {
     // MARK: Querying
     
     @nonobjc
-    internal func queryValue<D, U: QueryableAttributeType>(_ selectTerms: [SelectTerm<D>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> U? {
+    internal func queryValue<O, U: QueryableAttributeType>(_ selectTerms: [SelectTerm<O>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> U? {
         
         var fetchResults: [Any]?
         var fetchError: Error?
@@ -478,7 +478,7 @@ extension NSManagedObjectContext {
             if let rawResult = fetchResults.first as? NSDictionary,
                 let rawObject = rawResult[selectTerms.first!.keyPathString] as? U.QueryableNativeType {
                 
-                return Select<D, U>.ReturnType.cs_fromQueryableNativeType(rawObject)
+                return Select<O, U>.ReturnType.cs_fromQueryableNativeType(rawObject)
             }
             return nil
         }
@@ -491,7 +491,7 @@ extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal func queryValue<D>(_ selectTerms: [SelectTerm<D>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> Any? {
+    internal func queryValue<O>(_ selectTerms: [SelectTerm<O>], fetchRequest: Internals.CoreStoreFetchRequest<NSDictionary>) throws -> Any? {
         
         var fetchResults: [Any]?
         var fetchError: Error?
@@ -555,7 +555,7 @@ extension NSManagedObjectContext {
     // MARK: Deleting
     
     @nonobjc
-    internal func deleteAll<D: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<D>) throws -> Int {
+    internal func deleteAll<O: NSManagedObject>(_ fetchRequest: Internals.CoreStoreFetchRequest<O>) throws -> Int {
         
         var numberOfDeletedObjects: Int?
         var fetchError: Error?
diff --git a/Sources/OrderBy.swift b/Sources/OrderBy.swift
index 8c7564e..126f4ae 100644
--- a/Sources/OrderBy.swift
+++ b/Sources/OrderBy.swift
@@ -32,7 +32,7 @@ import CoreData
 /**
  The `OrderBy` clause specifies the sort order for results for a fetch or a query.
  */
-public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause, DeleteClause, Hashable {
+public struct OrderBy<O: DynamicObject>: OrderByClause, FetchClause, QueryClause, DeleteClause, Hashable {
     
     /**
      Combines two `OrderBy` sort descriptors together
@@ -102,7 +102,7 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
     
     // MARK: OrderByClause
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
     public let sortDescriptors: [NSSortDescriptor]
     
@@ -170,7 +170,7 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
         /**
          Indicates that the `KeyPathString` should be sorted in ascending order
          */
-        public static func ascending<T>(_ keyPath: KeyPath<D, T>) -> SortKey where D: NSManagedObject {
+        public static func ascending<T>(_ keyPath: KeyPath<O, T>) -> SortKey where O: NSManagedObject {
             
             return .ascending(keyPath._kvcKeyPathString!)
         }
@@ -178,7 +178,7 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
         /**
          Indicates that the `KeyPathString` should be sorted in descending order
          */
-        public static func descending<T>(_ keyPath: KeyPath<D, T>) -> SortKey where D: NSManagedObject {
+        public static func descending<T>(_ keyPath: KeyPath<O, T>) -> SortKey where O: NSManagedObject {
             
             return .descending(keyPath._kvcKeyPathString!)
         }
@@ -189,65 +189,65 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
         /**
          Indicates that the `KeyPathString` should be sorted in ascending order
          */
-        public static func ascending<T>(_ attribute: KeyPath<D, ValueContainer<D>.Required<T>>) -> SortKey {
+        public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> SortKey {
             
-            return .ascending(D.meta[keyPath: attribute].keyPath)
+            return .ascending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in ascending order
          */
-        public static func ascending<T>(_ attribute: KeyPath<D, ValueContainer<D>.Optional<T>>) -> SortKey {
+        public static func ascending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> SortKey {
             
-            return .ascending(D.meta[keyPath: attribute].keyPath)
+            return .ascending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in ascending order
          */
-        public static func ascending<T>(_ attribute: KeyPath<D, TransformableContainer<D>.Required<T>>) -> SortKey {
+        public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> SortKey {
             
-            return .ascending(D.meta[keyPath: attribute].keyPath)
+            return .ascending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in ascending order
          */
-        public static func ascending<T>(_ attribute: KeyPath<D, TransformableContainer<D>.Optional<T>>) -> SortKey {
+        public static func ascending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> SortKey {
             
-            return .ascending(D.meta[keyPath: attribute].keyPath)
+            return .ascending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in descending order
          */
-        public static func descending<T>(_ attribute: KeyPath<D, ValueContainer<D>.Required<T>>) -> SortKey {
+        public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Required<T>>) -> SortKey {
             
-            return .descending(D.meta[keyPath: attribute].keyPath)
+            return .descending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in descending order
          */
-        public static func descending<T>(_ attribute: KeyPath<D, ValueContainer<D>.Optional<T>>) -> SortKey {
+        public static func descending<T>(_ attribute: KeyPath<O, ValueContainer<O>.Optional<T>>) -> SortKey {
             
-            return .descending(D.meta[keyPath: attribute].keyPath)
+            return .descending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in descending order
          */
-        public static func descending<T>(_ attribute: KeyPath<D, TransformableContainer<D>.Required<T>>) -> SortKey {
+        public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Required<T>>) -> SortKey {
             
-            return .descending(D.meta[keyPath: attribute].keyPath)
+            return .descending(O.meta[keyPath: attribute].keyPath)
         }
         
         /**
          Indicates that the `KeyPathString` should be sorted in descending order
          */
-        public static func descending<T>(_ attribute: KeyPath<D, TransformableContainer<D>.Optional<T>>) -> SortKey {
+        public static func descending<T>(_ attribute: KeyPath<O, TransformableContainer<O>.Optional<T>>) -> SortKey {
             
-            return .descending(D.meta[keyPath: attribute].keyPath)
+            return .descending(O.meta[keyPath: attribute].keyPath)
         }
         
         
@@ -255,27 +255,33 @@ public struct OrderBy<D: DynamicObject>: OrderByClause, FetchClause, QueryClause
         
         fileprivate let descriptor: NSSortDescriptor
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
-// MARK: - OrderBy.SortKey where D: CoreStoreObject
+// MARK: - OrderBy.SortKey where O: CoreStoreObject
 
-extension OrderBy.SortKey where D: CoreStoreObject {
+extension OrderBy.SortKey where O: CoreStoreObject {
     
     /**
      Indicates that the `KeyPathString` should be sorted in ascending order
      */
-    public static func ascending<K: KeyPathStringConvertible>(_ attribute: (D) -> K) -> OrderBy<D>.SortKey {
+    public static func ascending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> OrderBy<O>.SortKey {
         
-        return .ascending(attribute(D.meta).cs_keyPathString)
+        return .ascending(attribute(O.meta).cs_keyPathString)
     }
     
     /**
      Indicates that the `KeyPathString` should be sorted in descending order
      */
-    public static func descending<K: KeyPathStringConvertible>(_ attribute: (D) -> K) -> OrderBy<D>.SortKey {
+    public static func descending<K: KeyPathStringConvertible>(_ attribute: (O) -> K) -> OrderBy<O>.SortKey {
         
-        return .descending(attribute(D.meta).cs_keyPathString)
+        return .descending(attribute(O.meta).cs_keyPathString)
     }
 }
 
diff --git a/Sources/QueryChainBuilder.swift b/Sources/QueryChainBuilder.swift
index 7c183bd..8b0d5c4 100644
--- a/Sources/QueryChainBuilder.swift
+++ b/Sources/QueryChainBuilder.swift
@@ -39,16 +39,22 @@ import CoreData
  )
  ```
  */
-public struct QueryChainBuilder<D: DynamicObject, R: SelectResultType>: QueryChainableBuilderType {
+public struct QueryChainBuilder<O: DynamicObject, R: SelectResultType>: QueryChainableBuilderType {
     
     // MARK: QueryChainableBuilderType
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     public typealias ResultType = R
     
-    public var from: From<D>
-    public var select: Select<D, R>
+    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
 }
 
 
diff --git a/Sources/QueryableSource.swift b/Sources/QueryableSource.swift
index af58556..2e53ed1 100644
--- a/Sources/QueryableSource.swift
+++ b/Sources/QueryableSource.swift
@@ -45,7 +45,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U?
+    func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: QueryClause...) throws -> 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,7 +58,7 @@ 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<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U?
+    func queryValue<O, U: QueryableAttributeType>(_ from: From<O>, _ selectClause: Select<O, U>, _ queryClauses: [QueryClause]) throws -> U?
     
     /**
      Queries a property value or aggregate as specified by the `QueryChainableBuilderType` built from a chain of clauses.
@@ -88,7 +88,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]]
+    func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[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,7 +101,7 @@ 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<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]]
+    func queryAttributes<O>(_ from: From<O>, _ selectClause: Select<O, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]]
     
     /**
      Queries a dictionary of attribute values or  as specified by the `QueryChainableBuilderType` built from a chain of clauses.
diff --git a/Sources/SectionBy.swift b/Sources/SectionBy.swift
index 33388cf..3a0b662 100644
--- a/Sources/SectionBy.swift
+++ b/Sources/SectionBy.swift
@@ -40,7 +40,7 @@ import CoreData
  ```
  */
 @available(macOS 10.12, *)
-public struct SectionBy<D: DynamicObject> {
+public struct SectionBy<O: DynamicObject> {
     
     /**
      Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
@@ -70,17 +70,23 @@ public struct SectionBy<D: DynamicObject> {
     
     internal let sectionKeyPath: KeyPathString
     internal let sectionIndexTransformer: (_ sectionName: String?) -> String?
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 @available(macOS 10.12, *)
-extension SectionBy where D: NSManagedObject {
+extension SectionBy where O: NSManagedObject {
     
     /**
      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<D, T>) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, T>) {
         
         self.init(sectionKeyPath, { $0 })
     }
@@ -92,21 +98,21 @@ extension SectionBy where D: NSManagedObject {
      - 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 name
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, T>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, T>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
         
         self.init(sectionKeyPath._kvcKeyPathString!, sectionIndexTransformer)
     }
 }
 
 @available(macOS 10.12, *)
-extension SectionBy where D: CoreStoreObject {
+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<D, ValueContainer<D>.Required<T>>) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
         
         self.init(sectionKeyPath, { $0 })
     }
@@ -116,7 +122,7 @@ extension SectionBy where D: CoreStoreObject {
      
      - parameter sectionKeyPath: the key path to use to group the objects into sections
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Optional<T>>) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
         
         self.init(sectionKeyPath, { $0 })
     }
@@ -126,7 +132,7 @@ extension SectionBy where D: CoreStoreObject {
      
      - parameter sectionKeyPath: the key path to use to group the objects into sections
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Required<T>>) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
         
         self.init(sectionKeyPath, { $0 })
     }
@@ -136,7 +142,7 @@ extension SectionBy where D: CoreStoreObject {
      
      - parameter sectionKeyPath: the key path to use to group the objects into sections
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
         
         self.init(sectionKeyPath, { $0 })
     }
@@ -148,9 +154,9 @@ extension SectionBy where D: CoreStoreObject {
      - 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 name
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
         
-        self.init(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        self.init(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -160,9 +166,9 @@ extension SectionBy where D: CoreStoreObject {
      - 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 name
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, ValueContainer<D>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, ValueContainer<O>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
         
-        self.init(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        self.init(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -172,9 +178,9 @@ extension SectionBy where D: CoreStoreObject {
      - 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 name
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Required<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
         
-        self.init(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        self.init(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
     
     /**
@@ -184,8 +190,8 @@ extension SectionBy where D: CoreStoreObject {
      - 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 name
      */
-    public init<T>(_ sectionKeyPath: KeyPath<D, TransformableContainer<D>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
+    public init<T>(_ sectionKeyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>, _ sectionIndexTransformer: @escaping (_ sectionName: String?) -> String?) {
         
-        self.init(D.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
+        self.init(O.meta[keyPath: sectionKeyPath].keyPath, sectionIndexTransformer)
     }
 }
diff --git a/Sources/SectionMonitorBuilder.swift b/Sources/SectionMonitorBuilder.swift
index 273e345..173e07d 100644
--- a/Sources/SectionMonitorBuilder.swift
+++ b/Sources/SectionMonitorBuilder.swift
@@ -41,13 +41,19 @@ import CoreData
  ```
  */
 @available(macOS 10.12, *)
-public struct SectionMonitorChainBuilder<D: DynamicObject>: SectionMonitorBuilderType {
+public struct SectionMonitorChainBuilder<O: DynamicObject>: SectionMonitorBuilderType {
     
     // MARK: SectionMonitorBuilderType
     
-    public var from: From<D>
-    public var sectionBy: SectionBy<D>
+    public var from: From<O>
+    public var sectionBy: SectionBy<O>
     public var fetchClauses: [FetchClause] = []
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
diff --git a/Sources/Select.swift b/Sources/Select.swift
index 8be74ca..dab14fb 100644
--- a/Sources/Select.swift
+++ b/Sources/Select.swift
@@ -52,7 +52,7 @@ public protocol SelectAttributesResultType: SelectResultType {
 /**
  The `SelectTerm` is passed to the `Select` clause to indicate the attributes/aggregate keys to be queried.
  */
-public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
+public enum SelectTerm<O: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     
     /**
      Provides a `SelectTerm` to a `Select` clause for querying an entity attribute. A shorter way to do the same is to assign from the string keypath directly:
@@ -74,7 +74,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func attribute(_ keyPath: KeyPathString) -> SelectTerm<O> {
         
         return ._attribute(keyPath)
     }
@@ -91,7 +91,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func average(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._aggregate(
             function: "average:",
@@ -113,7 +113,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func count(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._aggregate(
             function: "count:",
@@ -135,7 +135,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func maximum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._aggregate(
             function: "max:",
@@ -157,7 +157,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func minimum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._aggregate(
             function: "min:",
@@ -179,7 +179,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func sum(_ keyPath: KeyPathString, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._aggregate(
             function: "sum:",
@@ -202,7 +202,7 @@ public enum SelectTerm<D: 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<D> {
+    public static func objectID(as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return ._identity(
             alias: alias ?? "objectID",
@@ -231,7 +231,7 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
     
     // MARK: Equatable
     
-    public static func == (lhs: SelectTerm<D>, rhs: SelectTerm<D>) -> Bool {
+    public static func == (lhs: SelectTerm<O>, rhs: SelectTerm<O>) -> Bool {
         
         switch (lhs, rhs) {
             
@@ -296,19 +296,25 @@ public enum SelectTerm<D: DynamicObject>: ExpressibleByStringLiteral, Hashable {
         case ._identity(let alias, _):          return alias
         }
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
-// MARK: - SelectTerm where D: NSManagedObject
+// MARK: - SelectTerm where O: NSManagedObject
 
-extension SelectTerm where D: NSManagedObject {
+extension SelectTerm where O: NSManagedObject {
     
     /**
      Provides a `SelectTerm` to a `Select` clause for querying an entity attribute.
      - parameter keyPath: the attribute name
      - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
      */
-    public static func attribute<V>(_ keyPath: KeyPath<D, V>) -> SelectTerm<D> {
+    public static func attribute<V>(_ keyPath: KeyPath<O, V>) -> SelectTerm<O> {
         
         return self.attribute(keyPath._kvcKeyPathString!)
     }
@@ -319,7 +325,7 @@ extension SelectTerm where D: 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<D, V>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func average<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return self.average(keyPath._kvcKeyPathString!, as: alias)
     }
@@ -330,7 +336,7 @@ extension SelectTerm where D: 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<D, V>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func count<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return self.count(keyPath._kvcKeyPathString!, as: alias)
     }
@@ -341,7 +347,7 @@ extension SelectTerm where D: 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<D, V>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func maximum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return self.maximum(keyPath._kvcKeyPathString!, as: alias)
     }
@@ -352,7 +358,7 @@ extension SelectTerm where D: 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<D, V>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func minimum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return self.minimum(keyPath._kvcKeyPathString!, as: alias)
     }
@@ -363,25 +369,25 @@ extension SelectTerm where D: 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<D, V>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func sum<V>(_ keyPath: KeyPath<O, V>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
         return self.sum(keyPath._kvcKeyPathString!, as: alias)
     }
 }
 
 
-// MARK: - SelectTerm where D: CoreStoreObject
+// MARK: - SelectTerm where O: CoreStoreObject
 
-extension SelectTerm where D: CoreStoreObject {
+extension SelectTerm where O: CoreStoreObject {
     
     /**
      Provides a `SelectTerm` to a `Select` clause for querying an entity attribute.
      - parameter keyPath: the attribute name
      - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
      */
-    public static func attribute<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>) -> SelectTerm<D> {
+    public static func attribute<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>) -> SelectTerm<O> {
         
-        return self.attribute(D.meta[keyPath: keyPath].keyPath)
+        return self.attribute(O.meta[keyPath: keyPath].keyPath)
     }
     
     /**
@@ -389,9 +395,9 @@ extension SelectTerm where D: CoreStoreObject {
      - parameter keyPath: the attribute name
      - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
      */
-    public static func attribute<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>) -> SelectTerm<D> {
+    public static func attribute<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>) -> SelectTerm<O> {
         
-        return self.attribute(D.meta[keyPath: keyPath].keyPath)
+        return self.attribute(O.meta[keyPath: keyPath].keyPath)
     }
     
     /**
@@ -399,9 +405,9 @@ extension SelectTerm where D: CoreStoreObject {
      - parameter keyPath: the attribute name
      - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
      */
-    public static func attribute<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<V>>) -> SelectTerm<D> {
+    public static func attribute<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<V>>) -> SelectTerm<O> {
         
-        return self.attribute(D.meta[keyPath: keyPath].keyPath)
+        return self.attribute(O.meta[keyPath: keyPath].keyPath)
     }
     
     /**
@@ -409,9 +415,9 @@ extension SelectTerm where D: CoreStoreObject {
      - parameter keyPath: the attribute name
      - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
      */
-    public static func attribute<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<V>>) -> SelectTerm<D> {
+    public static func attribute<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> SelectTerm<O> {
         
-        return self.attribute(D.meta[keyPath: keyPath].keyPath)
+        return self.attribute(O.meta[keyPath: keyPath].keyPath)
     }
     
     /**
@@ -420,9 +426,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func average<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.average(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.average(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -431,9 +437,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func average<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.average(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.average(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -442,9 +448,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func average<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.average(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.average(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -453,9 +459,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func average<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.average(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.average(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -464,10 +470,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        ValueContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func count<V>(_ keyPath: KeyPath<O,
+        ValueContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.count(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.count(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -476,10 +482,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        ValueContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func count<V>(_ keyPath: KeyPath<O,
+        ValueContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.count(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.count(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -488,10 +494,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        TransformableContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func count<V>(_ keyPath: KeyPath<O,
+        TransformableContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.count(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.count(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -500,10 +506,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        TransformableContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func count<V>(_ keyPath: KeyPath<O,
+        TransformableContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.count(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.count(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -512,10 +518,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        ValueContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func maximum<V>(_ keyPath: KeyPath<O,
+        ValueContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.maximum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.maximum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -524,10 +530,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        ValueContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func maximum<V>(_ keyPath: KeyPath<O,
+        ValueContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.maximum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.maximum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -536,10 +542,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        TransformableContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func maximum<V>(_ keyPath: KeyPath<O,
+        TransformableContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.maximum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.maximum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -548,10 +554,10 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D,
-        TransformableContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func maximum<V>(_ keyPath: KeyPath<O,
+        TransformableContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.maximum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.maximum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -560,9 +566,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func minimum<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.minimum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.minimum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -571,9 +577,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func minimum<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.minimum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.minimum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -582,9 +588,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func minimum<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.minimum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.minimum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -593,9 +599,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func minimum<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.minimum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.minimum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -604,9 +610,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func sum<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.sum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.sum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -615,9 +621,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func sum<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.sum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.sum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -626,9 +632,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func sum<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.sum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.sum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
     
     /**
@@ -637,9 +643,9 @@ extension SelectTerm where D: 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<V>(_ keyPath: KeyPath<D, TransformableContainer<D>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<D> {
+    public static func sum<V>(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<V>>, as alias: KeyPathString? = nil) -> SelectTerm<O> {
         
-        return self.sum(D.meta[keyPath: keyPath].keyPath, as: alias)
+        return self.sum(O.meta[keyPath: keyPath].keyPath, as: alias)
     }
 }
 
@@ -672,7 +678,7 @@ extension SelectTerm where D: CoreStoreObject {
  
  - parameter sortDescriptors: a series of `NSSortDescriptor`s
  */
-public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hashable {
+public struct Select<O: DynamicObject, T: SelectResultType>: SelectClause, Hashable {
     
     /**
      Initializes a `Select` clause with a list of `SelectTerm`s
@@ -680,7 +686,7 @@ public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hasha
      - parameter selectTerm: a `SelectTerm`
      - parameter selectTerms: a series of `SelectTerm`s
      */
-    public init(_ selectTerm: SelectTerm<D>, _ selectTerms: SelectTerm<D>...) {
+    public init(_ selectTerm: SelectTerm<O>, _ selectTerms: SelectTerm<O>...) {
         
         self.selectTerms = [selectTerm] + selectTerms
     }
@@ -690,7 +696,7 @@ public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hasha
      
      - parameter selectTerms: a series of `SelectTerm`s
      */
-    public init(_ selectTerms: [SelectTerm<D>]) {
+    public init(_ selectTerms: [SelectTerm<O>]) {
         
         self.selectTerms = selectTerms
     }
@@ -698,7 +704,7 @@ public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hasha
     
     // MARK: Equatable
     
-    public static func == <T, U>(lhs: Select<D, T>, rhs: Select<D, U>) -> Bool {
+    public static func == <T, U>(lhs: Select<O, T>, rhs: Select<O, U>) -> Bool {
         
         return lhs.selectTerms == rhs.selectTerms
     }
@@ -706,10 +712,10 @@ public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hasha
     
     // MARK: SelectClause
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     public typealias ReturnType = T
     
-    public let selectTerms: [SelectTerm<D>]
+    public let selectTerms: [SelectTerm<O>]
     
     
     // MARK: Hashable
@@ -806,6 +812,12 @@ public struct Select<D: DynamicObject, T: SelectResultType>: SelectClause, Hasha
         
         fetchRequest.propertiesToFetch = propertiesToFetch
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 extension Select where T: NSManagedObjectID {
@@ -819,25 +831,25 @@ extension Select where T: NSManagedObjectID {
     }
 }
 
-extension Select where D: NSManagedObject {
+extension Select where O: NSManagedObject {
     
     /**
      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<D, T>) {
+    public init(_ keyPath: KeyPath<O, T>) {
         
         self.init(.attribute(keyPath))
     }
 }
 
-extension Select where D: CoreStoreObject, T: ImportableAttributeType {
+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<D, ValueContainer<D>.Required<T>>) {
+    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Required<T>>) {
         
         self.init(.attribute(keyPath))
     }
@@ -846,19 +858,19 @@ extension Select where D: 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<D, ValueContainer<D>.Optional<T>>) {
+    public init(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<T>>) {
         
         self.init(.attribute(keyPath))
     }
 }
 
-extension Select where D: CoreStoreObject, T: ImportableAttributeType & NSCoding & NSCopying {
+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<D, TransformableContainer<D>.Required<T>>) {
+    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Required<T>>) {
         
         self.init(.attribute(keyPath))
     }
@@ -867,7 +879,7 @@ extension Select where D: CoreStoreObject, T: ImportableAttributeType & NSCoding
      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<D, TransformableContainer<D>.Optional<T>>) {
+    public init(_ keyPath: KeyPath<O, TransformableContainer<O>.Optional<T>>) {
         
         self.init(.attribute(keyPath))
     }
diff --git a/Sources/SynchronousDataTransaction.swift b/Sources/SynchronousDataTransaction.swift
index 9044de8..1ad24f8 100644
--- a/Sources/SynchronousDataTransaction.swift
+++ b/Sources/SynchronousDataTransaction.swift
@@ -55,7 +55,7 @@ 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<D>(_ into: Into<D>) -> D {
+    public override func create<O>(_ into: Into<O>) -> O {
         
         Internals.assert(
             !self.isCommitted,
@@ -71,7 +71,7 @@ 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<D: DynamicObject>(_ object: D?) -> D? {
+    public override func edit<O: DynamicObject>(_ object: O?) -> O? {
         
         Internals.assert(
             !self.isCommitted,
@@ -88,7 +88,7 @@ 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<D>(_ into: Into<D>, _ objectID: NSManagedObjectID) -> D? {
+    public override func edit<O>(_ into: Into<O>, _ objectID: NSManagedObjectID) -> O? {
         
         Internals.assert(
             !self.isCommitted,
diff --git a/Sources/UnsafeDataTransaction+Observing.swift b/Sources/UnsafeDataTransaction+Observing.swift
index 72bd683..389df8e 100644
--- a/Sources/UnsafeDataTransaction+Observing.swift
+++ b/Sources/UnsafeDataTransaction+Observing.swift
@@ -50,7 +50,7 @@ extension UnsafeDataTransaction {
      - 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<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public func monitorList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return self.monitorList(from, fetchClauses)
     }
@@ -62,10 +62,10 @@ extension UnsafeDataTransaction {
      - 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<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public func monitorList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         Internals.assert(
-            fetchClauses.filter { $0 is OrderBy<D> }.count > 0,
+            fetchClauses.filter { $0 is OrderBy<O> }.count > 0,
             "A ListMonitor requires an OrderBy clause."
         )
         
@@ -109,7 +109,7 @@ extension UnsafeDataTransaction {
      - 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: FetchClause...) {
+    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: FetchClause...) {
         
         self.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
     }
@@ -121,10 +121,10 @@ extension UnsafeDataTransaction {
      - 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ fetchClauses: [FetchClause])  {
+    public func monitorList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ fetchClauses: [FetchClause])  {
         
         Internals.assert(
-            fetchClauses.filter { $0 is OrderBy<D> }.count > 0,
+            fetchClauses.filter { $0 is OrderBy<O> }.count > 0,
             "A ListMonitor requires an OrderBy clause."
         )
         
@@ -173,7 +173,7 @@ extension UnsafeDataTransaction {
      - 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<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) -> ListMonitor<D> {
+    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) -> ListMonitor<O> {
         
         return self.monitorSectionedList(from, sectionBy, fetchClauses)
     }
@@ -186,10 +186,10 @@ extension UnsafeDataTransaction {
      - 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<D>(_ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) -> ListMonitor<D> {
+    public func monitorSectionedList<O>(_ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) -> ListMonitor<O> {
         
         Internals.assert(
-            fetchClauses.filter { $0 is OrderBy<D> }.count > 0,
+            fetchClauses.filter { $0 is OrderBy<O> }.count > 0,
             "A ListMonitor requires an OrderBy clause."
         )
         
@@ -234,7 +234,7 @@ extension UnsafeDataTransaction {
      - 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: FetchClause...) {
+    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: FetchClause...) {
         
         self.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
     }
@@ -247,10 +247,10 @@ extension UnsafeDataTransaction {
      - 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<D>(createAsynchronously: @escaping (ListMonitor<D>) -> Void, _ from: From<D>, _ sectionBy: SectionBy<D>, _ fetchClauses: [FetchClause]) {
+    public func monitorSectionedList<O>(createAsynchronously: @escaping (ListMonitor<O>) -> Void, _ from: From<O>, _ sectionBy: SectionBy<O>, _ fetchClauses: [FetchClause]) {
         
         Internals.assert(
-            fetchClauses.filter { $0 is OrderBy<D> }.count > 0,
+            fetchClauses.filter { $0 is OrderBy<O> }.count > 0,
             "A ListMonitor requires an OrderBy clause."
         )
         
diff --git a/Sources/Where.Expression.swift b/Sources/Where.Expression.swift
index c4b5685..8cb7cb8 100644
--- a/Sources/Where.Expression.swift
+++ b/Sources/Where.Expression.swift
@@ -80,7 +80,7 @@ extension Where {
 
         // MARK: KeyPathStringConvertible
 
-        public typealias ObjectType = D
+        public typealias ObjectType = O
         public typealias DestinationValueType = V
 
 
@@ -103,6 +103,12 @@ extension Where {
 
             self.cs_keyPathString = component1 + "." + component2
         }
+        
+        
+        // MARK: Deprecated
+
+        @available(*, deprecated, renamed: "O")
+        public typealias D = O
     }
 
 
@@ -133,7 +139,7 @@ extension Where {
  let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func ~<D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<D, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.SingleTarget, V> {
+public func ~<O: NSManagedObject, D: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<O, D>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.SingleTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -144,7 +150,7 @@ public func ~<D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPat
  let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<D, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.SingleTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, V: AllowedObjectiveCKeyPathValue>(_ lhs: KeyPath<O, D?>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.SingleTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -155,7 +161,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCKeyPa
  let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<D, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<O, D>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.CollectionTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -166,7 +172,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToMan
  let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<D, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: KeyPath<O, D?>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.CollectionTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -177,7 +183,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, V: AllowedObjectiveCToMan
  let johnsSonInLaw = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<T, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<O>.Expression<T, D>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<T, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -188,7 +194,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKe
  let johnsSonInLaw = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.name) == "John"))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<T, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, T, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<O>.Expression<T, D?>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<T, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -199,7 +205,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCKe
  let spouseHasSiblings = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<O>.Expression<T, D>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.CollectionTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -210,7 +216,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCTo
  let spouseHasSiblings = dataStack.fetchOne(From<Person>().where((\.spouse ~ \.father ~ \.children).count() > 0))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, T, V: AllowedObjectiveCToManyRelationshipKeyPathValue>(_ lhs: Where<O>.Expression<T, D?>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.CollectionTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -221,7 +227,7 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, V: AllowedObjectiveCTo
  let spousesWithBadNamingSense = dataStack.fetchAll(From<Person>().where((\.spouse ~ \.pets ~ \.name).any() == "Spot"))
  ```
  */
-public func ~ <D: NSManagedObject, O: NSManagedObject, T, C: AllowedObjectiveCToManyRelationshipKeyPathValue, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<D>.Expression<T, C>, _ rhs: KeyPath<O, V>) -> Where<D>.Expression<Where<D>.CollectionTarget, V> {
+public func ~ <O: NSManagedObject, D: NSManagedObject, T, C: AllowedObjectiveCToManyRelationshipKeyPathValue, V: AllowedObjectiveCKeyPathValue>(_ lhs: Where<O>.Expression<T, C>, _ rhs: KeyPath<D, V>) -> Where<O>.Expression<Where<O>.CollectionTarget, V> {
 
     return .init(lhs.cs_keyPathString, rhs.cs_keyPathString)
 }
@@ -235,11 +241,11 @@ public func ~ <D: NSManagedObject, O: NSManagedObject, T, C: AllowedObjectiveCTo
  let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: KeyPathStringConvertible>(_ lhs: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.SingleTarget, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, K: KeyPathStringConvertible>(_ lhs: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<Where<O>.SingleTarget, K.DestinationValueType> where K.ObjectType == D {
 
     return .init(
-        D.meta[keyPath: lhs].cs_keyPathString, 
-        O.meta[keyPath: rhs].cs_keyPathString
+        O.meta[keyPath: lhs].cs_keyPathString,
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -249,11 +255,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: KeyPathStringConvertib
  let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<T, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<O>.Expression<T, D>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<T, K.DestinationValueType> where K.ObjectType == D {
 
     return .init(
         lhs.cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -263,11 +269,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConver
  let owner = dataStack.fetchOne(From<Pet>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<T, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, T, K: KeyPathStringConvertible>(_ lhs: Where<O>.Expression<T, D?>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<T, K.DestinationValueType> where K.ObjectType == D {
 
     return .init(
         lhs.cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -277,11 +283,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: KeyPathStringConver
  let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<Where<O>.CollectionTarget, K.DestinationValueType> where K.ObjectType == D {
 
     return .init(
-        D.meta[keyPath: lhs].cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        O.meta[keyPath: lhs].cs_keyPathString,
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -291,11 +297,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, K: ToManyRelationshipKeyP
  let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<O>.Expression<T, D>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<Where<O>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
 
     return .init(
         lhs.cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -305,11 +311,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipK
  let happyPets = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets).count() > 1))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, O?>, _ rhs: KeyPath<O, K>) -> Where<D>.Expression<Where<D>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, T, K: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<O>.Expression<T, D?>, _ rhs: KeyPath<D, K>) -> Where<O>.Expression<Where<O>.CollectionTarget, K.DestinationValueType> where K.ObjectType == O {
 
     return .init(
         lhs.cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -319,11 +325,11 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, K: ToManyRelationshipK
  let spousesWithBadNamingSense = dataStack.fetchAll(From<Pet>().where((\.master ~ \.pets ~ \.name).any() == "Spot"))
  ```
  */
-public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, KC: ToManyRelationshipKeyPathStringConvertible, KV: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<D>.Expression<T, KC>, _ rhs: KeyPath<O, KV>) -> Where<D>.Expression<Where<D>.CollectionTarget, KV.DestinationValueType> where KC.ObjectType == D, KV.ObjectType == O {
+public func ~ <O: CoreStoreObject, D: CoreStoreObject, T, KC: ToManyRelationshipKeyPathStringConvertible, KV: ToManyRelationshipKeyPathStringConvertible>(_ lhs: Where<O>.Expression<T, KC>, _ rhs: KeyPath<D, KV>) -> Where<O>.Expression<Where<O>.CollectionTarget, KV.DestinationValueType> where KC.ObjectType == O, KV.ObjectType == D {
 
     return .init(
         lhs.cs_keyPathString,
-        O.meta[keyPath: rhs].cs_keyPathString
+        D.meta[keyPath: rhs].cs_keyPathString
     )
 }
 
@@ -336,9 +342,9 @@ public func ~ <D: CoreStoreObject, O: CoreStoreObject, T, KC: ToManyRelationship
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func == <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -347,9 +353,9 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
-public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func != <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return !Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return !Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -358,9 +364,9 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
  ```
  */
-public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<D>.Expression<T, V>) -> Where<D> where S.Iterator.Element == V {
+public func ~= <O, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<O>.Expression<T, V>) -> Where<O> where S.Iterator.Element == V {
 
-    return Where<D>(expression.cs_keyPathString, isMemberOf: sequence)
+    return Where<O>(expression.cs_keyPathString, isMemberOf: sequence)
 }
 
 
@@ -372,9 +378,9 @@ public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ e
  let lonelyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() < 2))
  ```
  */
-public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func < <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return  Where<D>(expression: lhs, function: "<", operand: rhs)
+    return  Where<O>(expression: lhs, function: "<", operand: rhs)
 }
 
 /**
@@ -383,9 +389,9 @@ public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
  let lonelyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() <= 1)
  ```
  */
-public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func <= <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return  Where<D>(expression: lhs, function: "<=", operand: rhs)
+    return  Where<O>(expression: lhs, function: "<=", operand: rhs)
 }
 
 /**
@@ -394,9 +400,9 @@ public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
  let happyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() > 1)
  ```
  */
-public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func > <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return  Where<D>(expression: lhs, function: ">", operand: rhs)
+    return  Where<O>(expression: lhs, function: ">", operand: rhs)
 }
 
 /**
@@ -405,9 +411,9 @@ public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
  let happyDog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.pets).count() >= 2)
  ```
  */
-public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V>, _ rhs: V) -> Where<D> {
+public func >= <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V>, _ rhs: V) -> Where<O> {
 
-    return  Where<D>(expression: lhs, function: ">=", operand: rhs)
+    return  Where<O>(expression: lhs, function: ">=", operand: rhs)
 }
 
 
@@ -419,9 +425,9 @@ public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
+public func == <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V) -> Where<O> {
 
-    return Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -430,9 +436,9 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) == "John"))
  ```
  */
-public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
+public func == <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V?) -> Where<O> {
 
-    return Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -441,9 +447,9 @@ public func == <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
-public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
+public func != <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V) -> Where<O> {
 
-    return !Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return !Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -452,9 +458,9 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where((\.master ~ \.name) != "John"))
  ```
  */
-public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
+public func != <O, T, V: QueryableAttributeType>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V?) -> Where<O> {
 
-    return !Where<D>(lhs.cs_keyPathString, isEqualTo: rhs)
+    return !Where<O>(lhs.cs_keyPathString, isEqualTo: rhs)
 }
 
 /**
@@ -463,9 +469,9 @@ public func != <D, T, V: QueryableAttributeType>(_ lhs: Where<D>.Expression<T, V
  let dog = dataStack.fetchOne(From<Dog>().where(["John", "Joe"] ~= (\.master ~ \.name))
  ```
  */
-public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<D>.Expression<T, V?>) -> Where<D> where S.Iterator.Element == V {
+public func ~= <O, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ expression: Where<O>.Expression<T, V?>) -> Where<O> where S.Iterator.Element == V {
 
-    return Where<D>(expression.cs_keyPathString, isMemberOf: sequence)
+    return Where<O>(expression.cs_keyPathString, isMemberOf: sequence)
 }
 
 
@@ -477,9 +483,9 @@ public func ~= <D, T, V: QueryableAttributeType, S: Sequence>(_ sequence: S, _ e
  let childsPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) < 10))
  ```
  */
-public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
+public func < <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V) -> Where<O> {
 
-    return Where<D>(expression: lhs, function: "<", operand: rhs)
+    return Where<O>(expression: lhs, function: "<", operand: rhs)
 }
 
 /**
@@ -488,9 +494,9 @@ public func < <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
  let childsPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) <= 10))
  ```
  */
-public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
+public func <= <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V?) -> Where<O> {
 
-    return Where<D>(expression: lhs, function: "<=", operand: rhs)
+    return Where<O>(expression: lhs, function: "<=", operand: rhs)
 }
 
 /**
@@ -499,9 +505,9 @@ public func <= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Ex
  let teensPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) > 10))
  ```
  */
-public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V) -> Where<D> {
+public func > <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V) -> Where<O> {
 
-    return Where<D>(expression: lhs, function: ">", operand: rhs)
+    return Where<O>(expression: lhs, function: ">", operand: rhs)
 }
 
 /**
@@ -510,9 +516,9 @@ public func > <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Exp
  let teensPet = dataStack.fetchOne(From<Dog>().where((\.master ~ \.age) >= 10))
  ```
  */
-public func >= <D, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<D>.Expression<T, V?>, _ rhs: V?) -> Where<D> {
+public func >= <O, T, V: QueryableAttributeType & Comparable>(_ lhs: Where<O>.Expression<T, V?>, _ rhs: V?) -> Where<O> {
 
-    return Where<D>(expression: lhs, function: ">=", operand: rhs)
+    return Where<O>(expression: lhs, function: ">=", operand: rhs)
 }
 
 
@@ -532,9 +538,9 @@ extension KeyPath where Root: NSManagedObject, Value: AllowedObjectiveCToManyRel
     }
 }
 
-// MARK: - Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTarget, V: AllowedObjectiveCToManyRelationshipKeyPathValue
+// MARK: - Where.Expression where O: NSManagedObject, T == Where<O>.CollectionTarget, V: AllowedObjectiveCToManyRelationshipKeyPathValue
 
-extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTarget, V: AllowedObjectiveCToManyRelationshipKeyPathValue {
+extension Where.Expression where O: NSManagedObject, T == Where<O>.CollectionTarget, V: AllowedObjectiveCToManyRelationshipKeyPathValue {
 
     /**
      Creates a `Where.Expression` clause for COUNT
@@ -542,16 +548,16 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
      let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
-    public func count() -> Where<D>.Expression<T, Int> {
+    public func count() -> Where<O>.Expression<T, Int> {
 
         return .init(self.cs_keyPathString, "@count")
     }
 }
 
 
-// MARK: - Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTarget, V: AllowedObjectiveCKeyPathValue
+// MARK: - Where.Expression where O: NSManagedObject, T == Where<O>.CollectionTarget, V: AllowedObjectiveCKeyPathValue
 
-extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTarget, V: AllowedObjectiveCKeyPathValue {
+extension Where.Expression where O: NSManagedObject, T == Where<O>.CollectionTarget, V: AllowedObjectiveCKeyPathValue {
 
     /**
      Creates a `Where.Expression` clause for ANY
@@ -559,7 +565,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
      let dogsWithBadNamingSense = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
-    public func any() -> Where<D>.Expression<T, V> {
+    public func any() -> Where<O>.Expression<T, V> {
 
         return .init("ANY " + self.cs_keyPathString)
     }
@@ -570,7 +576,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
      let allPlaymatePuppies = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
      ```
      */
-    public func all() -> Where<D>.Expression<T, V> {
+    public func all() -> Where<O>.Expression<T, V> {
 
         return .init("ALL " + self.cs_keyPathString)
     }
@@ -581,7 +587,7 @@ extension Where.Expression where D: NSManagedObject, T == Where<D>.CollectionTar
      let dogs = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
-    public func none() -> Where<D>.Expression<T, V> {
+    public func none() -> Where<O>.Expression<T, V> {
 
         return .init("NONE " + self.cs_keyPathString)
     }
@@ -605,9 +611,9 @@ extension KeyPath where Root: CoreStoreObject, Value: ToManyRelationshipKeyPathS
 }
 
 
-// MARK: - Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTarget
+// MARK: - Where.Expression where O: CoreStoreObject, T == Where<O>.CollectionTarget
 
-extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTarget {
+extension Where.Expression where O: CoreStoreObject, T == Where<O>.CollectionTarget {
 
     /**
      Creates a `Where.Expression` clause for COUNT
@@ -615,7 +621,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
      let dogsWithPlaymates = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets).count() > 1))
      ```
      */
-    public func count() -> Where<D>.Expression<T, Int> {
+    public func count() -> Where<O>.Expression<T, Int> {
 
         return .init(self.cs_keyPathString, "@count")
     }
@@ -626,7 +632,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
      let dogsWithBadNamingSense = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
-    public func any() -> Where<D>.Expression<T, V> {
+    public func any() -> Where<O>.Expression<T, V> {
 
         return .init("ANY " + self.cs_keyPathString)
     }
@@ -637,7 +643,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
      let allPlaymatePuppies = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.age).all() > 5))
      ```
      */
-    public func all() -> Where<D>.Expression<T, V> {
+    public func all() -> Where<O>.Expression<T, V> {
 
         return .init("ALL " + self.cs_keyPathString)
     }
@@ -648,7 +654,7 @@ extension Where.Expression where D: CoreStoreObject, T == Where<D>.CollectionTar
      let dogs = dataStack.fetchAll(From<Dog>().where((\.master ~ \.pets ~ \.name).any() > "Spot"))
      ```
      */
-    public func none() -> Where<D>.Expression<T, V> {
+    public func none() -> Where<O>.Expression<T, V> {
 
         return .init("NONE " + self.cs_keyPathString)
     }
@@ -661,17 +667,17 @@ extension Where {
 
     // MARK: FilePrivate
 
-    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<D>.Expression<T, V>, function: String, operand: V) {
+    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<O>.Expression<T, V>, function: String, operand: V) {
 
         self.init("\(expression.cs_keyPathString) \(function) %@", operand.cs_toQueryableNativeType())
     }
 
-    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<D>.Expression<T, V?>, function: String, operand: V) {
+    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<O>.Expression<T, V?>, function: String, operand: V) {
 
         self.init("\(expression.cs_keyPathString) \(function) %@", operand.cs_toQueryableNativeType())
     }
 
-    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<D>.Expression<T, V>, function: String, operand: V?) {
+    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<O>.Expression<T, V>, function: String, operand: V?) {
 
         if let operand = operand {
 
@@ -683,7 +689,7 @@ extension Where {
         }
     }
 
-    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<D>.Expression<T, V?>, function: String, operand: V?) {
+    fileprivate init<T, V: QueryableAttributeType & Comparable>(expression: Where<O>.Expression<T, V?>, function: String, operand: V?) {
 
         if let operand = operand {
 
diff --git a/Sources/Where.swift b/Sources/Where.swift
index b882fce..9c01106 100644
--- a/Sources/Where.swift
+++ b/Sources/Where.swift
@@ -36,37 +36,37 @@ infix operator ||? : LogicalConjunctionPrecedence
 /**
  The `Where` clause specifies the conditions for a fetch or a query.
  */
-public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause, DeleteClause, Hashable {
+public struct Where<O: DynamicObject>: WhereClauseType, FetchClause, QueryClause, DeleteClause, Hashable {
     
     /**
      Combines two `Where` predicates together using `AND` operator
      */
-    public static func && (left: Where<D>, right: Where<D>) -> Where<D> {
+    public static func && (left: Where<O>, right: Where<O>) -> Where<O> {
         
-        return Where<D>(NSCompoundPredicate(type: .and, subpredicates: [left.predicate, right.predicate]))
+        return Where<O>(NSCompoundPredicate(type: .and, subpredicates: [left.predicate, right.predicate]))
     }
 
     /**
      Combines two `Where` predicates together using `OR` operator
      */
-    public static func || (left: Where<D>, right: Where<D>) -> Where<D> {
+    public static func || (left: Where<O>, right: Where<O>) -> Where<O> {
         
-        return Where<D>(NSCompoundPredicate(type: .or, subpredicates: [left.predicate, right.predicate]))
+        return Where<O>(NSCompoundPredicate(type: .or, subpredicates: [left.predicate, right.predicate]))
     }
     
     /**
      Inverts the predicate of a `Where` clause using `NOT` operator
      */
-    public static prefix func ! (clause: Where<D>) -> Where<D> {
+    public static prefix func ! (clause: Where<O>) -> Where<O> {
         
-        return Where<D>(NSCompoundPredicate(type: .not, subpredicates: [clause.predicate]))
+        return Where<O>(NSCompoundPredicate(type: .not, subpredicates: [clause.predicate]))
     }
         
     /**
      Combines two `Where` predicates together using `AND` operator.
      - returns: `left` if `right` is `nil`, otherwise equivalent to `(left && right)`
      */
-    public static func &&? (left: Where<D>, right: Where<D>?) -> Where<D> {
+    public static func &&? (left: Where<O>, right: Where<O>?) -> Where<O> {
         
         if let right = right {
             
@@ -79,7 +79,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
      Combines two `Where` predicates together using `AND` operator.
      - returns: `right` if `left` is `nil`, otherwise equivalent to `(left && right)`
      */
-    public static func &&? (left: Where<D>?, right: Where<D>) -> Where<D> {
+    public static func &&? (left: Where<O>?, right: Where<O>) -> Where<O> {
         
         if let left = left {
             
@@ -92,7 +92,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
      Combines two `Where` predicates together using `OR` operator.
      - returns: `left` if `right` is `nil`, otherwise equivalent to `(left || right)`
      */
-    public static func ||? (left: Where<D>, right: Where<D>?) -> Where<D> {
+    public static func ||? (left: Where<O>, right: Where<O>?) -> Where<O> {
         
         if let right = right {
             
@@ -105,7 +105,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
      Combines two `Where` predicates together using `OR` operator.
      - returns: `right` if `left` is `nil`, otherwise equivalent to `(left || right)`
      */
-    public static func ||? (left: Where<D>?, right: Where<D>) -> Where<D> {
+    public static func ||? (left: Where<O>?, right: Where<O>) -> Where<O> {
         
         if let left = left {
             
@@ -127,7 +127,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
 
      - parameter clause: the existing `Where` clause.
      */
-    public init(_ clause: Where<D>) {
+    public init(_ clause: Where<O>) {
 
         self.init(clause.predicate)
     }
@@ -200,7 +200,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
      - parameter keyPath: the keyPath to compare with
      - parameter object: the arguments for the `==` operator
      */
-    public init<D: DynamicObject>(_ keyPath: KeyPathString, isEqualTo object: D?) {
+    public init<O: DynamicObject>(_ keyPath: KeyPathString, isEqualTo object: O?) {
         
         switch object {
             
@@ -269,7 +269,7 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
     
     // MARK: WhereClauseType
     
-    public typealias ObjectType = D
+    public typealias ObjectType = O
     
     
     // MARK: FetchClause, QueryClause, DeleteClause
@@ -302,12 +302,18 @@ public struct Where<D: DynamicObject>: WhereClauseType, FetchClause, QueryClause
 
         hasher.combine(self.predicate)
     }
+    
+    
+    // MARK: Deprecated
+
+    @available(*, deprecated, renamed: "O")
+    public typealias D = O
 }
 
 
-// MARK: - Where where D: NSManagedObject
+// MARK: - Where where O: NSManagedObject
 
-extension Where where D: NSManagedObject {
+extension Where where O: NSManagedObject {
     
     /**
      Initializes a `Where` clause that compares equality to `nil`
@@ -315,7 +321,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter null: the arguments for the `==` operator
      */
-    public init<V: QueryableAttributeType>(_ keyPath: KeyPath<D, V>, isEqualTo null: Void?) {
+    public init<V: QueryableAttributeType>(_ keyPath: KeyPath<O, V>, isEqualTo null: Void?) {
         
         self.init(keyPath._kvcKeyPathString!, isEqualTo: null)
     }
@@ -326,7 +332,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter null: the arguments for the `==` operator
      */
-    public init<O: DynamicObject>(_ keyPath: KeyPath<D, O>, isEqualTo null: Void?) {
+    public init<D: DynamicObject>(_ keyPath: KeyPath<O, D>, isEqualTo null: Void?) {
         
         self.init(keyPath._kvcKeyPathString!, isEqualTo: null)
     }
@@ -337,7 +343,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init<V: QueryableAttributeType>(_ keyPath: KeyPath<D, V>, isEqualTo value: V?) {
+    public init<V: QueryableAttributeType>(_ keyPath: KeyPath<O, V>, isEqualTo value: V?) {
         
         self.init(keyPath._kvcKeyPathString!, isEqualTo: value)
     }
@@ -348,7 +354,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init<O: DynamicObject>(_ keyPath: KeyPath<D, O>, isEqualTo value: O?) {
+    public init<D: DynamicObject>(_ keyPath: KeyPath<O, D>, isEqualTo value: D?) {
         
         self.init(keyPath._kvcKeyPathString!, isEqualTo: value)
     }
@@ -359,7 +365,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter objectID: the arguments for the `==` operator
      */
-    public init<O: DynamicObject>(_ keyPath: KeyPath<D, O>, isEqualTo objectID: NSManagedObjectID) {
+    public init<D: DynamicObject>(_ keyPath: KeyPath<O, D>, isEqualTo objectID: NSManagedObjectID) {
         
         self.init(keyPath._kvcKeyPathString!, isEqualTo: objectID)
     }
@@ -370,7 +376,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<V: QueryableAttributeType, S: Sequence>(_ keyPath: KeyPath<D, V>, isMemberOf list: S) where S.Iterator.Element == V {
+    public init<V: QueryableAttributeType, S: Sequence>(_ keyPath: KeyPath<O, V>, isMemberOf list: S) where S.Iterator.Element == V {
         
         self.init(keyPath._kvcKeyPathString!, isMemberOf: list)
     }
@@ -381,7 +387,7 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<O: DynamicObject, S: Sequence>(_ keyPath: KeyPath<D, O>, isMemberOf list: S) where S.Iterator.Element == O {
+    public init<D: DynamicObject, S: Sequence>(_ keyPath: KeyPath<O, D>, isMemberOf list: S) where S.Iterator.Element == D {
         
         self.init(keyPath._kvcKeyPathString!, isMemberOf: list)
     }
@@ -392,16 +398,16 @@ extension Where where D: NSManagedObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<O: DynamicObject, S: Sequence>(_ keyPath: KeyPath<D, O>, isMemberOf list: S) where S.Iterator.Element: NSManagedObjectID {
+    public init<D: DynamicObject, S: Sequence>(_ keyPath: KeyPath<D, O>, isMemberOf list: S) where S.Iterator.Element: NSManagedObjectID {
         
         self.init(keyPath._kvcKeyPathString!, isMemberOf: list)
     }
 }
 
 
-// MARK: - Where where D: CoreStoreObject
+// MARK: - Where where O: CoreStoreObject
 
-extension Where where D: CoreStoreObject {
+extension Where where O: CoreStoreObject {
     
     /**
      Initializes a `Where` clause that compares equality to `nil`
@@ -409,9 +415,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter null: the arguments for the `==` operator
      */
-    public init<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, isEqualTo null: Void?) {
+    public init<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, isEqualTo null: Void?) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: null)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: null)
     }
     
     /**
@@ -420,9 +426,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter null: the arguments for the `==` operator
      */
-    public init<O>(_ keyPath: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, isEqualTo null: Void?) {
+    public init<D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, isEqualTo null: Void?) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: null)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: null)
     }
     
     /**
@@ -431,9 +437,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>, isEqualTo value: V?) {
+    public init<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, isEqualTo value: V?) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: value)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: value)
     }
     
     /**
@@ -442,9 +448,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init<V>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, isEqualTo value: V?) {
+    public init<V>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, isEqualTo value: V?) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: value)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: value)
     }
     
     /**
@@ -453,9 +459,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter value: the arguments for the `==` operator
      */
-    public init<O>(_ keyPath: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, isEqualTo value: O?) {
+    public init<D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, isEqualTo value: D?) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: value)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: value)
     }
     
     /**
@@ -464,9 +470,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter objectID: the arguments for the `==` operator
      */
-    public init<O>(_ keyPath: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, isEqualTo objectID: NSManagedObjectID) {
+    public init<D>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, isEqualTo objectID: NSManagedObjectID) {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isEqualTo: objectID)
+        self.init(O.meta[keyPath: keyPath].keyPath, isEqualTo: objectID)
     }
     
     /**
@@ -475,9 +481,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<V, S: Sequence>(_ keyPath: KeyPath<D, ValueContainer<D>.Required<V>>, isMemberOf list: S) where S.Iterator.Element == V {
+    public init<V, S: Sequence>(_ keyPath: KeyPath<O, ValueContainer<O>.Required<V>>, isMemberOf list: S) where S.Iterator.Element == V {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isMemberOf: list)
+        self.init(O.meta[keyPath: keyPath].keyPath, isMemberOf: list)
     }
     
     /**
@@ -486,9 +492,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<V, S: Sequence>(_ keyPath: KeyPath<D, ValueContainer<D>.Optional<V>>, isMemberOf list: S) where S.Iterator.Element == V {
+    public init<V, S: Sequence>(_ keyPath: KeyPath<O, ValueContainer<O>.Optional<V>>, isMemberOf list: S) where S.Iterator.Element == V {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isMemberOf: list)
+        self.init(O.meta[keyPath: keyPath].keyPath, isMemberOf: list)
     }
     
     /**
@@ -497,9 +503,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<O, S: Sequence>(_ keyPath: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, isMemberOf list: S) where S.Iterator.Element == O {
+    public init<D, S: Sequence>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, isMemberOf list: S) where S.Iterator.Element == D {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isMemberOf: list)
+        self.init(O.meta[keyPath: keyPath].keyPath, isMemberOf: list)
     }
     
     /**
@@ -508,9 +514,9 @@ extension Where where D: CoreStoreObject {
      - parameter keyPath: the keyPath to compare with
      - parameter list: the sequence to check membership of
      */
-    public init<O, S: Sequence>(_ keyPath: KeyPath<D, RelationshipContainer<D>.ToOne<O>>, isMemberOf list: S) where S.Iterator.Element: NSManagedObjectID {
+    public init<D, S: Sequence>(_ keyPath: KeyPath<O, RelationshipContainer<O>.ToOne<D>>, isMemberOf list: S) where S.Iterator.Element: NSManagedObjectID {
         
-        self.init(D.meta[keyPath: keyPath].keyPath, isMemberOf: list)
+        self.init(O.meta[keyPath: keyPath].keyPath, isMemberOf: list)
     }
     
     /**
@@ -518,9 +524,9 @@ extension Where where D: CoreStoreObject {
      
      - parameter condition: closure that returns the `Where` clause
      */
-    public init(_ condition: (D) -> Where<D>) {
+    public init(_ condition: (O) -> Where<O>) {
         
-        self = condition(D.meta)
+        self = condition(O.meta)
     }
 }
 

From d971c3a2ac37ed923fe94f11b79e2090416e0104 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 22 Oct 2019 17:24:54 +0900
Subject: [PATCH 34/58] README bug

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ab8f30b..5433944 100644
--- a/README.md
+++ b/README.md
@@ -1404,9 +1404,9 @@ CoreStore provides type-safe wrappers for observing managed objects:
 | *Number of objects* | 1 | 1 | N | N |
 | *Allows multiple observers* | ✅ | ✅ | ✅ | ✅ |
 | *Emits fine-grained changes* | ❌ | ✅ | ❌ | ✅ |
-| *Emits DiffableDataSource snapshots* | ❌ | ✅ | ❌ | ✅ |
-| *Closure callback* | ✅ | ❌ | ✅ | ❌ |
+| *Emits DiffableDataSource snapshots* | ✅ | ❌ | ✅ | ❌ |
 | *Delegate methods* | ❌ | ✅ | ❌ | ✅ |
+| *Closure callback* | ✅ | ❌ | ✅ | ❌ |
 | *SwiftUI support* | ✅ | ❌ | ✅ | ❌ |
 
 ### Observe a single property

From f380d9dc25453df5a1985fef2f49ebae4afdbecb Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 12:36:13 +0900
Subject: [PATCH 35/58] ObjectSnapshot: allow dynamicMember keyPaths from
 superclasses

---
 Sources/ObjectPublisher.swift | 14 +++++++-------
 Sources/ObjectSnapshot.swift  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index 0b3aec1..be59366 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -354,7 +354,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>) -> V? {
 
         return self.object?[keyPath: member].value
     }
@@ -362,7 +362,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>) -> V? {
 
         return self.object?[keyPath: member].value
     }
@@ -370,7 +370,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>) -> V? {
 
         return self.object?[keyPath: member].value
     }
@@ -378,7 +378,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>) -> V? {
 
         return self.object?[keyPath: member].value
     }
@@ -386,7 +386,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D? {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> D? {
 
         return self.object?[keyPath: member].value
     }
@@ -394,7 +394,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D]? {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [D]? {
 
         return self.object?[keyPath: member].value
     }
@@ -402,7 +402,7 @@ extension ObjectPublisher where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D>? {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<D>? {
 
         return self.object?[keyPath: member].value
     }
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index dc94e1c..811cbda 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -146,7 +146,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Required<V>>) -> V {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Required<V>>) -> V {
 
         get {
 
@@ -163,7 +163,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, ValueContainer<O>.Optional<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, ValueContainer<OBase>.Optional<V>>) -> V? {
 
         get {
 
@@ -180,7 +180,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Required<V>>) -> V {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Required<V>>) -> V {
 
         get {
 
@@ -197,7 +197,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<V>(dynamicMember member: KeyPath<O, TransformableContainer<O>.Optional<V>>) -> V? {
+    public subscript<OBase, V>(dynamicMember member: KeyPath<O, TransformableContainer<OBase>.Optional<V>>) -> V? {
 
         get {
 
@@ -214,7 +214,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToOne<D>>) -> D.ObjectID? {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> D.ObjectID? {
 
         get {
 
@@ -231,7 +231,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyOrdered<D>>) -> [D.ObjectID] {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [D.ObjectID] {
 
         get {
 
@@ -248,7 +248,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<D>(dynamicMember member: KeyPath<O, RelationshipContainer<O>.ToManyUnordered<D>>) -> Set<D.ObjectID> {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<D.ObjectID> {
 
         get {
 

From 11a9e3991ca54a139ef47f1a75d09078789b3ab0 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 12:43:39 +0900
Subject: [PATCH 36/58] changed ListPublisher and ObjectPublisher factory
 method naming to match ListMonitor and ObjectMonitor naming

---
 Sources/DataStack+DataSources.swift | 67 ++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 11 deletions(-)

diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index cb3684a..cba6d2a 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -39,7 +39,7 @@ extension DataStack {
      - parameter object: the `DynamicObject` to observe changes from
      - returns: an `ObjectPublisher` that broadcasts changes to `object`
      */
-    public func objectPublisher<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
+    public func publishObject<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
 
         return ObjectPublisher<O>(objectID: object.cs_id(), context: self.unsafeContext())
     }
@@ -51,9 +51,9 @@ 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 listPublisher<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
+    public func publishList<O>(_ from: From<O>, _ fetchClauses: FetchClause...) -> ListPublisher<O> {
 
-        return self.listPublisher(from, fetchClauses)
+        return self.publishList(from, fetchClauses)
     }
     
     /**
@@ -63,7 +63,7 @@ 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 listPublisher<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
+    public func publishList<O>(_ from: From<O>, _ fetchClauses: [FetchClause]) -> ListPublisher<O> {
 
         return ListPublisher(
             dataStack: self,
@@ -99,9 +99,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 listPublisher<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
+    public func publishList<B: FetchChainableBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
-        return self.listPublisher(
+        return self.publishList(
             clauseChain.from,
             clauseChain.fetchClauses
         )
@@ -115,9 +115,9 @@ 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 listPublisher<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.listPublisher(
+        return self.publishList(
             from,
             sectionBy,
             fetchClauses
@@ -132,7 +132,7 @@ 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 listPublisher<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,
@@ -169,14 +169,59 @@ extension DataStack {
      - parameter clauseChain: a `SectionMonitorBuilderType` built from a chain of clauses
      - returns: a `ListPublisher` that broadcasts changes to the fetched results
      */
-    public func listPublisher<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
+    public func publishList<B: SectionMonitorBuilderType>(_ clauseChain: B) -> ListPublisher<B.ObjectType> {
 
-        return self.listPublisher(
+        return self.publishList(
             clauseChain.from,
             clauseChain.sectionBy,
             clauseChain.fetchClauses
         )
     }
+
+
+    // 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

From 98d860aff6d7cc3a157e615f59668b618884b493 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 14:34:22 +0900
Subject: [PATCH 37/58] Add unit tests for List and Object Publishers

---
 CoreStore.xcodeproj/project.pbxproj       |   8 +
 CoreStoreTests/ListPublisherTests.swift   | 825 ++++++----------------
 CoreStoreTests/ObjectPublisherTests.swift | 154 ++++
 3 files changed, 385 insertions(+), 602 deletions(-)
 create mode 100644 CoreStoreTests/ObjectPublisherTests.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 8227e2d..e216b98 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -522,6 +522,9 @@
 		B580857A1CDF808C004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; };
 		B580857B1CDF808D004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; };
 		B580857C1CDF808F004C2EEB /* SetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58085741CDF7F00004C2EEB /* SetupTests.swift */; };
+		B581B9322362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B581B9312362BB8C002BDB2B /* ObjectPublisherTests.swift */; };
+		B581B9332362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B581B9312362BB8C002BDB2B /* ObjectPublisherTests.swift */; };
+		B581B9342362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B581B9312362BB8C002BDB2B /* ObjectPublisherTests.swift */; };
 		B5831B701F34AC3400A9F647 /* AttributeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */; };
 		B5831B711F34AC3400A9F647 /* AttributeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */; };
 		B5831B721F34AC3400A9F647 /* AttributeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */; };
@@ -994,6 +997,7 @@
 		B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTestDataTestCase.swift; sourceTree = "<group>"; };
 		B57D27C11D0BC20100539C58 /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
 		B58085741CDF7F00004C2EEB /* SetupTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetupTests.swift; sourceTree = "<group>"; };
+		B581B9312362BB8C002BDB2B /* ObjectPublisherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectPublisherTests.swift; sourceTree = "<group>"; };
 		B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributeProtocol.swift; sourceTree = "<group>"; };
 		B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelationshipProtocol.swift; sourceTree = "<group>"; };
 		B5831B791F34ACBA00A9F647 /* Transformable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transformable.swift; sourceTree = "<group>"; };
@@ -1262,6 +1266,7 @@
 				B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */,
 				B5DC47C51C93D22900FA3BF3 /* MigrationChainTests.swift */,
 				B5220E071D0C5F8D009BC71E /* ObjectObserverTests.swift */,
+				B581B9312362BB8C002BDB2B /* ObjectPublisherTests.swift */,
 				B52557771D02826E00E51965 /* OrderByTests.swift */,
 				B57D27C11D0BC20100539C58 /* QueryTests.swift */,
 				B52557831D02A07400E51965 /* SectionByTests.swift */,
@@ -2285,6 +2290,7 @@
 				B5220E0C1D0D0D19009BC71E /* ImportTests.swift in Sources */,
 				B5D339B41E925C2B00C880DE /* DynamicModelTests.swift in Sources */,
 				B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */,
+				B581B9322362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */,
 				B52557881D02DE8100E51965 /* FetchTests.swift in Sources */,
 				B5489F501CF603D5008B4978 /* FromTests.swift in Sources */,
 				B52557781D02826E00E51965 /* OrderByTests.swift in Sources */,
@@ -2508,6 +2514,7 @@
 				B5220E0D1D0D0D19009BC71E /* ImportTests.swift in Sources */,
 				B5D339B51E925C2B00C880DE /* DynamicModelTests.swift in Sources */,
 				B525576D1CFAF18F00E51965 /* IntoTests.swift in Sources */,
+				B581B9332362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */,
 				B580857B1CDF808D004C2EEB /* SetupTests.swift in Sources */,
 				B52557891D02DE8100E51965 /* FetchTests.swift in Sources */,
 				B5489F511CF603D5008B4978 /* FromTests.swift in Sources */,
@@ -2731,6 +2738,7 @@
 				B525576E1CFAF18F00E51965 /* IntoTests.swift in Sources */,
 				B5D339B61E925C2B00C880DE /* DynamicModelTests.swift in Sources */,
 				B580857C1CDF808F004C2EEB /* SetupTests.swift in Sources */,
+				B581B9342362BB8C002BDB2B /* ObjectPublisherTests.swift in Sources */,
 				B525578A1D02DE8100E51965 /* FetchTests.swift in Sources */,
 				B5220E281D1308E5009BC71E /* SectionByTests.swift in Sources */,
 				B5489F521CF603D5008B4978 /* FromTests.swift in Sources */,
diff --git a/CoreStoreTests/ListPublisherTests.swift b/CoreStoreTests/ListPublisherTests.swift
index c17e179..1b0fc6a 100644
--- a/CoreStoreTests/ListPublisherTests.swift
+++ b/CoreStoreTests/ListPublisherTests.swift
@@ -41,99 +41,26 @@ class ListPublisherTests: BaseTestDataTestCase {
 
         self.prepareStack { (stack) in
 
-//            let observer = TestListObserver()
-            let listPublisher = stack.listPublisher(
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
                 From<TestEntity1>(),
                 SectionBy(#keyPath(TestEntity1.testBoolean)),
                 OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
             )
-//            monitor.addObserver(observer)
-//
-//            XCTAssertFalse(monitor.hasSections())
-//            XCTAssertFalse(monitor.hasObjects())
-//            XCTAssertTrue(monitor.objectsInAllSections().isEmpty)
-//
-//            var events = 0
-//
-//            let willChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 0)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 0
-//                }
-//            )
-//            let didInsertSectionExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 1)
-//                    XCTAssertEqual(
-//                        ((note.userInfo as NSDictionary?) ?? [:]),
-//                        [
-//                            "sectionInfo": monitor.sectionInfo(at: 0),
-//                            "sectionIndex": 0
-//                        ] as NSDictionary
-//                    )
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 1
-//                }
-//            )
-//            let didInsertObjectExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 2)
-//
-//                    let userInfo = note.userInfo
-//                    XCTAssertNotNil(userInfo)
-//                    XCTAssertEqual(
-//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-//                        ["indexPath", "object"]
-//                    )
-//
-//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
-//                    XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
-//                    XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
-//
-//                    let object = userInfo?["object"] as? TestEntity1
-//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
-//                    XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
-//                    XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "1"))
-//                    XCTAssertEqual(object?.testString, "nil:TestEntity1:1")
-//                    XCTAssertEqual(object?.testData, ("nil:TestEntity1:1" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-//                    XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-01T00:00:00Z")!)
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 2
-//                }
-//            )
-//            let didChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 3
-//                }
-//            )
+            XCTAssertFalse(listPublisher.snapshot.hasSections())
+            XCTAssertFalse(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.itemIDs.isEmpty)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 1)
+
+                didChangeExpectation.fulfill()
+            }
+            
             let saveExpectation = self.expectation(description: "save")
             stack.perform(
                 asynchronous: { (transaction) -> Bool in
@@ -161,522 +88,216 @@ class ListPublisherTests: BaseTestDataTestCase {
             self.waitAndCheckExpectations()
 
             withExtendedLifetime(listPublisher, {})
+            withExtendedLifetime(observer, {})
         }
     }
 
-//    @objc
-//    dynamic func test_ThatListObservers_CanReceiveUpdateNotifications() {
-//
-//        self.prepareStack { (stack) in
-//
-//            self.prepareTestDataForStack(stack)
-//
-//            let observer = TestListObserver()
-//            let monitor = stack.monitorSectionedList(
-//                From<TestEntity1>(),
-//                SectionBy(#keyPath(TestEntity1.testBoolean)),
-//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
-//            )
-//            monitor.addObserver(observer)
-//
-//            XCTAssertTrue(monitor.hasSections())
-//            XCTAssertEqual(monitor.numberOfSections(), 2)
-//            XCTAssertTrue(monitor.hasObjects())
-//            XCTAssertTrue(monitor.hasObjects(in: 0))
-//            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
-//            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
-//
-//            var events = 0
-//
-//            let willChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 0)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 0
-//                }
-//            )
-//
-//            let didUpdateObjectExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssert(events == 1 || events == 2)
-//
-//                    let userInfo = note.userInfo
-//                    XCTAssertNotNil(userInfo)
-//                    XCTAssertEqual(
-//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-//                        ["indexPath", "object"]
-//                    )
-//
-//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
-//                    let object = userInfo?["object"] as? TestEntity1
-//
-//                    switch object?.testEntityID {
-//
-//                    case NSNumber(value: 101)?:
-//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 1)
-//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
-//
-//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
-//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 11))
-//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "11"))
-//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:11")
-//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!)
-//
-//                    case NSNumber(value: 102)?:
-//                        XCTAssertEqual(indexPath?.index(atPosition: 0), 0)
-//                        XCTAssertEqual(indexPath?.index(atPosition: 1), 0)
-//
-//                        XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
-//                        XCTAssertEqual(object?.testNumber, NSNumber(value: 22))
-//                        XCTAssertEqual(object?.testDecimal, NSDecimalNumber(string: "22"))
-//                        XCTAssertEqual(object?.testString, "nil:TestEntity1:22")
-//                        XCTAssertEqual(object?.testData, ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-//                        XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!)
-//
-//                    default:
-//                        XCTFail()
-//                    }
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 1 || events == 2
-//                }
-//            )
-//            let didChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 3)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 3
-//                }
-//            )
-//            let saveExpectation = self.expectation(description: "save")
-//            stack.perform(
-//                asynchronous: { (transaction) -> Bool in
-//
-//                    if let object = try transaction.fetchOne(
-//                        From<TestEntity1>(),
-//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
-//
-//                        object.testNumber = NSNumber(value: 11)
-//                        object.testDecimal = NSDecimalNumber(string: "11")
-//                        object.testString = "nil:TestEntity1:11"
-//                        object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
-//                        object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
-//                    }
-//                    else {
-//
-//                        XCTFail()
-//                    }
-//                    if let object = try transaction.fetchOne(
-//                        From<TestEntity1>(),
-//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
-//
-//                        object.testNumber = NSNumber(value: 22)
-//                        object.testDecimal = NSDecimalNumber(string: "22")
-//                        object.testString = "nil:TestEntity1:22"
-//                        object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
-//                        object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
-//                    }
-//                    else {
-//
-//                        XCTFail()
-//                    }
-//                    return transaction.hasChanges
-//                },
-//                success: { (hasChanges) in
-//
-//                    XCTAssertTrue(hasChanges)
-//                    saveExpectation.fulfill()
-//                },
-//                failure: { _ in
-//
-//                    XCTFail()
-//                }
-//            )
-//            self.waitAndCheckExpectations()
-//        }
-//    }
-//
-//    @objc
-//    dynamic func test_ThatListObservers_CanReceiveMoveNotifications() {
-//
-//        self.prepareStack { (stack) in
-//
-//            self.prepareTestDataForStack(stack)
-//
-//            let observer = TestListObserver()
-//            let monitor = stack.monitorSectionedList(
-//                From<TestEntity1>(),
-//                SectionBy(#keyPath(TestEntity1.testBoolean)),
-//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
-//            )
-//            monitor.addObserver(observer)
-//
-//            var events = 0
-//
-//            let willChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 0)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 0
-//                }
-//            )
-//            let didMoveObjectExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 1)
-//
-//                    let userInfo = note.userInfo
-//                    XCTAssertNotNil(userInfo)
-//                    XCTAssertEqual(
-//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-//                        ["fromIndexPath", "toIndexPath", "object"]
-//                    )
-//
-//                    let fromIndexPath = userInfo?["fromIndexPath"] as? NSIndexPath
-//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 0), 0)
-//                    XCTAssertEqual(fromIndexPath?.index(atPosition: 1), 0)
-//
-//                    let toIndexPath = userInfo?["toIndexPath"] as? NSIndexPath
-//                    XCTAssertEqual(toIndexPath?.index(atPosition: 0), 1)
-//                    XCTAssertEqual(toIndexPath?.index(atPosition: 1), 1)
-//
-//                    let object = userInfo?["object"] as? TestEntity1
-//                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 102))
-//                    XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
-//
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 1
-//                }
-//            )
-//            let didChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 2)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 2
-//                }
-//            )
-//            let saveExpectation = self.expectation(description: "save")
-//            stack.perform(
-//                asynchronous: { (transaction) -> Bool in
-//
-//                    if let object = try transaction.fetchOne(
-//                        From<TestEntity1>(),
-//                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
-//
-//                        object.testBoolean = NSNumber(value: true)
-//                    }
-//                    else {
-//
-//                        XCTFail()
-//                    }
-//                    return transaction.hasChanges
-//                },
-//                success: { (hasChanges) in
-//
-//                    XCTAssertTrue(hasChanges)
-//                    saveExpectation.fulfill()
-//                },
-//                failure: { _ in
-//
-//                    XCTFail()
-//                }
-//            )
-//            self.waitAndCheckExpectations()
-//        }
-//    }
-//
-//    @objc
-//    dynamic func test_ThatListObservers_CanReceiveDeleteNotifications() {
-//
-//        self.prepareStack { (stack) in
-//
-//            self.prepareTestDataForStack(stack)
-//
-//            let observer = TestListObserver()
-//            let monitor = stack.monitorSectionedList(
-//                From<TestEntity1>(),
-//                SectionBy(#keyPath(TestEntity1.testBoolean)),
-//                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
-//            )
-//            monitor.addObserver(observer)
-//
-//            var events = 0
-//
-//            let willChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 0)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 0
-//                }
-//            )
-//            let didUpdateObjectExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssert(events == 1 || events == 2)
-//
-//                    let userInfo = note.userInfo
-//                    XCTAssertNotNil(userInfo)
-//                    XCTAssertEqual(
-//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-//                        ["indexPath", "object"]
-//                    )
-//
-//                    let indexPath = userInfo?["indexPath"] as? NSIndexPath
-//
-//                    XCTAssertEqual(indexPath?.section, 0)
-//                    XCTAssert(indexPath?.index(atPosition: 1) == 0 || indexPath?.index(atPosition: 1) == 1)
-//
-//                    let object = userInfo?["object"] as? TestEntity1
-//                    XCTAssertEqual(object?.isDeleted, true)
-//
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 1 || events == 2
-//                }
-//            )
-//            let didDeleteSectionExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 3)
-//
-//                    let userInfo = note.userInfo
-//                    XCTAssertNotNil(userInfo)
-//                    XCTAssertEqual(
-//                        Set(userInfo?.keys.map({ $0 as! String }) ?? []),
-//                        ["sectionInfo", "sectionIndex"]
-//                    )
-//
-//                    let sectionInfo = userInfo?["sectionInfo"] as? NSFetchedResultsSectionInfo
-//                    XCTAssertNotNil(sectionInfo)
-//                    XCTAssertEqual(sectionInfo?.name, "0")
-//
-//                    let sectionIndex = userInfo?["sectionIndex"]
-//                    XCTAssertEqual(sectionIndex as? NSNumber, NSNumber(value: 0))
-//
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 3
-//                }
-//            )
-//            let didChangeExpectation = self.expectation(
-//                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
-//                object: observer,
-//                handler: { (note) -> Bool in
-//
-//                    XCTAssertEqual(events, 4)
-//                    XCTAssertEqual((note.userInfo as NSDictionary?) ?? [:], NSDictionary())
-//                    defer {
-//
-//                        events += 1
-//                    }
-//                    return events == 4
-//                }
-//            )
-//            let saveExpectation = self.expectation(description: "save")
-//            stack.perform(
-//                asynchronous: { (transaction) -> Bool in
-//
-//                    let count = try transaction.deleteAll(
-//                        From<TestEntity1>(),
-//                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
-//                    )
-//                    XCTAssertEqual(count, 2)
-//                    return transaction.hasChanges
-//                },
-//                success: { (hasChanges) in
-//
-//                    XCTAssertTrue(hasChanges)
-//                    saveExpectation.fulfill()
-//                },
-//                failure: { _ in
-//
-//                    XCTFail()
-//                }
-//            )
-//            self.waitAndCheckExpectations()
-//        }
-//    }
-//}
-//
-//
-//// MARK: TestListObserver
-//
-//@available(macOS 10.12, *)
-//class TestListObserver: ListSectionObserver {
-//
-//    // MARK: ListObserver
-//
-//    typealias ListEntityType = TestEntity1
-//
-//    func listMonitorWillChange(_ monitor: ListMonitor<TestEntity1>) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitorWillChange:"),
-//            object: self,
-//            userInfo: [:]
-//        )
-//    }
-//
-//    func listMonitorDidChange(_ monitor: ListMonitor<TestEntity1>) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitorDidChange:"),
-//            object: self,
-//            userInfo: [:]
-//        )
-//    }
-//
-//    func listMonitorWillRefetch(_ monitor: ListMonitor<TestEntity1>) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitorWillRefetch:"),
-//            object: self,
-//            userInfo: [:]
-//        )
-//    }
-//
-//    func listMonitorDidRefetch(_ monitor: ListMonitor<TestEntity1>) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitorDidRefetch:"),
-//            object: self,
-//            userInfo: [:]
-//        )
-//    }
-//
-//
-//    // MARK: ListObjectObserver
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertObject object: TestEntity1, toIndexPath indexPath: IndexPath) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
-//            object: self,
-//            userInfo: [
-//                "object": object,
-//                "indexPath": indexPath
-//            ]
-//        )
-//    }
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteObject object: TestEntity1, fromIndexPath indexPath: IndexPath) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
-//            object: self,
-//            userInfo: [
-//                "object": object,
-//                "indexPath": indexPath
-//            ]
-//        )
-//    }
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didUpdateObject object: TestEntity1, atIndexPath indexPath: IndexPath) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
-//            object: self,
-//            userInfo: [
-//                "object": object,
-//                "indexPath": indexPath
-//            ]
-//        )
-//    }
-//
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didMoveObject object: TestEntity1, fromIndexPath: IndexPath, toIndexPath: IndexPath) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
-//            object: self,
-//            userInfo: [
-//                "object": object,
-//                "fromIndexPath": fromIndexPath,
-//                "toIndexPath": toIndexPath
-//            ]
-//        )
-//    }
-//
-//
-//    // MARK: ListSectionObserver
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
-//            object: self,
-//            userInfo: [
-//                "sectionInfo": sectionInfo,
-//                "sectionIndex": sectionIndex
-//            ]
-//        )
-//    }
-//
-//    func listMonitor(_ monitor: ListMonitor<TestEntity1>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
-//
-//        NotificationCenter.default.post(
-//            name: Notification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
-//            object: self,
-//            userInfo: [
-//                "sectionInfo": sectionInfo,
-//                "sectionIndex": sectionIndex
-//            ]
-//        )
-//    }
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveUpdateNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
+
+                        object.testNumber = NSNumber(value: 11)
+                        object.testDecimal = NSDecimalNumber(string: "11")
+                        object.testString = "nil:TestEntity1:11"
+                        object.testData = ("nil:TestEntity1:11" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                        object.testDate = self.dateFormatter.date(from: "2000-01-11T00:00:00Z")!
+                    }
+                    else {
+
+                        XCTFail()
+                    }
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+
+                        object.testNumber = NSNumber(value: 22)
+                        object.testDecimal = NSDecimalNumber(string: "22")
+                        object.testString = "nil:TestEntity1:22"
+                        object.testData = ("nil:TestEntity1:22" as NSString).data(using: String.Encoding.utf8.rawValue)!
+                        object.testDate = self.dateFormatter.date(from: "2000-01-22T00:00:00Z")!
+                    }
+                    else {
+
+                        XCTFail()
+                    }
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(listPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveMoveNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+                XCTAssertTrue(listPublisher.snapshot.hasSections())
+                XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+                XCTAssertTrue(listPublisher.snapshot.hasItems())
+                XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    if let object = try transaction.fetchOne(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
+
+                        object.testBoolean = NSNumber(value: true)
+                    }
+                    else {
+
+                        XCTFail()
+                    }
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(listPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveDeleteNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            listPublisher.addObserver(observer) { listPublisher in
+
+            XCTAssertTrue(listPublisher.snapshot.hasSections())
+            XCTAssertEqual(listPublisher.snapshot.numberOfSections, 1)
+            XCTAssertTrue(listPublisher.snapshot.hasItems())
+            XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
+            XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 3)
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    let count = try transaction.deleteAll(
+                        From<TestEntity1>(),
+                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
+                    )
+                    XCTAssertEqual(count, 2)
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+        }
+    }
 }
 
 #endif
diff --git a/CoreStoreTests/ObjectPublisherTests.swift b/CoreStoreTests/ObjectPublisherTests.swift
new file mode 100644
index 0000000..08c4de4
--- /dev/null
+++ b/CoreStoreTests/ObjectPublisherTests.swift
@@ -0,0 +1,154 @@
+//
+//  ObjectPublisherTests.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import XCTest
+
+@testable
+import CoreStore
+
+
+// MARK: - ObjectPublisherTests
+
+@available(macOS 10.12, *)
+class ObjectPublisherTests: BaseTestDataTestCase {
+
+    @objc
+    dynamic func test_ThatObjectPublishers_CanReceiveUpdateNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            guard let object = try stack.fetchOne(
+                From<TestEntity1>(),
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+
+                    XCTFail()
+                    return
+            }
+            let observer = NSObject()
+            let objectPublisher = stack.publishObject(object)
+            XCTAssertEqual(objectPublisher.object, object)
+            XCTAssertNotNil(objectPublisher.snapshot)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            objectPublisher.addObserver(observer) { objectPublisher in
+
+                XCTAssertEqual(objectPublisher.snapshot?.testNumber, NSNumber(value: 10))
+                XCTAssertEqual(objectPublisher.snapshot?.testString, "nil:TestEntity1:10")
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    guard let object = transaction.edit(object) else {
+
+                        XCTFail()
+                        try transaction.cancel()
+                    }
+                    object.testNumber = NSNumber(value: 10)
+                    object.testString = "nil:TestEntity1:10"
+
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(objectPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @objc
+    dynamic func test_ThatObjectPublishers_CanReceiveDeleteNotifications() {
+
+        self.prepareStack { (stack) in
+
+            self.prepareTestDataForStack(stack)
+
+            guard let object = try stack.fetchOne(
+                From<TestEntity1>(),
+                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
+
+                    XCTFail()
+                    return
+            }
+            let observer = NSObject()
+            let objectPublisher = stack.publishObject(object)
+            XCTAssertEqual(objectPublisher.object, object)
+            XCTAssertNotNil(objectPublisher.snapshot)
+
+            let didChangeExpectation = self.expectation(description: "didChange")
+            objectPublisher.addObserver(observer) { objectPublisher in
+
+                XCTAssertNil(objectPublisher.object)
+                XCTAssertNil(objectPublisher.snapshot)
+
+                didChangeExpectation.fulfill()
+            }
+
+            let saveExpectation = self.expectation(description: "save")
+            stack.perform(
+                asynchronous: { (transaction) -> Bool in
+
+                    guard let object = transaction.edit(object) else {
+
+                        XCTFail()
+                        try transaction.cancel()
+                    }
+                    transaction.delete(object)
+
+                    return transaction.hasChanges
+                },
+                success: { (hasChanges) in
+
+                    XCTAssertTrue(hasChanges)
+                    saveExpectation.fulfill()
+                },
+                failure: { _ in
+
+                    XCTFail()
+                }
+            )
+            self.waitAndCheckExpectations()
+
+            withExtendedLifetime(objectPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+}
+

From 4baeb6d922af1063228f3643ecf7e3a931ddeae9 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 14:35:04 +0900
Subject: [PATCH 38/58] Fix weak linking of SwiftUI in podspec

---
 CoreStore.podspec                   | 4 ++--
 CoreStore.xcodeproj/project.pbxproj | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CoreStore.podspec b/CoreStore.podspec
index 2876fb0..7d85d41 100644
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "7.0.0"
+    s.version = "7.0.1"
     s.swift_version = "5.1"
     s.license = "MIT"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
     s.public_header_files = "Sources/**/*.h"
     s.frameworks = "Foundation", "CoreData"
     s.requires_arc = true
-    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine -weak_framework SwiftUI' }
 end
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index e216b98..a881a74 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -3113,7 +3113,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 7.0.0;
+				MARKETING_VERSION = 7.0.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3136,7 +3136,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 7.0.0;
+				MARKETING_VERSION = 7.0.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,

From f3beca876986e6369be9043740768c0124ed968e Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 16:17:25 +0900
Subject: [PATCH 39/58] fix compiler error in testcases

---
 .../ColorsDemo.swift                          |  2 +-
 .../SwiftUIContainerViewController.swift      |  2 +-
 .../SwiftUI Demo/SwiftUIView.swift            |  2 +-
 CoreStoreTests/ListPublisherTests.swift       |  4 ++--
 CoreStoreTests/ObjectPublisherTests.swift     |  4 ++--
 .../NSManagedObjectContext+CoreStore.swift    | 22 ++++++++++++++-----
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift
index daff9e5..0a5d837 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ColorsDemo.swift	
@@ -79,7 +79,7 @@ struct ColorsDemo {
     
     static let palettes: ListPublisher<Palette> = {
 
-        return ColorsDemo.stack.listPublisher(
+        return ColorsDemo.stack.publishList(
             From<Palette>()
                 .sectionBy(\.colorName)
                 .orderBy(.ascending(\.hue))
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift
index 8e8b9fc..5d78086 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIContainerViewController.swift	
@@ -31,7 +31,7 @@ final class SwiftUIContainerViewController: UIViewController {
             
             let hostingController = UIHostingController(
                 rootView: SwiftUIView(
-                    palettes: ColorsDemo.stack.listPublisher(
+                    palettes: ColorsDemo.stack.publishList(
                         From<Palette>()
                             .sectionBy(\.colorName)
                             .orderBy(.ascending(\.hue))
diff --git a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift
index 9516f1f..1d8c334 100644
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI Demo/SwiftUIView.swift	
@@ -171,7 +171,7 @@ struct SwiftUIView_Previews: PreviewProvider {
     
     static var previews: some View {
         SwiftUIView(
-            palettes: ColorsDemo.stack.listPublisher(
+            palettes: ColorsDemo.stack.publishList(
                 From<Palette>()
                     .sectionBy(\.colorName)
                     .orderBy(.ascending(\.hue))
diff --git a/CoreStoreTests/ListPublisherTests.swift b/CoreStoreTests/ListPublisherTests.swift
index 1b0fc6a..b52224b 100644
--- a/CoreStoreTests/ListPublisherTests.swift
+++ b/CoreStoreTests/ListPublisherTests.swift
@@ -203,8 +203,8 @@ class ListPublisherTests: BaseTestDataTestCase {
                 XCTAssertEqual(listPublisher.snapshot.numberOfSections, 2)
                 XCTAssertTrue(listPublisher.snapshot.hasItems())
                 XCTAssertTrue(listPublisher.snapshot.hasItems(inSectionIndex: 0))
-                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 2)
-                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 3)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 0), 1)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 4)
 
                 didChangeExpectation.fulfill()
             }
diff --git a/CoreStoreTests/ObjectPublisherTests.swift b/CoreStoreTests/ObjectPublisherTests.swift
index 08c4de4..16460d7 100644
--- a/CoreStoreTests/ObjectPublisherTests.swift
+++ b/CoreStoreTests/ObjectPublisherTests.swift
@@ -56,8 +56,8 @@ class ObjectPublisherTests: BaseTestDataTestCase {
             let didChangeExpectation = self.expectation(description: "didChange")
             objectPublisher.addObserver(observer) { objectPublisher in
 
-                XCTAssertEqual(objectPublisher.snapshot?.testNumber, NSNumber(value: 10))
-                XCTAssertEqual(objectPublisher.snapshot?.testString, "nil:TestEntity1:10")
+                XCTAssertEqual(objectPublisher.object?.testNumber, NSNumber(value: 10))
+                XCTAssertEqual(objectPublisher.object?.testString, "nil:TestEntity1:10")
 
                 didChangeExpectation.fulfill()
             }
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 66114d2..1e1b6d8 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -120,17 +120,27 @@ extension NSManagedObjectContext {
 
                         return (updated: [], deleted: [])
                     }
+                    if userInfo[NSInvalidatedAllObjectsKey] != nil {
+
+                        let context = notification.object as! NSManagedObjectContext
+                        return (updated: Set(context.registeredObjects.map({ $0.objectID })), deleted: [])
+                    }
+
                     var updatedObjectIDs: Set<NSManagedObjectID> = []
-                    if let updatedObjects = userInfo[NSUpdatedObjectsKey] as? Set<NSManagedObjectID> {
+                    if let updatedObjects = userInfo[NSUpdatedObjectsKey] as? Set<NSManagedObject> {
 
-                        updatedObjectIDs.formUnion(updatedObjects)
+                        updatedObjectIDs.formUnion(updatedObjects.map({ $0.objectID }))
                     }
-                    if let mergedObjects = userInfo[NSRefreshedObjectsKey] as? Set<NSManagedObjectID> {
+                    if let mergedObjects = userInfo[NSRefreshedObjectsKey] as? Set<NSManagedObject> {
 
-                        updatedObjectIDs.formUnion(mergedObjects)
+                        updatedObjectIDs.formUnion(mergedObjects.map({ $0.objectID }))
                     }
-                    let deletedObjectIDs: Set<NSManagedObjectID> = (userInfo[NSDeletedObjectsKey] as? Set<NSManagedObjectID>) ?? []
-                    return (updated: updatedObjectIDs, deleted: deletedObjectIDs)
+                    if let mergedObjects = userInfo[NSInvalidatedObjectsKey] as? Set<NSManagedObject> {
+
+                        updatedObjectIDs.formUnion(mergedObjects.map({ $0.objectID }))
+                    }
+                    let deletedObjectIDs: Set<NSManagedObject> = (userInfo[NSDeletedObjectsKey] as? Set<NSManagedObject>) ?? []
+                    return (updated: updatedObjectIDs, deleted: Set(deletedObjectIDs.map({ $0.objectID })))
                 }
             )
         }

From 998938490cb15fd5d1f5ae8a8e13ad338ad5cf7e Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 25 Oct 2019 19:16:38 +0900
Subject: [PATCH 40/58] Make ObjectPublishers even lighter by lazy-loading
 observers

---
 .../NSManagedObjectContext+CoreStore.swift    |  6 +++
 Sources/ObjectPublisher.swift                 | 41 +++++++++++--------
 Sources/ObjectSnapshot.swift                  | 28 +++++++++----
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 1e1b6d8..1e3a636 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -145,6 +145,12 @@ extension NSManagedObjectContext {
             )
         }
     }
+
+    @nonobjc
+    internal func objectsDidChangeObserver<U: AnyObject>(remove: U) {
+
+        _ = self.userInfo(for: .objectsChangeObserver(U.self), initialize: { nil as Any? })
+    }
     
     
     // MARK: Private
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index be59366..98718f5 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -195,6 +195,7 @@ public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hash
 
     deinit {
 
+        self.context.objectsDidChangeObserver(remove: self)
         self.observers.removeAllObjects()
     }
 
@@ -221,30 +222,36 @@ public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hash
 
             self.rawObjectWillChange = nil
         }
-        self.$lazySnapshot.initialize({ initializer(objectID, context) })
-        
-        context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (updatedIDs, deletedIDs) in
+        self.$lazySnapshot.initialize { [weak self] in
 
             guard let self = self else {
 
-                return
+                return initializer(objectID, context)
             }
-            if deletedIDs.contains(objectID) {
+            context.objectsDidChangeObserver(for: self).addObserver(self) { [weak self] (updatedIDs, deletedIDs) in
 
-                self.object = nil
+                guard let self = self else {
 
-                self.willChange()
-                self.$lazySnapshot.reset({ nil })
-                self.didChange()
-                self.notifyObservers()
-            }
-            else if updatedIDs.contains(objectID) {
-
-                self.willChange()
-                self.$lazySnapshot.reset({ initializer(objectID, context) })
-                self.didChange()
-                self.notifyObservers()
+                    return
+                }
+                if deletedIDs.contains(objectID) {
+
+                    self.object = nil
+
+                    self.willChange()
+                    self.$lazySnapshot.reset({ nil })
+                    self.didChange()
+                    self.notifyObservers()
+                }
+                else if updatedIDs.contains(objectID) {
+
+                    self.willChange()
+                    self.$lazySnapshot.reset({ initializer(objectID, context) })
+                    self.didChange()
+                    self.notifyObservers()
+                }
             }
+            return initializer(objectID, context)
         }
     }
 
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 811cbda..92dd900 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -107,6 +107,7 @@ public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
             return nil
         }
         self.id = objectID
+        self.context = context
         self.values = values
     }
 
@@ -114,6 +115,7 @@ public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
     // MARK: Private
 
     private let id: O.ObjectID
+    private let context: NSManagedObjectContext
     private var values: [String: Any]
 
     private var valuesRef: NSDictionary {
@@ -214,51 +216,59 @@ extension ObjectSnapshot where O: CoreStoreObject {
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> D.ObjectID? {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToOne<D>>) -> ObjectPublisher<D>? {
 
         get {
 
             let key = String(keyPath: member)
-            return self.values[key] as! D.ObjectID?
+            guard let id = self.values[key] as! D.ObjectID? else {
+
+                return nil
+            }
+            return self.context.objectPublisher(objectID: id)
         }
         set {
 
             let key = String(keyPath: member)
-            self.values[key] = newValue
+            self.values[key] = newValue?.objectID()
         }
     }
 
     /**
      Returns the value for the property identified by a given key.
      */
-    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [D.ObjectID] {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyOrdered<D>>) -> [ObjectPublisher<D>] {
 
         get {
 
             let key = String(keyPath: member)
-            return self.values[key] as! [D.ObjectID]
+            let context = self.context
+            let ids = self.values[key] as! [D.ObjectID]
+            return ids.map(context.objectPublisher(objectID:))
         }
         set {
 
             let key = String(keyPath: member)
-            self.values[key] = newValue
+            self.values[key] = newValue.map({ $0.objectID() })
         }
     }
 
     /**
      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.ObjectID> {
+    public subscript<OBase, D>(dynamicMember member: KeyPath<O, RelationshipContainer<OBase>.ToManyUnordered<D>>) -> Set<ObjectPublisher<D>> {
 
         get {
 
             let key = String(keyPath: member)
-            return self.values[key] as! Set<D.ObjectID>
+            let context = self.context
+            let ids = self.values[key] as! Set<D.ObjectID>
+            return Set(ids.map(context.objectPublisher(objectID:)))
         }
         set {
 
             let key = String(keyPath: member)
-            self.values[key] = newValue
+            self.values[key] = Set(newValue.map({ $0.objectID() }))
         }
     }
 }

From 717cb75720a8a87f95f057b0cb850c674ac63239 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 28 Oct 2019 11:23:12 +0900
Subject: [PATCH 41/58] Add utility to fetch ObjectPublishers by ObjectID

---
 Sources/DataStack+DataSources.swift | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index cba6d2a..306761a 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -41,7 +41,18 @@ extension DataStack {
      */
     public func publishObject<O: DynamicObject>(_ object: O) -> ObjectPublisher<O> {
 
-        return ObjectPublisher<O>(objectID: object.cs_id(), context: self.unsafeContext())
+        return self.publishObject(object.cs_id())
+    }
+
+    /**
+     Creates an `ObjectPublisher` for a `DynamicObject` with the specified `ObjectID`. Multiple objects may then register themselves to be notified when changes are made to the `DynamicObject`.
+
+     - 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> {
+
+        return ObjectPublisher<O>(objectID: objectID, context: self.unsafeContext())
     }
     
     /**

From 88ab0b5e15a2577e29fa7e678f99702462bcc93b Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 28 Oct 2019 12:03:17 +0900
Subject: [PATCH 42/58] provide direct conversion from DynamicObject to
 ObjectSnapshot

---
 Sources/ObjectRepresentation.swift | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 3eb2f64..863366c 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -75,6 +75,19 @@ extension CoreStoreObject: ObjectRepresentation {}
 
 extension DynamicObject where Self: ObjectRepresentation {
 
+    // MARK: Public
+
+    /**
+     A thread-safe `struct` that is a full-copy of the object's properties
+     */
+    public func asSnapshot() -> ObjectSnapshot<Self>? {
+
+        return self.cs_toRaw()
+            .managedObjectContext
+            .flatMap({ ObjectSnapshot<Self>(objectID: self.cs_id(), context: $0) })
+    }
+
+
     // MARK: ObjectRepresentation
 
     public func objectID() -> Self.ObjectID {

From c112a84c0a73a7d2f8910a7ef8108c6349ecd40c Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 28 Oct 2019 19:31:02 +0900
Subject: [PATCH 43/58] Add debugDescription implementation for new Publisher
 and Snapshot types

---
 ...reStore+CustomDebugStringConvertible.swift | 127 +++++++++++++++++-
 .../DiffableDataSource.TableView-UIKit.swift  |  38 ++----
 ...edDiffableDataSourceSnapshotDelegate.swift |  26 ----
 Sources/ListPublisher.swift                   |   9 --
 Sources/ListSnapshot.swift                    |  18 +--
 Sources/ObjectPublisher.swift                 |  11 +-
 Sources/ObjectSnapshot.swift                  |  19 ++-
 7 files changed, 166 insertions(+), 82 deletions(-)

diff --git a/Sources/CoreStore+CustomDebugStringConvertible.swift b/Sources/CoreStore+CustomDebugStringConvertible.swift
index d1e1564..4eb4144 100644
--- a/Sources/CoreStore+CustomDebugStringConvertible.swift
+++ b/Sources/CoreStore+CustomDebugStringConvertible.swift
@@ -373,15 +373,34 @@ fileprivate struct CoreStoreFetchedSectionInfoWrapper: CoreStoreDebugStringConve
     var coreStoreDumpString: String {
         
         return createFormattedString(
-            "\"\(self.sectionInfo.name)\" (", ")",
-            ("numberOfObjects", self.sectionInfo.numberOfObjects),
-            ("indexTitle", self.sectionInfo.indexTitle as Any)
+            "\"\(self.sectionName)\" (", ")",
+            ("numberOfObjects", self.numberOfObjects),
+            ("indexTitle", self.sectionIndexTitle as Any)
         )
     }
     
     // MARK: FilePrivate
     
-    let sectionInfo: NSFetchedResultsSectionInfo
+    fileprivate init(_ sectionInfo: NSFetchedResultsSectionInfo) {
+
+        self.sectionName = sectionInfo.name
+        self.numberOfObjects = sectionInfo.numberOfObjects
+        self.sectionIndexTitle = sectionInfo.indexTitle
+    }
+
+    fileprivate init(_ section: Internals.DiffableDataSourceSnapshot.Section) {
+
+        self.sectionName = section.differenceIdentifier
+        self.numberOfObjects = section.elements.count
+        self.sectionIndexTitle = nil
+    }
+
+
+    // MARK: Private
+
+    private let sectionName: String
+    private let sectionIndexTitle: String?
+    private let numberOfObjects: Int
 }
 
 @available(macOS 10.12, *)
@@ -409,6 +428,56 @@ extension ListMonitor: CustomDebugStringConvertible, CoreStoreDebugStringConvert
 }
 
 
+// MARK: - ListPublisher
+
+@available(macOS 10.12, *)
+extension ListPublisher: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
+
+    // MARK: CustomDebugStringConvertible
+
+    public var debugDescription: String {
+
+        return formattedDebugDescription(self)
+    }
+
+
+    // MARK: CoreStoreDebugStringConvertible
+
+    public var coreStoreDumpString: String {
+
+        return createFormattedString(
+            "(", ")",
+            ("snapshot", self.snapshot)
+        )
+    }
+}
+
+
+// MARK: - ListSnapshot
+
+extension ListSnapshot: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
+
+    // MARK: CustomDebugStringConvertible
+
+    public var debugDescription: String {
+
+        return formattedDebugDescription(self)
+    }
+
+
+    // MARK: CoreStoreDebugStringConvertible
+
+    public var coreStoreDumpString: String {
+
+        return createFormattedString(
+            "(", ")",
+            ("numberOfObjects", self.numberOfItems),
+            ("sections", self.diffableSnapshot.sections.map(CoreStoreFetchedSectionInfoWrapper.init))
+        )
+    }
+}
+
+
 // MARK: - LocalStorageOptions
  
 extension LocalStorageOptions: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
@@ -568,6 +637,56 @@ extension ObjectMonitor: CustomDebugStringConvertible, CoreStoreDebugStringConve
 }
 
 
+// MARK: - ObjectPublisher
+
+extension ObjectPublisher: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
+
+    // MARK: CustomDebugStringConvertible
+
+    public var debugDescription: String {
+
+        return formattedDebugDescription(self)
+    }
+
+
+    // MARK: CoreStoreDebugStringConvertible
+
+    public var coreStoreDumpString: String {
+
+        return createFormattedString(
+            "(", ")",
+            ("objectID", self.objectID()),
+            ("object", self.object as Any)
+        )
+    }
+}
+
+
+// MARK: - ObjectSnapshot
+
+extension ObjectSnapshot: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
+
+    // MARK: CustomDebugStringConvertible
+
+    public var debugDescription: String {
+
+        return formattedDebugDescription(self)
+    }
+
+
+    // MARK: CoreStoreDebugStringConvertible
+
+    public var coreStoreDumpString: String {
+
+        return createFormattedString(
+            "(", ")",
+            ("objectID", self.objectID()),
+            ("dictionaryForValues", self.dictionaryForValues())
+        )
+    }
+}
+
+
 // MARK: - OrderBy
 
 extension OrderBy: CustomDebugStringConvertible, CoreStoreDebugStringConvertible {
diff --git a/Sources/DiffableDataSource.TableView-UIKit.swift b/Sources/DiffableDataSource.TableView-UIKit.swift
index a57cb89..35928b2 100644
--- a/Sources/DiffableDataSource.TableView-UIKit.swift
+++ b/Sources/DiffableDataSource.TableView-UIKit.swift
@@ -127,31 +127,19 @@ extension DiffableDataSource {
         @nonobjc
         public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
-            let diffableSnapshot = snapshot.diffableSnapshot
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                self.modernDataSource.apply(
-//                    diffableSnapshot as! NSDiffableDataSourceSnapshot<String, NSManagedObjectID>,
-//                    animatingDifferences: animatingDifferences,
-//                    completion: nil
-//                )
-//            }
-//            else {
-                
-                self.dispatcher.apply(
-                    diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
-                    view: self.tableView,
-                    animatingDifferences: animatingDifferences,
-                    performUpdates: { tableView, changeset, setSections in
-                        
-                        tableView.reload(
-                            using: changeset,
-                            with: self.defaultRowAnimation,
-                            setData: setSections
-                        )
-                    }
-                )
-//            }
+            self.dispatcher.apply(
+                snapshot.diffableSnapshot,
+                view: self.tableView,
+                animatingDifferences: animatingDifferences,
+                performUpdates: { tableView, changeset, setSections in
+
+                    tableView.reload(
+                        using: changeset,
+                        with: self.defaultRowAnimation,
+                        setData: setSections
+                    )
+                }
+            )
         }
         
         /**
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 4348422..60e3b2d 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -41,9 +41,6 @@ import AppKit
 
 internal protocol FetchedDiffableDataSourceSnapshotHandler: AnyObject {
 
-//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//    func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>)
-
     func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot)
     
     func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, sectionIndexTitleForSectionName sectionName: String?) -> String?
@@ -80,15 +77,6 @@ extension Internals {
 
         internal func initialFetch() {
 
-//            #if canImport(UIKit) || canImport(AppKit)
-//
-//            if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//                return
-//            }
-//
-//            #endif
-
             guard let fetchedResultsController = self.fetchedResultsController else {
 
                 return
@@ -98,20 +86,6 @@ extension Internals {
 
 
         // MARK: NSFetchedResultsControllerDelegate
-
-//        #if canImport(UIKit) || canImport(AppKit)
-//
-//        @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//        @objc
-//        dynamic func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshotReference) {
-//
-//            self.handler?.controller(
-//                controller,
-//                didChangeContentWith: snapshot as NSDiffableDataSourceSnapshot<String, NSManagedObjectID>
-//            )
-//        }
-//
-//        #endif
         
         @objc
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
diff --git a/Sources/ListPublisher.swift b/Sources/ListPublisher.swift
index d09b7b2..71881e1 100644
--- a/Sources/ListPublisher.swift
+++ b/Sources/ListPublisher.swift
@@ -397,15 +397,6 @@ public final class ListPublisher<O: DynamicObject>: Hashable {
 extension ListPublisher: FetchedDiffableDataSourceSnapshotHandler {
 
     // MARK: FetchedDiffableDataSourceSnapshotHandler
-    
-//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//    internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>) {
-//
-//        self.snapshot = .init(
-//            diffableSnapshot: snapshot,
-//            context: controller.managedObjectContext
-//        )
-//    }
 
     internal func controller(_ controller: NSFetchedResultsController<NSFetchRequestResult>, didChangeContentWith snapshot: Internals.DiffableDataSourceSnapshot) {
 
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 2ec94b7..ca13a77 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -629,28 +629,14 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
     
     // MARK: Internal
     
-    internal private(set) var diffableSnapshot: DiffableDataSourceSnapshotProtocol
+    internal private(set) var diffableSnapshot: Internals.DiffableDataSourceSnapshot
     
     internal init() {
 
-//        if #available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *) {
-//
-//            self.diffableSnapshot = NSDiffableDataSourceSnapshot<String, NSManagedObjectID>()
-//        }
-//        else {
-            
-            self.diffableSnapshot = Internals.DiffableDataSourceSnapshot()
-//        }
+        self.diffableSnapshot = Internals.DiffableDataSourceSnapshot()
         self.context = nil
     }
     
-//    @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
-//    internal init(diffableSnapshot: NSDiffableDataSourceSnapshot<String, NSManagedObjectID>, context: NSManagedObjectContext) {
-//
-//        self.diffableSnapshot = diffableSnapshot
-//        self.context = context
-//    }
-    
     internal init(diffableSnapshot: Internals.DiffableDataSourceSnapshot, context: NSManagedObjectContext) {
 
         self.diffableSnapshot = diffableSnapshot
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index 98718f5..ce2cfde 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -336,7 +336,6 @@ extension ObjectPublisher {
 
 // MARK: - ObjectPublisher where O: NSManagedObject
 
-@available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
 extension ObjectPublisher where O: NSManagedObject {
 
     // MARK: Public
@@ -344,11 +343,21 @@ extension ObjectPublisher where O: NSManagedObject {
     /**
      Returns the value for the property identified by a given key.
      */
+     @available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
     public subscript<V: AllowedObjectiveCKeyPathValue>(dynamicMember member: KeyPath<O, V>) -> V {
 
         fatalError()
 //        return self.snapshot[dynamicMember: member]
     }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
+
+        let key = String(keyPath: keyPath)
+        return self.snapshot?.dictionaryForValues()[key] as! V?
+    }
 }
 
 
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 92dd900..34f7255 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -41,6 +41,14 @@ import AppKit
  */
 @dynamicMemberLookup
 public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
+
+    // MARK: Public
+
+    public func dictionaryForValues() -> [String: Any] {
+
+        return self.values
+    }
+
     
     // MARK: ObjectRepresentation
 
@@ -127,17 +135,26 @@ public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
 
 // MARK: - ObjectSnapshot where O: NSManagedObject
 
-@available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
 extension ObjectSnapshot where O: NSManagedObject {
 
     /**
      Returns the value for the property identified by a given key.
      */
+    @available(*, unavailable, message: "KeyPaths accessed from @dynamicMemberLookup types can't generate KVC keys yet (https://bugs.swift.org/browse/SR-11351)")
     public subscript<V: AllowedObjectiveCKeyPathValue>(dynamicMember member: KeyPath<O, V>) -> V {
 
         let key = String(keyPath: member)
         return self.values[key] as! V
     }
+
+    /**
+     Returns the value for the property identified by a given key.
+     */
+    public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
+
+        let key = String(keyPath: keyPath)
+        return self.values[key] as! V?
+    }
 }
 
 

From 81b482e28b1a479cda667b57eafec5429eee9080 Mon Sep 17 00:00:00 2001
From: Antoine Marandon <antoine@marandon.fr>
Date: Tue, 29 Oct 2019 17:27:25 +0900
Subject: [PATCH 44/58] Fix warning

---
 Sources/DiffableDataSource.CollectionView-UIKit.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/DiffableDataSource.CollectionView-UIKit.swift b/Sources/DiffableDataSource.CollectionView-UIKit.swift
index 985905f..04943f0 100644
--- a/Sources/DiffableDataSource.CollectionView-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionView-UIKit.swift
@@ -120,7 +120,7 @@ extension DiffableDataSource {
 
             let diffableSnapshot = snapshot.diffableSnapshot
             self.dispatcher.apply(
-                diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                diffableSnapshot,
                 view: self.collectionView,
                 animatingDifferences: animatingDifferences,
                 performUpdates: { collectionView, changeset, setSections in

From 6b9a4b480b20a9b834926d9e37e062c1f6e7f9ee Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 29 Oct 2019 20:18:14 +0900
Subject: [PATCH 45/58] minor

---
 Sources/ObjectPublisher.swift |  2 +-
 Sources/ObjectSnapshot.swift  | 23 ++++++++++++++++++-----
 Sources/PartialObject.swift   |  4 ++--
 Sources/Transformable.swift   |  4 ++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index ce2cfde..7412fc1 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -356,7 +356,7 @@ extension ObjectPublisher where O: NSManagedObject {
     public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
 
         let key = String(keyPath: keyPath)
-        return self.snapshot?.dictionaryForValues()[key] as! V?
+        return self.snapshot?.dictionaryForValues()[key] as? V
     }
 }
 
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 34f7255..259c536 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -120,11 +120,15 @@ public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
     }
 
 
+    // MARK: FilePrivate
+
+    fileprivate var values: [String: Any]
+
+
     // MARK: Private
 
     private let id: O.ObjectID
     private let context: NSManagedObjectContext
-    private var values: [String: Any]
 
     private var valuesRef: NSDictionary {
 
@@ -153,7 +157,16 @@ extension ObjectSnapshot where O: NSManagedObject {
     public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
 
         let key = String(keyPath: keyPath)
-        return self.values[key] as! V?
+        return self.values[key] as? V
+    }
+
+    /**
+     Mutates the value for the property identified by a given key.
+     */
+    public mutating func setValue<V: AllowedObjectiveCKeyPathValue>(_ value: V!, forKeyPath keyPath: KeyPath<O, V>) {
+
+        let key = String(keyPath: keyPath)
+        self.values[key] = value
     }
 }
 
@@ -187,7 +200,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
         get {
 
             let key = String(keyPath: member)
-            return self.values[key] as! V?
+            return self.values[key] as? V
         }
         set {
 
@@ -221,7 +234,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
         get {
 
             let key = String(keyPath: member)
-            return self.values[key] as! V?
+            return self.values[key] as? V
         }
         set {
 
@@ -238,7 +251,7 @@ extension ObjectSnapshot where O: CoreStoreObject {
         get {
 
             let key = String(keyPath: member)
-            guard let id = self.values[key] as! D.ObjectID? else {
+            guard let id = self.values[key] as? D.ObjectID else {
 
                 return nil
             }
diff --git a/Sources/PartialObject.swift b/Sources/PartialObject.swift
index 9d42664..82f8731 100644
--- a/Sources/PartialObject.swift
+++ b/Sources/PartialObject.swift
@@ -191,7 +191,7 @@ public struct PartialObject<O: CoreStoreObject> {
      */
     public func value<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
         
-        return self.rawObject.value(forKey: property(O.meta).keyPath) as! V?
+        return self.rawObject.value(forKey: property(O.meta).keyPath) as? V
     }
     
     /**
@@ -212,7 +212,7 @@ public struct PartialObject<O: CoreStoreObject> {
      */
     public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
         
-        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V?
+        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as? V
     }
     
     /**
diff --git a/Sources/Transformable.swift b/Sources/Transformable.swift
index f26ed6c..182f0bc 100644
--- a/Sources/Transformable.swift
+++ b/Sources/Transformable.swift
@@ -380,7 +380,7 @@ public enum TransformableContainer<O: CoreStoreObject> {
 
                         return customGetter(PartialObject<O>(object))
                     }
-                    return object.value(forKey: self.keyPath) as! V?
+                    return object.value(forKey: self.keyPath) as? V
                 }
             }
             set {
@@ -489,7 +489,7 @@ public enum TransformableContainer<O: CoreStoreObject> {
                 }
                 customSetter(
                     PartialObject<O>(rawObject),
-                    newValue as! V?
+                    newValue as? V
                 )
             }
         }

From 468922d5edc6ec67f61b482414f905c4da71101a Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 29 Oct 2019 20:30:03 +0900
Subject: [PATCH 46/58] fix casting issues

---
 Sources/AttributeProtocol.swift                      |  2 +-
 .../DiffableDataSource.CollectionView-UIKit.swift    |  2 +-
 Sources/ObjectPublisher.swift                        |  2 +-
 Sources/ObjectSnapshot.swift                         |  2 +-
 Sources/PartialObject.swift                          |  4 ++--
 Sources/Relationship.swift                           | 12 ++++++------
 Sources/RelationshipProtocol.swift                   |  2 +-
 Sources/Transformable.swift                          | 12 ++++++------
 Sources/Value.swift                                  |  8 ++++----
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Sources/AttributeProtocol.swift b/Sources/AttributeProtocol.swift
index 37aa359..df70185 100644
--- a/Sources/AttributeProtocol.swift
+++ b/Sources/AttributeProtocol.swift
@@ -43,5 +43,5 @@ internal protocol AttributeProtocol: PropertyProtocol {
     var rawObject: CoreStoreManagedObject? { get set }
     var getter: CoreStoreManagedObject.CustomGetter? { get }
     var setter: CoreStoreManagedObject.CustomSetter? { get }
-    var valueForSnapshot: Any { get }
+    var valueForSnapshot: Any? { get }
 }
diff --git a/Sources/DiffableDataSource.CollectionView-UIKit.swift b/Sources/DiffableDataSource.CollectionView-UIKit.swift
index 985905f..04943f0 100644
--- a/Sources/DiffableDataSource.CollectionView-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionView-UIKit.swift
@@ -120,7 +120,7 @@ extension DiffableDataSource {
 
             let diffableSnapshot = snapshot.diffableSnapshot
             self.dispatcher.apply(
-                diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
+                diffableSnapshot,
                 view: self.collectionView,
                 animatingDifferences: animatingDifferences,
                 performUpdates: { collectionView, changeset, setSections in
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index 7412fc1..ce2cfde 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -356,7 +356,7 @@ extension ObjectPublisher where O: NSManagedObject {
     public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
 
         let key = String(keyPath: keyPath)
-        return self.snapshot?.dictionaryForValues()[key] as? V
+        return self.snapshot?.dictionaryForValues()[key] as! V?
     }
 }
 
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index 259c536..f01cbff 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -157,7 +157,7 @@ extension ObjectSnapshot where O: NSManagedObject {
     public func value<V: AllowedObjectiveCKeyPathValue>(forKeyPath keyPath: KeyPath<O, V>) -> V! {
 
         let key = String(keyPath: keyPath)
-        return self.values[key] as? V
+        return self.values[key] as! V?
     }
 
     /**
diff --git a/Sources/PartialObject.swift b/Sources/PartialObject.swift
index 82f8731..9d42664 100644
--- a/Sources/PartialObject.swift
+++ b/Sources/PartialObject.swift
@@ -191,7 +191,7 @@ public struct PartialObject<O: CoreStoreObject> {
      */
     public func value<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
         
-        return self.rawObject.value(forKey: property(O.meta).keyPath) as? V
+        return self.rawObject.value(forKey: property(O.meta).keyPath) as! V?
     }
     
     /**
@@ -212,7 +212,7 @@ public struct PartialObject<O: CoreStoreObject> {
      */
     public func primitiveValue<V>(for property: (O) -> TransformableContainer<O>.Optional<V>) -> V? {
         
-        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as? V
+        return self.rawObject.primitiveValue(forKey: property(O.meta).keyPath) as! V?
     }
     
     /**
diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift
index 120a799..74c72d5 100644
--- a/Sources/Relationship.swift
+++ b/Sources/Relationship.swift
@@ -313,9 +313,9 @@ public enum RelationshipContainer<O: CoreStoreObject> {
             }
         }
 
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return self.value?.objectID() as Any
+            return self.value?.objectID()
         }
         
         
@@ -609,9 +609,9 @@ public enum RelationshipContainer<O: CoreStoreObject> {
             }
         }
 
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return self.value.map({ $0.objectID() }) as Any
+            return self.value.map({ $0.objectID() })
         }
         
         
@@ -910,9 +910,9 @@ public enum RelationshipContainer<O: CoreStoreObject> {
             }
         }
 
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return Set(self.value.map({ $0.objectID() })) as Any
+            return Set(self.value.map({ $0.objectID() }))
         }
         
         
diff --git a/Sources/RelationshipProtocol.swift b/Sources/RelationshipProtocol.swift
index b2269a5..0f53b88 100644
--- a/Sources/RelationshipProtocol.swift
+++ b/Sources/RelationshipProtocol.swift
@@ -41,5 +41,5 @@ internal protocol RelationshipProtocol: PropertyProtocol {
     var renamingIdentifier: () -> String? { get }
     var minCount: Int { get }
     var maxCount: Int { get }
-    var valueForSnapshot: Any { get }
+    var valueForSnapshot: Any? { get }
 }
diff --git a/Sources/Transformable.swift b/Sources/Transformable.swift
index 182f0bc..5129047 100644
--- a/Sources/Transformable.swift
+++ b/Sources/Transformable.swift
@@ -272,9 +272,9 @@ public enum TransformableContainer<O: CoreStoreObject> {
             }
         }
         
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return self.value as Any
+            return self.value
         }
 
 
@@ -380,7 +380,7 @@ public enum TransformableContainer<O: CoreStoreObject> {
 
                         return customGetter(PartialObject<O>(object))
                     }
-                    return object.value(forKey: self.keyPath) as? V
+                    return object.value(forKey: self.keyPath) as! V?
                 }
             }
             set {
@@ -489,14 +489,14 @@ public enum TransformableContainer<O: CoreStoreObject> {
                 }
                 customSetter(
                     PartialObject<O>(rawObject),
-                    newValue as? V
+                    newValue as! V?
                 )
             }
         }
         
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
             
-            return self.value as Any
+            return self.value
         }
 
 
diff --git a/Sources/Value.swift b/Sources/Value.swift
index fec2e9a..2bd6cef 100644
--- a/Sources/Value.swift
+++ b/Sources/Value.swift
@@ -267,9 +267,9 @@ public enum ValueContainer<O: CoreStoreObject> {
             }
         }
         
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return self.value as Any
+            return self.value
         }
         
         
@@ -489,9 +489,9 @@ public enum ValueContainer<O: CoreStoreObject> {
             }
         }
         
-        internal var valueForSnapshot: Any {
+        internal var valueForSnapshot: Any? {
 
-            return self.value as Any
+            return self.value
         }
         
         

From e12223df8510808f7746af570c592fb282328778 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 29 Oct 2019 20:37:08 +0900
Subject: [PATCH 47/58] fix casting error

---
 Sources/NSManagedObjectContext+CoreStore.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index 1e3a636..fe54272 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -178,9 +178,9 @@ extension NSManagedObjectContext {
     private func userInfo<T>(for key: UserInfoKeys, initialize: @escaping () -> T) -> T {
 
         let keyString = key.keyString
-        if let value = self.userInfo[keyString] {
+        if let value = self.userInfo[keyString] as? T {
 
-            return value as! T
+            return value
         }
         let value = initialize()
         self.userInfo[keyString] = value

From b1decc9853be560e2aa03b41b224cc046ca856ba Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Thu, 14 Nov 2019 20:34:48 +0900
Subject: [PATCH 48/58] Force fetchLimit for ListPublisher and ListSnapshot

---
 .../Internals.DiffableDataSourceSnapshot.swift | 18 +++++++++++++++++-
 ...hedDiffableDataSourceSnapshotDelegate.swift |  5 +++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index dc7bb05..3d9c4c8 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -192,6 +192,17 @@ extension Internals {
             self.structure.update(sectionIDs: identifiers)
         }
 
+        mutating func resize(limit: Int) {
+
+            let itemIdentifiers = self.itemIdentifiers
+            guard itemIdentifiers.endIndex > limit else {
+
+                return
+            }
+            self.structure.remove(itemIDs: itemIdentifiers.suffix(from: limit))
+            self.structure.removeAllEmptySections()
+        }
+
 
         // MARK: Private
 
@@ -359,7 +370,7 @@ extension Internals {
                     .insert(contentsOf: items, at: itemIndex)
             }
 
-            mutating func remove(itemIDs: [NSManagedObjectID]) {
+            mutating func remove<C: Collection>(itemIDs: C) where C.Element == NSManagedObjectID {
 
                 let itemPositionMap = self.itemPositionMap()
                 var removeIndexSetMap: [Int: IndexSet] = [:]
@@ -390,6 +401,11 @@ extension Internals {
                 }
             }
 
+            mutating func removeAllEmptySections() {
+
+                self.sections.removeAll(where: { $0.elements.isEmpty })
+            }
+
             mutating func move(itemID: NSManagedObjectID, before beforeItemID: NSManagedObjectID) {
 
                 guard let removed = self.remove(itemID: itemID) else {
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index 60e3b2d..af49c36 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -93,6 +93,11 @@ extension Internals {
             var snapshot = Internals.DiffableDataSourceSnapshot(
                 sections: controller.sections ?? []
             )
+            let fetchLimit = controller.fetchRequest.fetchLimit
+            if fetchLimit > 0 {
+
+                snapshot.resize(limit: fetchLimit)
+            }
             snapshot.reloadSections(self.reloadedSectionIDs)
             snapshot.reloadItems(self.reloadedItemIDs)
             

From 4ee1b04523f6f8707a6167c7113d0dafbbdbd409 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 18 Nov 2019 19:52:57 +0900
Subject: [PATCH 49/58] Support for fetchOffset in ListPublisher, optimize
 slicing logic

---
 ...Internals.DiffableDataSourceSnapshot.swift | 61 +++++++++++++------
 ...edDiffableDataSourceSnapshotDelegate.swift |  9 +--
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index 3d9c4c8..a587090 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -47,9 +47,13 @@ extension Internals {
 
         // MARK: Internal
 
-        init(sections: [NSFetchedResultsSectionInfo]) {
+        init(sections: [NSFetchedResultsSectionInfo], fetchOffset: Int, fetchLimit: Int) {
 
-            self.structure = .init(sections: sections)
+            self.structure = .init(
+                sections: sections,
+                fetchOffset: Swift.max(0, fetchOffset),
+                fetchLimit: (fetchLimit > 0) ? fetchLimit : nil
+            )
         }
         
         var sections: [Section] {
@@ -192,17 +196,6 @@ extension Internals {
             self.structure.update(sectionIDs: identifiers)
         }
 
-        mutating func resize(limit: Int) {
-
-            let itemIdentifiers = self.itemIdentifiers
-            guard itemIdentifiers.endIndex > limit else {
-
-                return
-            }
-            self.structure.remove(itemIDs: itemIdentifiers.suffix(from: limit))
-            self.structure.removeAllEmptySections()
-        }
-
 
         // MARK: Private
 
@@ -285,17 +278,45 @@ extension Internals {
                 self.sections = []
             }
 
-            init(sections: [NSFetchedResultsSectionInfo]) {
+            init(sections: [NSFetchedResultsSectionInfo], fetchOffset: Int, fetchLimit: Int?) {
 
-                self.sections = sections.map {
+                let sliceItems: (_ array: [Any], _ offset: Int) -> Array<Any>.SubSequence
+                if let fetchLimit = fetchLimit {
 
-                    Section(
-                        differenceIdentifier: $0.name,
-                        items: $0.objects?
-                            .compactMap({ ($0 as? NSManagedObject)?.objectID })
-                            .map({ Item(differenceIdentifier: $0) }) ?? []
+                    var remainingCount = fetchLimit
+                    sliceItems = {
+
+                        let slice = $0[$1...].prefix(remainingCount)
+                        remainingCount -= slice.count
+                        return slice
+                    }
+                }
+                else {
+
+                    sliceItems = { $0[$1...] }
+                }
+                var newSections: [Internals.DiffableDataSourceSnapshot.Section] = []
+                var ignoreCount = fetchOffset
+                for section in sections {
+
+                    let objects = section.objects ?? []
+                    guard objects.indices.contains(ignoreCount) else {
+
+                        ignoreCount -= objects.count
+                        continue
+                    }
+                    let items = sliceItems(objects, ignoreCount)
+                        .map({ Item(differenceIdentifier: ($0 as! NSManagedObject).objectID) })
+                    ignoreCount = 0
+                    guard !items.isEmpty else {
+
+                        continue
+                    }
+                    newSections.append(
+                        Section(differenceIdentifier: section.name, items: items)
                     )
                 }
+                self.sections = newSections
             }
 
             var allSectionIDs: [String] {
diff --git a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
index af49c36..dd1196b 100644
--- a/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
+++ b/Sources/Internals.FetchedDiffableDataSourceSnapshotDelegate.swift
@@ -91,13 +91,10 @@ extension Internals {
         dynamic func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
 
             var snapshot = Internals.DiffableDataSourceSnapshot(
-                sections: controller.sections ?? []
+                sections: controller.sections ?? [],
+                fetchOffset: controller.fetchRequest.fetchOffset,
+                fetchLimit: controller.fetchRequest.fetchLimit
             )
-            let fetchLimit = controller.fetchRequest.fetchLimit
-            if fetchLimit > 0 {
-
-                snapshot.resize(limit: fetchLimit)
-            }
             snapshot.reloadSections(self.reloadedSectionIDs)
             snapshot.reloadItems(self.reloadedItemIDs)
             

From b12dba4d15b11d4840158be6affa0070833485b7 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Fri, 29 Nov 2019 20:09:43 +0900
Subject: [PATCH 50/58] optimizations

---
 Sources/DataStack+DataSources.swift           |  3 +-
 ...Internals.DiffableDataSourceSnapshot.swift | 62 +++++++++++++++++--
 Sources/ListSnapshot.swift                    | 40 ++++++++----
 .../NSManagedObjectContext+CoreStore.swift    |  2 +-
 Sources/ObjectPublisher.swift                 |  6 +-
 Sources/ObjectRepresentation.swift            |  2 +-
 Sources/ObjectSnapshot.swift                  |  2 +-
 7 files changed, 92 insertions(+), 25 deletions(-)

diff --git a/Sources/DataStack+DataSources.swift b/Sources/DataStack+DataSources.swift
index 306761a..a1817f4 100644
--- a/Sources/DataStack+DataSources.swift
+++ b/Sources/DataStack+DataSources.swift
@@ -52,7 +52,8 @@ extension DataStack {
      */
     public func publishObject<O: DynamicObject>(_ objectID: O.ObjectID) -> ObjectPublisher<O> {
 
-        return ObjectPublisher<O>(objectID: objectID, context: self.unsafeContext())
+        let context = self.unsafeContext()
+        return context.objectPublisher(objectID: objectID)
     }
     
     /**
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index a587090..2aca088 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -121,6 +121,16 @@ extension Internals {
             return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
 
+        func isReloaded(sectionID: String) -> Bool? {
+
+            return self.structure.isReloaded(sectionID: sectionID)
+        }
+
+        func isReloaded(itemID: NSManagedObjectID) -> Bool? {
+
+            return self.structure.isReloaded(itemID: itemID)
+        }
+
         mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
 
             self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
@@ -329,6 +339,24 @@ extension Internals {
                 return self.sections.lazy.flatMap({ $0.elements }).map({ $0.differenceIdentifier })
             }
 
+            func isReloaded(sectionID: String) -> Bool? {
+
+                return self.sections.first(where: { $0.differenceIdentifier == sectionID })?.isReloaded
+            }
+
+            func isReloaded(itemID: NSManagedObjectID) -> Bool? {
+
+                for section in self.sections {
+
+                    guard let item = section.elements.first(where: { $0.differenceIdentifier == itemID }) else {
+
+                        return nil
+                    }
+                    return item.isReloaded
+                }
+                return nil
+            }
+
             func items(in sectionID: String) -> [NSManagedObjectID] {
 
                 guard let sectionIndex = self.sectionIndex(of: sectionID) else {
@@ -340,7 +368,7 @@ extension Internals {
 
             func section(containing itemID: NSManagedObjectID) -> String? {
 
-                return self.itemPositionMap()[itemID]?.section.differenceIdentifier
+                return self.itemPositionMap(itemID)?.section.differenceIdentifier
             }
 
             mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?) {
@@ -369,7 +397,7 @@ extension Internals {
 
             mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID) {
 
-                guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
+                guard let itemPosition = self.itemPositionMap(beforeItemID) else {
 
                     Internals.abort("Item \(beforeItemID) does not exist")
                 }
@@ -380,7 +408,7 @@ extension Internals {
 
             mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID) {
 
-                guard let itemPosition = self.itemPositionMap()[afterItemID] else {
+                guard let itemPosition = self.itemPositionMap(afterItemID) else {
 
                     Internals.abort("Item \(afterItemID) does not exist")
                 }
@@ -433,7 +461,7 @@ extension Internals {
 
                     Internals.abort("Item \(itemID) does not exist")
                 }
-                guard let itemPosition = self.itemPositionMap()[beforeItemID] else {
+                guard let itemPosition = self.itemPositionMap(beforeItemID) else {
 
                     Internals.abort("Item \(beforeItemID) does not exist")
                 }
@@ -447,7 +475,7 @@ extension Internals {
 
                     Internals.abort("Item \(itemID) does not exist")
                 }
-                guard let itemPosition = self.itemPositionMap()[afterItemID] else {
+                guard let itemPosition = self.itemPositionMap(afterItemID) else {
 
                     Internals.abort("Item \(afterItemID) does not exist")
                 }
@@ -556,7 +584,7 @@ extension Internals {
             @discardableResult
             private mutating func remove(itemID: NSManagedObjectID) -> Item? {
 
-                guard let itemPosition = self.itemPositionMap()[itemID] else {
+                guard let itemPosition = self.itemPositionMap(itemID) else {
 
                     return nil
                 }
@@ -574,6 +602,28 @@ extension Internals {
                 return self.sections.remove(at: sectionIndex)
             }
 
+            private func itemPositionMap(_ itemID: NSManagedObjectID) -> ItemPosition? {
+
+                let sections = self.sections
+                for (sectionIndex, section) in sections.enumerated() {
+
+                    for (itemRelativeIndex, item) in section.elements.enumerated() {
+
+                        guard item.differenceIdentifier == itemID else {
+
+                            continue
+                        }
+                        return ItemPosition(
+                            item: item,
+                            itemRelativeIndex: itemRelativeIndex,
+                            section: section,
+                            sectionIndex: sectionIndex
+                        )
+                    }
+                }
+                return nil
+            }
+
             private func itemPositionMap() -> [NSManagedObjectID: ItemPosition] {
 
                 return self.sections.enumerated().reduce(into: [:]) { result, section in
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index ca13a77..bd47761 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -214,6 +214,28 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return snapshot.numberOfItems(inSection: sectionID) > 0
     }
 
+    /**
+     Checks if the `ListSnapshot` has changes in the specified section.
+
+     - parameter sectionID: the section identifier. Using an index outside the valid range will return `nil`.
+     - returns: `true` if the specified section has changes, `false` if no changes, or `nil` if the `sectionID` does not exist
+     */
+    public func hasChanges(sectionID: String) -> Bool? {
+
+        return self.diffableSnapshot.isReloaded(sectionID: sectionID)
+    }
+
+    /**
+     Checks if the `ListSnapshot` has changes for the specified item.
+
+     - parameter itemID: the item identifier. Using an index outside the valid range will return `nil`.
+     - returns: `true` if the specified item has changes, `false` if no changes, or `nil` if the `itemID` does not exist
+     */
+    public func hasChanges(itemID: NSManagedObjectID) -> Bool? {
+
+        return self.diffableSnapshot.isReloaded(itemID: itemID)
+    }
+
     /**
      The number of items in all sections in the `ListSnapshot`
      */
@@ -340,7 +362,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return indices.map { position in
 
             let itemID = itemIDs[position]
-            return ObjectPublisher<O>(objectID: itemID, context: context)
+            return context.objectPublisher(objectID: itemID)
         }
     }
 
@@ -354,10 +376,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
         let context = self.context!
         let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
-        return itemIDs.map {
-
-            return ObjectPublisher<O>(objectID: $0, context: context)
-        }
+        return itemIDs.map(context.objectPublisher(objectID:))
     }
 
     /**
@@ -374,7 +393,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return itemIndices.map { position in
 
             let itemID = itemIDs[position]
-            return ObjectPublisher<O>(objectID: itemID, context: context)
+            return context.objectPublisher(objectID: itemID)
         }
     }
 
@@ -391,7 +410,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return indices.lazy.map { position in
 
             let itemID = itemIDs[position]
-            return ObjectPublisher<O>(objectID: itemID, context: context)
+            return context.objectPublisher(objectID: itemID)
         }
     }
 
@@ -405,10 +424,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
         let context = self.context!
         let itemIDs = self.diffableSnapshot.itemIdentifiers(inSection: sectionID)
-        return itemIDs.lazy.map {
-
-            return ObjectPublisher<O>(objectID: $0, context: context)
-        }
+        return itemIDs.lazy.map(context.objectPublisher(objectID:))
     }
 
     /**
@@ -425,7 +441,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
         return itemIndices.lazy.map { position in
 
             let itemID = itemIDs[position]
-            return ObjectPublisher<O>(objectID: itemID, context: context)
+            return context.objectPublisher(objectID: itemID)
         }
     }
 
diff --git a/Sources/NSManagedObjectContext+CoreStore.swift b/Sources/NSManagedObjectContext+CoreStore.swift
index fe54272..3602d65 100644
--- a/Sources/NSManagedObjectContext+CoreStore.swift
+++ b/Sources/NSManagedObjectContext+CoreStore.swift
@@ -99,7 +99,7 @@ extension NSManagedObjectContext {
 
                 return objectPublisher
             }
-            let objectPublisher = ObjectPublisher<O>(objectID: objectID, context: self)
+            let objectPublisher = ObjectPublisher<O>.createUncached(objectID: objectID, context: self)
             cache.setObject(objectPublisher, forKey: objectID)
             return objectPublisher
         }
diff --git a/Sources/ObjectPublisher.swift b/Sources/ObjectPublisher.swift
index ce2cfde..d2ff520 100644
--- a/Sources/ObjectPublisher.swift
+++ b/Sources/ObjectPublisher.swift
@@ -130,7 +130,7 @@ public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hash
             
             return self
         }
-        return Self.init(objectID: self.id, context: context)
+        return context.objectPublisher(objectID: self.id)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> O? {
@@ -184,9 +184,9 @@ public final class ObjectPublisher<O: DynamicObject>: ObjectRepresentation, Hash
 
     // MARK: Internal
 
-    internal convenience init(objectID: O.ObjectID, context: NSManagedObjectContext) {
+    internal static func createUncached(objectID: O.ObjectID, context: NSManagedObjectContext) -> ObjectPublisher<O> {
 
-        self.init(
+        return self.init(
             objectID: objectID,
             context: context,
             initializer: ObjectSnapshot<O>.init(objectID:context:)
diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index 863366c..a9d4101 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -98,7 +98,7 @@ extension DynamicObject where Self: ObjectRepresentation {
     public func asPublisher(in dataStack: DataStack) -> ObjectPublisher<Self> {
 
         let context = dataStack.unsafeContext()
-        return ObjectPublisher<Self>(objectID: self.cs_id(), context: context)
+        return context.objectPublisher(objectID: self.cs_id())
     }
 
     public func asReadOnly(in dataStack: DataStack) -> Self? {
diff --git a/Sources/ObjectSnapshot.swift b/Sources/ObjectSnapshot.swift
index f01cbff..9eb5a9f 100644
--- a/Sources/ObjectSnapshot.swift
+++ b/Sources/ObjectSnapshot.swift
@@ -62,7 +62,7 @@ public struct ObjectSnapshot<O: DynamicObject>: ObjectRepresentation, Hashable {
     public func asPublisher(in dataStack: DataStack) -> ObjectPublisher<O> {
         
         let context = dataStack.unsafeContext()
-        return ObjectPublisher<O>(objectID: self.id, context: context)
+        return context.objectPublisher(objectID: self.id)
     }
 
     public func asReadOnly(in dataStack: DataStack) -> O? {

From 6f275eb63a9f7b05ca93d7b1a874a343a474d094 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 2 Dec 2019 10:52:36 +0900
Subject: [PATCH 51/58] add "updatedItemIdentifiers" utility to ListSnapshot

---
 CoreStore.xcodeproj/project.pbxproj           | 20 +++++-----
 ...bleDataSource.CollectionView-AppKit.swift} |  0
 ...Internals.DiffableDataSourceSnapshot.swift | 39 ++++++-------------
 Sources/ListSnapshot.swift                    | 20 ++--------
 4 files changed, 24 insertions(+), 55 deletions(-)
 rename Sources/{diffableDataSource.CollectionView-AppKit.swift => DiffableDataSource.CollectionView-AppKit.swift} (100%)

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index a881a74..124a5b8 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -583,10 +583,10 @@
 		B5A992201EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992211EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992221EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
-		B5AA37F1235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F2235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F3235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F4235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
 		B5AA37FD235C3D1A00FFD4B9 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B5AEFAB51C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
@@ -1014,7 +1014,7 @@
 		B5A80DF52212C1BC006096AA /* Playground_iOS.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground_iOS.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		B5A991EB1E9DC2CE0091A2E3 /* VersionLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionLock.swift; sourceTree = "<group>"; };
 		B5A9921E1EA898710091A2E3 /* UserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfo.swift; sourceTree = "<group>"; };
-		B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "diffableDataSource.CollectionView-AppKit.swift"; sourceTree = "<group>"; };
+		B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionView-AppKit.swift"; sourceTree = "<group>"; };
 		B5AA37FA235C3D1300FFD4B9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
 		B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
@@ -1609,7 +1609,7 @@
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
 				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */,
 				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */,
-				B5AA37F0235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift */,
+				B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -2121,7 +2121,7 @@
 				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B53FBA0B1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
-				B5AA37F1235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5DE522B230BD7CC00A22534 /* Internals.swift in Sources */,
@@ -2474,7 +2474,7 @@
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F2235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322B2346A9AE00FC238B /* ListPublisher.swift in Sources */,
@@ -2698,7 +2698,7 @@
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F4235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322E2346A9B100FC238B /* ListPublisher.swift in Sources */,
@@ -2922,7 +2922,7 @@
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F3235C28EE00FFD4B9 /* diffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322D2346A9B000FC238B /* ListPublisher.swift in Sources */,
diff --git a/Sources/diffableDataSource.CollectionView-AppKit.swift b/Sources/DiffableDataSource.CollectionView-AppKit.swift
similarity index 100%
rename from Sources/diffableDataSource.CollectionView-AppKit.swift
rename to Sources/DiffableDataSource.CollectionView-AppKit.swift
diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index 2aca088..cfa7f05 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -96,6 +96,11 @@ extension Internals {
             return self.structure.allItemIDs
         }
 
+        var updatedItemIdentifiers: Set<NSManagedObjectID> {
+
+            return self.structure.reloadedItems
+        }
+
         func numberOfItems(inSection identifier: String) -> Int {
 
             return self.itemIdentifiers(inSection: identifier).count
@@ -121,16 +126,6 @@ extension Internals {
             return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
 
-        func isReloaded(sectionID: String) -> Bool? {
-
-            return self.structure.isReloaded(sectionID: sectionID)
-        }
-
-        func isReloaded(itemID: NSManagedObjectID) -> Bool? {
-
-            return self.structure.isReloaded(itemID: itemID)
-        }
-
         mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
 
             self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
@@ -282,10 +277,12 @@ extension Internals {
             // MARK: Internal
 
             var sections: [Section]
+            private(set) var reloadedItems: Set<NSManagedObjectID>
 
             init() {
 
                 self.sections = []
+                self.reloadedItems = []
             }
 
             init(sections: [NSFetchedResultsSectionInfo], fetchOffset: Int, fetchLimit: Int?) {
@@ -327,6 +324,7 @@ extension Internals {
                     )
                 }
                 self.sections = newSections
+                self.reloadedItems = []
             }
 
             var allSectionIDs: [String] {
@@ -339,24 +337,6 @@ extension Internals {
                 return self.sections.lazy.flatMap({ $0.elements }).map({ $0.differenceIdentifier })
             }
 
-            func isReloaded(sectionID: String) -> Bool? {
-
-                return self.sections.first(where: { $0.differenceIdentifier == sectionID })?.isReloaded
-            }
-
-            func isReloaded(itemID: NSManagedObjectID) -> Bool? {
-
-                for section in self.sections {
-
-                    guard let item = section.elements.first(where: { $0.differenceIdentifier == itemID }) else {
-
-                        return nil
-                    }
-                    return item.isReloaded
-                }
-                return nil
-            }
-
             func items(in sectionID: String) -> [NSManagedObjectID] {
 
                 guard let sectionIndex = self.sectionIndex(of: sectionID) else {
@@ -488,6 +468,7 @@ extension Internals {
             mutating func update<S: Sequence>(itemIDs: S) where S.Element == NSManagedObjectID {
 
                 let itemPositionMap = self.itemPositionMap()
+                var newItemIDs: Set<NSManagedObjectID> = []
                 for itemID in itemIDs {
 
                     guard let itemPosition = itemPositionMap[itemID] else {
@@ -496,7 +477,9 @@ extension Internals {
                     }
                     self.sections[itemPosition.sectionIndex]
                         .elements[itemPosition.itemRelativeIndex].isReloaded = true
+                    newItemIDs.insert(itemID)
                 }
+                self.reloadedItems.formUnion(newItemIDs)
             }
 
             mutating func append(sectionIDs: [String]) {
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index bd47761..1990072 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -215,25 +215,11 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
     }
 
     /**
-     Checks if the `ListSnapshot` has changes in the specified section.
-
-     - parameter sectionID: the section identifier. Using an index outside the valid range will return `nil`.
-     - returns: `true` if the specified section has changes, `false` if no changes, or `nil` if the `sectionID` does not exist
+     Returns item identifiers for updated objects. This is mainly useful for Data Source adapters such as `UICollectionViewDiffableDataSource` or `UITableViewDiffableDataSource` which work on collection diffs when reloading. Since objects with same IDs resolve as "equal" in their old and new states, adapters may need extra heuristics to determine which row items need reloading. If your row items are all observing changes from each corresponding `ObjectPublisher`, or if you are using CoreStore's built-in `DiffableDataSource`s, there is no need to inspect this property.
      */
-    public func hasChanges(sectionID: String) -> Bool? {
+    var updatedItemIdentifiers: Set<NSManagedObjectID> {
 
-        return self.diffableSnapshot.isReloaded(sectionID: sectionID)
-    }
-
-    /**
-     Checks if the `ListSnapshot` has changes for the specified item.
-
-     - parameter itemID: the item identifier. Using an index outside the valid range will return `nil`.
-     - returns: `true` if the specified item has changes, `false` if no changes, or `nil` if the `itemID` does not exist
-     */
-    public func hasChanges(itemID: NSManagedObjectID) -> Bool? {
-
-        return self.diffableSnapshot.isReloaded(itemID: itemID)
+        return self.diffableSnapshot.updatedItemIdentifiers
     }
 
     /**

From 3e2d62fe6762cd884d3a029fb972d4dfdbf8ba44 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 2 Dec 2019 11:53:23 +0900
Subject: [PATCH 52/58] missed public modifier

---
 Sources/ListSnapshot.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 1990072..1d02178 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -217,7 +217,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
     /**
      Returns item identifiers for updated objects. This is mainly useful for Data Source adapters such as `UICollectionViewDiffableDataSource` or `UITableViewDiffableDataSource` which work on collection diffs when reloading. Since objects with same IDs resolve as "equal" in their old and new states, adapters may need extra heuristics to determine which row items need reloading. If your row items are all observing changes from each corresponding `ObjectPublisher`, or if you are using CoreStore's built-in `DiffableDataSource`s, there is no need to inspect this property.
      */
-    var updatedItemIdentifiers: Set<NSManagedObjectID> {
+    public var updatedItemIdentifiers: Set<NSManagedObjectID> {
 
         return self.diffableSnapshot.updatedItemIdentifiers
     }

From 9a19919392df8f3ab02bfcfad792a1e8eb8e31d0 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 2 Dec 2019 12:21:06 +0900
Subject: [PATCH 53/58] add utility to create ObjectPublisher directly from a
 `DynamicObject` using its own context

---
 Sources/ObjectRepresentation.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Sources/ObjectRepresentation.swift b/Sources/ObjectRepresentation.swift
index a9d4101..843fe67 100644
--- a/Sources/ObjectRepresentation.swift
+++ b/Sources/ObjectRepresentation.swift
@@ -77,6 +77,16 @@ extension DynamicObject where Self: ObjectRepresentation {
 
     // MARK: Public
 
+    /**
+     An `ObjectPublisher` wrapper for the exact same object
+     */
+    public func asPublisher() -> ObjectPublisher<Self>? {
+
+        return self.cs_toRaw()
+            .managedObjectContext
+            .map({ $0.objectPublisher(objectID: self.cs_id()) })
+    }
+
     /**
      A thread-safe `struct` that is a full-copy of the object's properties
      */

From eef1c99f11d78168273657d5265c9e79358287ac Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 17 Dec 2019 19:45:53 +0900
Subject: [PATCH 54/58] Allow custom views to consume ListSnapshot diffable
 data

---
 CoreStore.xcodeproj/project.pbxproj           |  30 +-
 .../CollectionViewDemoViewController.swift    |   4 +-
 .../ListObserverDemoViewController.swift      |   4 +-
 README.md                                     |   4 +-
 Sources/DiffableDataSource.BaseAdapter.swift  | 197 ++++++++++++
 ...ableDataSource.CollectionView-AppKit.swift | 248 ++++++--------
 ...fableDataSource.CollectionView-UIKit.swift | 218 +++++--------
 .../DiffableDataSource.TableView-UIKit.swift  | 304 ++++++------------
 Sources/DiffableDataSource.Target.swift       | 211 ++++++++++++
 Sources/DiffableDataSource.swift              |   2 +-
 .../Internals.DiffableDataUIDispatcher.swift  |  74 +++--
 Sources/ListPublisher.swift                   |   2 +-
 Sources/ListSnapshot.swift                    |   2 +-
 13 files changed, 764 insertions(+), 536 deletions(-)
 create mode 100644 Sources/DiffableDataSource.BaseAdapter.swift
 create mode 100644 Sources/DiffableDataSource.Target.swift

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 124a5b8..828e458 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -141,6 +141,13 @@
 		B51260941E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */; };
 		B51260951E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */; };
 		B51260961E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */; };
+		B514EF0E23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift in Sources */ = {isa = PBXBuildFile; fileRef = B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */; };
+		B514EF0F23A8DB180093DBA4 /* DiffableDataSource.Target.swift in Sources */ = {isa = PBXBuildFile; fileRef = B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */; };
+		B514EF1023A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */ = {isa = PBXBuildFile; fileRef = B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */; };
+		B514EF1123A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */ = {isa = PBXBuildFile; fileRef = B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */; };
+		B514EF1223A8DB1D0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */; };
+		B514EF1323A8DB1D0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */; };
+		B514EF1423A8DB1E0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */; };
 		B51B5C2B22D43931009FA3BA /* String+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2A22D43931009FA3BA /* String+KeyPaths.swift */; };
 		B51B5C2D22D43E38009FA3BA /* KeyPath+KeyPaths.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51B5C2C22D43E38009FA3BA /* KeyPath+KeyPaths.swift */; };
 		B51FE5AB1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51FE5AA1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift */; };
@@ -668,6 +675,7 @@
 		B5D33A041E96012400C880DE /* Relationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D33A001E96012400C880DE /* Relationship.swift */; };
 		B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
 		B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0119FD00C9000E91BB /* Foundation.framework */; };
+		B5D4A6B723A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */; };
 		B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5B81CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5B91CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
@@ -906,6 +914,7 @@
 		B512607E1E97A18000402229 /* CoreStoreObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Convenience.swift"; sourceTree = "<group>"; };
 		B51260881E9B252B00402229 /* NSEntityDescription+DynamicModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSEntityDescription+DynamicModel.swift"; sourceTree = "<group>"; };
 		B51260921E9B28F100402229 /* Internals.EntityIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Internals.EntityIdentifier.swift; sourceTree = "<group>"; };
+		B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.Target.swift; sourceTree = "<group>"; };
 		B51B5C2A22D43931009FA3BA /* String+KeyPaths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+KeyPaths.swift"; sourceTree = "<group>"; };
 		B51B5C2C22D43E38009FA3BA /* KeyPath+KeyPaths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyPath+KeyPaths.swift"; sourceTree = "<group>"; };
 		B51FE5AA1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+CustomDebugStringConvertible.swift"; sourceTree = "<group>"; };
@@ -1042,6 +1051,7 @@
 		B5D33A001E96012400C880DE /* Relationship.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Relationship.swift; sourceTree = "<group>"; };
 		B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		B5D39A0119FD00C9000E91BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.BaseAdapter.swift; sourceTree = "<group>"; };
 		B5D7A5B51CA3BF8F005C752B /* CSInto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInto.swift; sourceTree = "<group>"; };
 		B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DataStack+DataSources.swift"; sourceTree = "<group>"; };
 		B5D8CA7A2346EC550055D7D1 /* ListPublisherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListPublisherTests.swift; sourceTree = "<group>"; };
@@ -1607,6 +1617,8 @@
 				B50EE14123473C92009B8C47 /* CoreStoreObject+DataSources.swift */,
 				B5D8CA752346E7590055D7D1 /* DataStack+DataSources.swift */,
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
+				B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */,
+				B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */,
 				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */,
 				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */,
 				B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */,
@@ -2089,6 +2101,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B5DE5230230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
@@ -2126,7 +2139,6 @@
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5DE522B230BD7CC00A22534 /* Internals.swift in Sources */,
 				B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */,
-				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B5ECDC1D1CA81A2100C7F112 /* CSDataStack+Querying.swift in Sources */,
 				B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B53FBA121CAB63CB00F0D40A /* Progress+ObjectiveC.swift in Sources */,
@@ -2224,6 +2236,7 @@
 				B5BF7FBC234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */,
 				B5215CA41FA47DFD00139E3A /* FetchChainBuilder.swift in Sources */,
 				B5D33A011E96012400C880DE /* Relationship.swift in Sources */,
+				B514EF0E23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift in Sources */,
 				B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */,
 				B56923C91EB82410007C4DC9 /* NSManagedObjectModel+Migration.swift in Sources */,
 				B56923E41EB827F5007C4DC9 /* CustomSchemaMappingProvider.swift in Sources */,
@@ -2240,6 +2253,7 @@
 				B512607F1E97A18000402229 /* CoreStoreObject+Convenience.swift in Sources */,
 				B5E84EF81AFF846E0064E85B /* CoreStore+Transaction.swift in Sources */,
 				B5E84F301AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift in Sources */,
+				B5D4A6B723A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift in Sources */,
 				B5831B7A1F34ACBA00A9F647 /* Transformable.swift in Sources */,
 				B5BF7FB2234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B546F9691C9AF26D00D5AC55 /* CSInMemoryStore.swift in Sources */,
@@ -2387,6 +2401,7 @@
 				B53FBA001CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D31C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
 				82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */,
+				B514EF1223A8DB1D0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */,
 				B53FBA1A1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */,
 				B5519A5A1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
@@ -2435,6 +2450,7 @@
 				B5215CAA1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
 				B50E175823517DE4004F033C /* Differentiable.swift in Sources */,
 				82BA18BA1C4BBD4A00A0916E /* Select.swift in Sources */,
+				B514EF0F23A8DB180093DBA4 /* DiffableDataSource.Target.swift in Sources */,
 				B52F744B1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
 				B5E2222C1CA51B6E00BA2E95 /* CSUnsafeDataTransaction.swift in Sources */,
@@ -2538,9 +2554,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5220E1E1D13080D009BC71E /* CSListMonitor.swift in Sources */,
-				B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
+				B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
+				B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
 				B5CA2B0B1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B56923F81EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
 				B52DD1BE1BE1F94300949AFE /* Progress+Convenience.swift in Sources */,
@@ -2581,7 +2600,6 @@
 				B50564D62350CC3100482308 /* PropertyProtocol.swift in Sources */,
 				B5831B781F34AC7A00A9F647 /* RelationshipProtocol.swift in Sources */,
 				B52DD1981BE1F92500949AFE /* CoreStore+Setup.swift in Sources */,
-				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5D339F41E94AF5800C880DE /* CoreStoreStrings.swift in Sources */,
 				B5220E241D13085E009BC71E /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B559CD471CAA8B6300E4D58B /* CSSetupResult.swift in Sources */,
@@ -2609,6 +2627,7 @@
 				B53FBA1C1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				B5F8496F234898240029D57B /* ListSnapshot.swift in Sources */,
 				B5831F452212700500D8604C /* Where.Expression.swift in Sources */,
+				B514EF1423A8DB1E0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */,
 				B51260961E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B5ECDBE31CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
 				B5ECDC031CA80CBA00C7F112 /* CSWhere.swift in Sources */,
@@ -2657,6 +2676,7 @@
 				B5220E1A1D130791009BC71E /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B5215CAC1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
 				B53FBA0F1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
+				B514EF1123A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */,
 				B50E175A23517DE4004F033C /* Differentiable.swift in Sources */,
 				B52F744D1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B52DD19A1BE1F92800949AFE /* CoreStore+Logging.swift in Sources */,
@@ -2698,7 +2718,6 @@
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166886232B9ED20097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
 				B50E175F2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D182227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322E2346A9B100FC238B /* ListPublisher.swift in Sources */,
@@ -2716,7 +2735,6 @@
 				B5D339EA1E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC9234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B52DD1AA1BE1F93500949AFE /* TypeErasedClauses.swift in Sources */,
-				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
 				B53FBA021CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B51FE5AF1CD4D00300E54258 /* CoreStore+CustomDebugStringConvertible.swift in Sources */,
 			);
@@ -2835,6 +2853,7 @@
 				B51260951E9B28F100402229 /* Internals.EntityIdentifier.swift in Sources */,
 				B53FBA011CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D41C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
+				B514EF1323A8DB1D0093DBA4 /* DiffableDataSource.BaseAdapter.swift in Sources */,
 				B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */,
 				B53FBA1B1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				B5519A5B1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
@@ -2883,6 +2902,7 @@
 				B56321A21BD65216006C9394 /* ListObserver.swift in Sources */,
 				B50E175923517DE4004F033C /* Differentiable.swift in Sources */,
 				B5215CAB1FA4810300139E3A /* QueryChainBuilder.swift in Sources */,
+				B514EF1023A8DB190093DBA4 /* DiffableDataSource.Target.swift in Sources */,
 				B563218A1BD65216006C9394 /* SynchronousDataTransaction.swift in Sources */,
 				B52F744C1E9B8740005F3DAC /* CoreStoreSchema.swift in Sources */,
 				B5AEFAB71C9962AE00AD137F /* CoreStoreBridge.swift in Sources */,
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift
index abc664f..4fe5637 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/CollectionViewDemoViewController.swift	
@@ -51,7 +51,7 @@ final class CollectionViewDemoViewController: UICollectionViewController {
         ]
         self.filterBarButton = filterBarButton
 
-        self.dataSource = DiffableDataSource.CollectionView<Palette>(
+        self.dataSource = DiffableDataSource.CollectionViewAdapter<Palette>(
             collectionView: self.collectionView,
             dataStack: ColorsDemo.stack,
             cellProvider: { (collectionView, indexPath, palette) in
@@ -118,7 +118,7 @@ final class CollectionViewDemoViewController: UICollectionViewController {
     // MARK: Private
 
     private var filterBarButton: UIBarButtonItem?
-    private var dataSource: DiffableDataSource.CollectionView<Palette>?
+    private var dataSource: DiffableDataSource.CollectionViewAdapter<Palette>?
 
     deinit {
 
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 3df9d0e..f1b1907 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -16,7 +16,7 @@ final class ListObserverDemoViewController: UITableViewController {
 
     // MARK: - EditableDataSource
 
-    final class EditableDataSource: DiffableDataSource.TableView<Palette> {
+    final class EditableDataSource: DiffableDataSource.TableViewAdapter<Palette> {
 
         override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
 
@@ -130,7 +130,7 @@ final class ListObserverDemoViewController: UITableViewController {
     // MARK: Private
     
     private var filterBarButton: UIBarButtonItem?
-    private var dataSource: DiffableDataSource.TableView<Palette>?
+    private var dataSource: DiffableDataSource.TableViewAdapter<Palette>?
     
     deinit {
         
diff --git a/README.md b/README.md
index 04de883..e679af5 100644
--- a/README.md
+++ b/README.md
@@ -1506,9 +1506,9 @@ Note that the owner instance will not be retained. You may call `ListPublisher.r
 
 The `ListSnapshot` returned from the `ListPublisher.snapshot` property returns a full-copy `struct` of all sections and `NSManagedObject` items in the list. This is ideal for managing states as they are thread-safe and are not affected by further changes to the result set.  `ListPublisher` automatically updates its `snapshot` value to the latest state of the fetch. 
 
-Unlike  `ListMonitor`s (See [`ListMonitor` examples](#observe-detailed-list-changes) below), a `ListPublisher` does not track detailed inserts, deletes, and moves. In return, a `ListPublisher` is a lot more lightweight and are designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s:
+Unlike  `ListMonitor`s (See [`ListMonitor` examples](#observe-detailed-list-changes) below), a `ListPublisher` does not track detailed inserts, deletes, and moves. In return, a `ListPublisher` is a lot more lightweight and are designed to work well with `DiffableDataSource.TableViewAdapter`s and `DiffableDataSource.CollectionViewAdapter`s:
 ```swift
-self.dataSource = DiffableDataSource.CollectionView<Person>(
+self.dataSource = DiffableDataSource.CollectionViewAdapter<Person>(
     collectionView: self.collectionView,
     dataStack: CoreStoreDefaults.dataStack,
     cellProvider: { (collectionView, indexPath, person) in
diff --git a/Sources/DiffableDataSource.BaseAdapter.swift b/Sources/DiffableDataSource.BaseAdapter.swift
new file mode 100644
index 0000000..3886031
--- /dev/null
+++ b/Sources/DiffableDataSource.BaseAdapter.swift
@@ -0,0 +1,197 @@
+//
+//  DiffableDataSource.BaseAdapter.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - DiffableDataSource
+
+extension DiffableDataSource {
+
+    // MARK: - BaseAdapter
+
+    /**
+     The `DiffableDataSource.BaseAdapter` serves as a superclass for consumers of `ListPublisher` and `ListSnapshot` diffable data.
+     ```
+     self.dataSource = DiffableDataSource.TableViewAdapter<Person>(
+         tableView: self.tableView,
+         dataStack: CoreStoreDefaults.dataStack,
+         cellProvider: { (tableView, indexPath, person) in
+             let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
+             cell.setPerson(person)
+             return cell
+         }
+     )
+     ```
+     The dataSource can then apply changes from a `ListPublisher` as shown:
+     ```
+     listPublisher.addObserver(self) { [weak self] (listPublisher) in
+        self?.dataSource?.apply(
+            listPublisher.snapshot,
+            animatingDifferences: true
+        )
+     }
+     ```
+     - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources
+     */
+    open class BaseAdapter<O: DynamicObject, T: Target>: NSObject {
+
+        // MARK: Public
+
+        /**
+         The object type represented by this dataSource
+         */
+        public typealias ObjectType = O
+
+        /**
+         The target to be updated by this dataSource
+         */
+        public let target: T
+
+        /**
+         The `DataStack` where object fetches are performed
+         */
+        public let dataStack: DataStack
+
+        /**
+         Initializes the `DiffableDataSource.BaseAdapter` object. This instance needs to be held on (retained) for as long as the target's lifecycle.
+         ```
+         self.dataSource = DiffableDataSource.TableViewAdapterAdapter<Person>(
+             tableView: self.tableView,
+             dataStack: CoreStoreDefaults.dataStack,
+             cellProvider: { (tableView, indexPath, person) in
+                 let cell = tableView.dequeueReusableCell(withIdentifier: "PersonCell") as! PersonCell
+                 cell.setPerson(person)
+                 return cell
+             }
+         )
+         ```
+         - parameter tableView: the `UITableView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.TableViewAdapter`.
+         - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
+         - parameter cellProvider: a closure that configures and returns the `UITableViewCell` for the object
+         */
+        public init(target: T, dataStack: DataStack) {
+
+            self.target = target
+            self.dataStack = dataStack
+            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
+        }
+
+        /**
+         Reloads the `UITableView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
+         ```
+         listPublisher.addObserver(self) { [weak self] (listPublisher) in
+            self?.dataSource?.apply(
+                listPublisher.snapshot,
+                animatingDifferences: true
+            )
+         }
+         ```
+         If the `defaultRowAnimation` is configured to, animations are also applied accordingly.
+
+         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
+         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
+         */
+        open func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true, completion: @escaping () -> Void = {}) {
+
+            let diffableSnapshot = snapshot.diffableSnapshot
+            self.dispatcher.apply(
+                diffableSnapshot,
+                target: self.target,
+                animatingDifferences: animatingDifferences,
+                performUpdates: { target, changeset, setSections in
+
+                    target.reload(
+                        using: changeset,
+                        animated: animatingDifferences,
+                        setData: setSections
+                    )
+                },
+                completion: completion
+            )
+        }
+
+        /**
+         Returns the number of sections
+
+         - parameter indexPath: the `IndexPath` to search for
+         - returns: the number of sections
+         */
+        public func numberOfSections() -> Int {
+
+            return self.dispatcher.numberOfSections()
+        }
+
+        /**
+         Returns the number of items at the specified section, or `nil` if the section is not found
+
+         - parameter section: the section index to search for
+         - returns: the number of items at the specified section, or `nil` if the section is not found
+         */
+        public func numberOfItems(inSection section: Int) -> Int? {
+
+            return self.dispatcher.numberOfItems(inSection: section)
+        }
+
+        /**
+         Returns the section identifier at the specified index, or `nil` if not found
+
+         - parameter section: the section index to search for
+         - returns: the section identifier at the specified indec, or `nil` if not found
+         */
+        public func sectionID(for section: Int) -> String? {
+
+            return self.dispatcher.sectionIdentifier(inSection: section)
+        }
+
+        /**
+         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+
+         - parameter indexPath: the `IndexPath` to search for
+         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
+         */
+        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
+
+            return self.dispatcher.itemIdentifier(for: indexPath)
+        }
+
+        /**
+         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+
+         - parameter itemID: the object identifier to search for
+         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
+         */
+        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
+
+            return self.dispatcher.indexPath(for: itemID)
+        }
+
+
+        // MARK: Internal
+
+        internal let dispatcher: Internals.DiffableDataUIDispatcher<O>
+    }
+}
diff --git a/Sources/DiffableDataSource.CollectionView-AppKit.swift b/Sources/DiffableDataSource.CollectionView-AppKit.swift
index 4baafe2..25a65df 100644
--- a/Sources/DiffableDataSource.CollectionView-AppKit.swift
+++ b/Sources/DiffableDataSource.CollectionView-AppKit.swift
@@ -1,5 +1,5 @@
 //
-//  DiffableDataSource.CollectionView-AppKit.swift
+//  DiffableDataSource.CollectionViewAdapter-AppKit.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -36,10 +36,10 @@ extension DiffableDataSource {
     // MARK: - CollectionView
     
     /**
-     The `DiffableDataSource.CollectionView` serves as a `NSCollectionViewDataSource` that handles `ListPublisher` snapshots for a `NSCollectionView`. Subclasses of `DiffableDataSource.CollectionView` may override some `NSCollectionViewDataSource` methods as needed.
-     The `DiffableDataSource.CollectionView` instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
+     The `DiffableDataSource.CollectionViewAdapter` serves as a `NSCollectionViewDataSource` that handles `ListPublisher` snapshots for a `NSCollectionView`. Subclasses of `DiffableDataSource.CollectionViewAdapter` may override some `NSCollectionViewDataSource` methods as needed.
+     The `DiffableDataSource.CollectionViewAdapter` instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
      ```
-     self.dataSource = DiffableDataSource.CollectionView<Person>(
+     self.dataSource = DiffableDataSource.CollectionViewAdapter<Person>(
          collectionView: self.collectionView,
          dataStack: CoreStoreDefaults.dataStack,
          itemProvider: { (collectionView, indexPath, person) in
@@ -58,22 +58,17 @@ extension DiffableDataSource {
         )
      }
      ```
-     `DiffableDataSource.CollectionView` fully handles the reload animations.
+     `DiffableDataSource.CollectionViewAdapter` fully handles the reload animations.
      - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources     
      */
-    open class CollectionView<O: DynamicObject>: NSObject, NSCollectionViewDataSource {
+    open class CollectionViewAdapter<O: DynamicObject>: BaseAdapter<O, DefaultCollectionViewTarget<NSCollectionView>>, NSCollectionViewDataSource {
 
         // MARK: Public
         
         /**
-         The object type represented by this dataSource
-         */
-        public typealias ObjectType = O
-        
-        /**
-         Initializes the `DiffableDataSource.CollectionView`. This instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
+         Initializes the `DiffableDataSource.CollectionViewAdapter`. This instance needs to be held on (retained) for as long as the `NSCollectionView`'s lifecycle.
          ```
-         self.dataSource = DiffableDataSource.CollectionView<Person>(
+         self.dataSource = DiffableDataSource.CollectionViewAdapter<Person>(
              collectionView: self.collectionView,
              dataStack: CoreStoreDefaults.dataStack,
              itemProvider: { (collectionView, indexPath, person) in
@@ -83,78 +78,20 @@ extension DiffableDataSource {
              }
          )
          ```
-         - parameter collectionView: the `NSCollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionView`.
+         - parameter collectionView: the `NSCollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionViewAdapter`.
          - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
          - parameter itemProvider: a closure that configures and returns the `NSCollectionViewItem` for the object
          */
         @nonobjc
         public init(collectionView: NSCollectionView, dataStack: DataStack, itemProvider: @escaping (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?, supplementaryViewProvider: @escaping (NSCollectionView, String, IndexPath) -> NSView? = { _, _, _ in nil }) {
 
-            self.collectionView = collectionView
             self.itemProvider = itemProvider
             self.supplementaryViewProvider = supplementaryViewProvider
-            self.dataStack = dataStack
-            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
 
-            super.init()
+            super.init(target: .init(collectionView), dataStack: dataStack)
 
             collectionView.dataSource = self
         }
-        
-        /**
-         Reloads the `NSCollectionView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
-         ```
-         listPublisher.addObserver(self) { [weak self] (listPublisher) in
-            self?.dataSource?.apply(
-                listPublisher.snapshot,
-                animatingDifferences: true
-            )
-         }
-         ```
-         
-         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
-         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
-         */
-        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
-
-            let diffableSnapshot = snapshot.diffableSnapshot
-            self.dispatcher.apply(
-                diffableSnapshot as! Internals.DiffableDataSourceSnapshot,
-                view: self.collectionView,
-                animatingDifferences: animatingDifferences,
-                performUpdates: { collectionView, changeset, setSections in
-
-                    collectionView.reload(
-                        using: changeset,
-                        setData: setSections
-                    )
-                }
-            )
-        }
-        
-        /**
-         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         
-         - parameter indexPath: the `IndexPath` to search for
-         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         */
-        @nonobjc
-        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
-
-            return self.dispatcher.itemIdentifier(for: indexPath)
-        }
-        
-        /**
-         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         
-         - parameter itemID: the object identifier to search for
-         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         */
-        @nonobjc
-        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
-
-            return self.dispatcher.indexPath(for: itemID)
-        }
 
 
         // MARK: - NSCollectionViewDataSource
@@ -162,19 +99,19 @@ extension DiffableDataSource {
         @objc
         public dynamic func numberOfSections(in collectionView: NSCollectionView) -> Int {
 
-            return self.dispatcher.numberOfSections()
+            return self.numberOfSections()
         }
 
         @objc
         public dynamic func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
 
-            return self.dispatcher.numberOfItems(inSection: section)
+            return self.numberOfItems(inSection: section) ?? 0
         }
 
         @objc
         open dynamic func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
 
-            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
+            guard let objectID = self.itemID(for: indexPath) else {
 
                 Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
             }
@@ -202,94 +139,93 @@ extension DiffableDataSource {
 
         // MARK: Private
 
-        private weak var collectionView: NSCollectionView?
-
-        private let dataStack: DataStack
         private let itemProvider: (NSCollectionView, IndexPath, O) -> NSCollectionViewItem?
         private let supplementaryViewProvider: (NSCollectionView, String, IndexPath) -> NSView?
-        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
+    }
+
+
+    // MARK: - DefaultCollectionViewTarget
+
+    public struct DefaultCollectionViewTarget<T: NSCollectionView>: Target {
+
+        // MARK: Public
+
+        public typealias Base = T
+
+        public internal(set) weak var base: Base?
+
+        public init(_ base: Base) {
+
+            self.base = base
+        }
+
+
+        // MARK: DiffableDataSource.Target:
+
+        public var shouldSuspendBatchUpdates: Bool {
+
+            return self.base?.window == nil
+        }
+
+        public func deleteSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.deleteSections(indices)
+        }
+
+        public func insertSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.insertSections(indices)
+        }
+
+        public func reloadSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.reloadSections(indices)
+        }
+
+        public func moveSection(at index: IndexSet.Element, to newIndex: IndexSet.Element, animated: Bool) {
+
+            self.base?.moveSection(index, toSection: newIndex)
+        }
+
+        public func deleteItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.deleteItems(at: Set(indexPaths))
+        }
+
+        public func insertItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.insertItems(at: Set(indexPaths))
+        }
+
+        public func reloadItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.reloadItems(at: Set(indexPaths))
+        }
+
+        public func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, animated: Bool) {
+
+            self.base?.moveItem(at: indexPath, to: newIndexPath)
+        }
+
+        public func performBatchUpdates(updates: () -> Void, animated: Bool) {
+
+            self.base?.animator().performBatchUpdates(updates, completionHandler: nil)
+        }
+
+        public func reloadData() {
+
+            self.base?.reloadData()
+        }
     }
 }
 
 
-// MARK: - NSCollectionView
+// MARK: - Deprecated
 
-extension NSCollectionView {
+extension DiffableDataSource {
 
-    // MARK: FilePrivate
-    
-    // Implementation based on https://github.com/ra1028/DiffableDataSources
-    @nonobjc
-    fileprivate func reload<C, O>(
-        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
-        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
-        setData: (C) -> Void
-    ) {
-
-        if case .none = window, let data = stagedChangeset.last?.data {
-
-            setData(data)
-            self.reloadData()
-            return
-        }
-        for changeset in stagedChangeset {
-
-            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
-
-                setData(data)
-                self.reloadData()
-                return
-            }
-            self.animator().performBatchUpdates(
-                {
-                    setData(changeset.data)
-
-                    if !changeset.sectionDeleted.isEmpty {
-
-                        self.deleteSections(IndexSet(changeset.sectionDeleted))
-                    }
-                    if !changeset.sectionInserted.isEmpty {
-
-                        self.insertSections(IndexSet(changeset.sectionInserted))
-                    }
-                    if !changeset.sectionUpdated.isEmpty {
-
-                        self.reloadSections(IndexSet(changeset.sectionUpdated))
-                    }
-                    for (source, target) in changeset.sectionMoved {
-
-                        self.moveSection(source, toSection: target)
-                    }
-                    if !changeset.elementDeleted.isEmpty {
-
-                        self.deleteItems(
-                            at: Set(changeset.elementDeleted.map { IndexPath(item: $0.element, section: $0.section) })
-                        )
-                    }
-                    if !changeset.elementInserted.isEmpty {
-
-                        self.insertItems(
-                            at: Set(changeset.elementInserted.map { IndexPath(item: $0.element, section: $0.section) })
-                        )
-                    }
-                    if !changeset.elementUpdated.isEmpty {
-
-                        self.reloadItems(
-                            at: Set(changeset.elementUpdated.map { IndexPath(item: $0.element, section: $0.section) })
-                        )
-                    }
-                    for (source, target) in changeset.elementMoved {
-
-                        self.moveItem(
-                            at: IndexPath(item: source.element, section: source.section),
-                            to: IndexPath(item: target.element, section: target.section)
-                        )
-                    }
-                },
-                completionHandler: nil
-            )
-        }
-    }
+    @available(*, deprecated, renamed: "CollectionViewAdapter")
+    public typealias CollectionView = CollectionViewAdapter
 }
 
 
diff --git a/Sources/DiffableDataSource.CollectionView-UIKit.swift b/Sources/DiffableDataSource.CollectionView-UIKit.swift
index 04943f0..b1573a9 100644
--- a/Sources/DiffableDataSource.CollectionView-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionView-UIKit.swift
@@ -1,5 +1,5 @@
 //
-//  DiffableDataSource.CollectionView-UIKit.swift
+//  DiffableDataSource.CollectionViewAdapter-UIKit.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -36,10 +36,10 @@ extension DiffableDataSource {
     // MARK: - CollectionView
     
     /**
-     The `DiffableDataSource.CollectionView` serves as a `UICollectionViewDataSource` that handles `ListPublisher` snapshots for a `UICollectionView`. Subclasses of `DiffableDataSource.CollectionView` may override some `UICollectionViewDataSource` methods as needed.
-     The `DiffableDataSource.CollectionView` instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
+     The `DiffableDataSource.CollectionViewAdapter` serves as a `UICollectionViewDataSource` that handles `ListPublisher` snapshots for a `UICollectionView`. Subclasses of `DiffableDataSource.CollectionViewAdapter` may override some `UICollectionViewDataSource` methods as needed.
+     The `DiffableDataSource.CollectionViewAdapter` instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
      ```
-     self.dataSource = DiffableDataSource.CollectionView<Person>(
+     self.dataSource = DiffableDataSource.CollectionViewAdapter<Person>(
          collectionView: self.collectionView,
          dataStack: CoreStoreDefaults.dataStack,
          cellProvider: { (collectionView, indexPath, person) in
@@ -58,22 +58,17 @@ extension DiffableDataSource {
         )
      }
      ```
-     `DiffableDataSource.CollectionView` fully handles the reload animations.
+     `DiffableDataSource.CollectionViewAdapter` fully handles the reload animations.
      - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources     
      */
-    open class CollectionView<O: DynamicObject>: NSObject, UICollectionViewDataSource {
+    open class CollectionViewAdapter<O: DynamicObject>: BaseAdapter<O, DefaultCollectionViewTarget<UICollectionView>>, UICollectionViewDataSource {
 
         // MARK: Public
         
         /**
-         The object type represented by this dataSource
-         */
-        public typealias ObjectType = O
-        
-        /**
-         Initializes the `DiffableDataSource.CollectionView`. This instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
+         Initializes the `DiffableDataSource.CollectionViewAdapter`. This instance needs to be held on (retained) for as long as the `UICollectionView`'s lifecycle.
          ```
-         self.dataSource = DiffableDataSource.CollectionView<Person>(
+         self.dataSource = DiffableDataSource.CollectionViewAdapter<Person>(
              collectionView: self.collectionView,
              dataStack: CoreStoreDefaults.dataStack,
              cellProvider: { (collectionView, indexPath, person) in
@@ -83,79 +78,20 @@ extension DiffableDataSource {
              }
          )
          ```
-         - parameter collectionView: the `UICollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionView`.
+         - parameter collectionView: the `UICollectionView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.CollectionViewAdapter`.
          - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
          - parameter cellProvider: a closure that configures and returns the `UICollectionViewCell` for the object
          - parameter supplementaryViewProvider: an optional closure for providing `UICollectionReusableView` supplementary views. If not set, defaults to returning `nil`
          */
-        @nonobjc
         public init(collectionView: UICollectionView, dataStack: DataStack, cellProvider: @escaping (UICollectionView, IndexPath, O) -> UICollectionViewCell?, supplementaryViewProvider: @escaping (UICollectionView, String, IndexPath) -> UICollectionReusableView? = { _, _, _ in nil }) {
 
-            self.collectionView = collectionView
             self.cellProvider = cellProvider
             self.supplementaryViewProvider = supplementaryViewProvider
-            self.dataStack = dataStack
-            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
 
-            super.init()
+            super.init(target: .init(collectionView), dataStack: dataStack)
 
             collectionView.dataSource = self
         }
-        
-        /**
-         Reloads the `UICollectionView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
-         ```
-         listPublisher.addObserver(self) { [weak self] (listPublisher) in
-            self?.dataSource?.apply(
-                listPublisher.snapshot,
-                animatingDifferences: true
-            )
-         }
-         ```
-         
-         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
-         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
-         */
-        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
-
-            let diffableSnapshot = snapshot.diffableSnapshot
-            self.dispatcher.apply(
-                diffableSnapshot,
-                view: self.collectionView,
-                animatingDifferences: animatingDifferences,
-                performUpdates: { collectionView, changeset, setSections in
-
-                    collectionView.reload(
-                        using: changeset,
-                        setData: setSections
-                    )
-                }
-            )
-        }
-        
-        /**
-         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         
-         - parameter indexPath: the `IndexPath` to search for
-         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         */
-        @nonobjc
-        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
-
-            return self.dispatcher.itemIdentifier(for: indexPath)
-        }
-        
-        /**
-         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         
-         - parameter itemID: the object identifier to search for
-         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         */
-        @nonobjc
-        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
-
-            return self.dispatcher.indexPath(for: itemID)
-        }
 
 
         // MARK: - UICollectionViewDataSource
@@ -163,19 +99,19 @@ extension DiffableDataSource {
         @objc
         public dynamic func numberOfSections(in collectionView: UICollectionView) -> Int {
 
-            return self.dispatcher.numberOfSections()
+            return self.numberOfSections()
         }
 
         @objc
         public dynamic func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
 
-            return self.dispatcher.numberOfItems(inSection: section)
+            return self.numberOfItems(inSection: section) ?? 0
         }
 
         @objc
         open dynamic func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
 
-            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
+            guard let objectID = self.itemID(for: indexPath) else {
 
                 Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
             }
@@ -203,95 +139,93 @@ extension DiffableDataSource {
 
         // MARK: Private
 
-        private weak var collectionView: UICollectionView?
-
-        private let dataStack: DataStack
         private let cellProvider: (UICollectionView, IndexPath, O) -> UICollectionViewCell?
         private let supplementaryViewProvider: (UICollectionView, String, IndexPath) -> UICollectionReusableView?
-        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
     }
-}
 
 
-// MARK: - UICollectionView
+    // MARK: - DefaultCollectionViewTarget
 
-extension UICollectionView {
+    public struct DefaultCollectionViewTarget<T: UICollectionView>: Target {
 
-    // MARK: FilePrivate
-    
-    // Implementation based on https://github.com/ra1028/DiffableDataSources
-    @nonobjc
-    fileprivate func reload<C, O>(
-        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
-        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
-        setData: (C) -> Void
-    ) {
+        // MARK: Public
 
-        if case .none = window, let data = stagedChangeset.last?.data {
+        public typealias Base = T
 
-            setData(data)
-            self.reloadData()
-            return
+        public internal(set) weak var base: Base?
+
+        public init(_ base: Base) {
+
+            self.base = base
         }
-        for changeset in stagedChangeset {
 
-            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
 
-                setData(data)
-                self.reloadData()
-                return
-            }
-            self.performBatchUpdates(
-                {
-                    setData(changeset.data)
+        // MARK: DiffableDataSource.Target
 
-                    if !changeset.sectionDeleted.isEmpty {
+        public var shouldSuspendBatchUpdates: Bool {
 
-                        self.deleteSections(IndexSet(changeset.sectionDeleted))
-                    }
-                    if !changeset.sectionInserted.isEmpty {
+            return self.base?.window == nil
+        }
 
-                        self.insertSections(IndexSet(changeset.sectionInserted))
-                    }
-                    if !changeset.sectionUpdated.isEmpty {
+        public func deleteSections(at indices: IndexSet, animated: Bool) {
 
-                        self.reloadSections(IndexSet(changeset.sectionUpdated))
-                    }
-                    for (source, target) in changeset.sectionMoved {
+            self.base?.deleteSections(indices)
+        }
 
-                        self.moveSection(source, toSection: target)
-                    }
-                    if !changeset.elementDeleted.isEmpty {
+        public func insertSections(at indices: IndexSet, animated: Bool) {
 
-                        self.deleteItems(
-                            at: changeset.elementDeleted.map { IndexPath(item: $0.element, section: $0.section) }
-                        )
-                    }
-                    if !changeset.elementInserted.isEmpty {
+            self.base?.insertSections(indices)
+        }
 
-                        self.insertItems(
-                            at: changeset.elementInserted.map { IndexPath(item: $0.element, section: $0.section) }
-                        )
-                    }
-                    if !changeset.elementUpdated.isEmpty {
+        public func reloadSections(at indices: IndexSet, animated: Bool) {
 
-                        self.reloadItems(
-                            at: changeset.elementUpdated.map { IndexPath(item: $0.element, section: $0.section) }
-                        )
-                    }
-                    for (source, target) in changeset.elementMoved {
+            self.base?.reloadSections(indices)
+        }
 
-                        self.moveItem(
-                            at: IndexPath(item: source.element, section: source.section),
-                            to: IndexPath(item: target.element, section: target.section)
-                        )
-                    }
-                },
-                completion: nil
-            )
+        public func moveSection(at index: IndexSet.Element, to newIndex: IndexSet.Element, animated: Bool) {
+
+            self.base?.moveSection(index, toSection: newIndex)
+        }
+
+        public func deleteItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.deleteItems(at: indexPaths)
+        }
+
+        public func insertItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.insertItems(at: indexPaths)
+        }
+
+        public func reloadItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.reloadItems(at: indexPaths)
+        }
+
+        public func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, animated: Bool) {
+
+            self.base?.moveItem(at: indexPath, to: newIndexPath)
+        }
+
+        public func performBatchUpdates(updates: () -> Void, animated: Bool) {
+
+            self.base?.performBatchUpdates(updates, completion: nil)
+        }
+
+        public func reloadData() {
+
+            self.base?.reloadData()
         }
     }
 }
 
 
+// MARK: - Deprecated
+
+extension DiffableDataSource {
+
+    @available(*, deprecated, renamed: "CollectionViewAdapter")
+    public typealias CollectionView = CollectionViewAdapter
+}
+
 #endif
diff --git a/Sources/DiffableDataSource.TableView-UIKit.swift b/Sources/DiffableDataSource.TableView-UIKit.swift
index 35928b2..7dbe104 100644
--- a/Sources/DiffableDataSource.TableView-UIKit.swift
+++ b/Sources/DiffableDataSource.TableView-UIKit.swift
@@ -1,5 +1,5 @@
 //
-//  DiffableDataSource.TableView-UIKit.swift
+//  DiffableDataSource.TableViewAdapter-UIKit.swift
 //  CoreStore
 //
 //  Copyright © 2018 John Rommel Estropia
@@ -33,13 +33,13 @@ import CoreData
 
 extension DiffableDataSource {
 
-    // MARK: - TableView
+    // MARK: - TableViewAdapter
 
     /**
-     The `DiffableDataSource.TableView` serves as a `UITableViewDataSource` that handles `ListPublisher` snapshots for a `UITableView`. Subclasses of `DiffableDataSource.TableView` may override some `UITableViewDataSource` methods as needed.
-     The `DiffableDataSource.TableView` instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
+     The `DiffableDataSource.TableViewAdapterAdapter` serves as a `UITableViewDataSource` that handles `ListPublisher` snapshots for a `UITableView`. Subclasses of `DiffableDataSource.TableViewAdapter` may override some `UITableViewDataSource` methods as needed.
+     The `DiffableDataSource.TableViewAdapterAdapter` instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
      ```
-     self.dataSource = DiffableDataSource.TableView<Person>(
+     self.dataSource = DiffableDataSource.TableViewAdapter<Person>(
          tableView: self.tableView,
          dataStack: CoreStoreDefaults.dataStack,
          cellProvider: { (tableView, indexPath, person) in
@@ -58,31 +58,17 @@ extension DiffableDataSource {
         )
      }
      ```
-     `DiffableDataSource.TableView` fully handles the reload animations. To turn change the default animation, set the `defaultRowAnimation`.
+     `DiffableDataSource.TableViewAdapter` fully handles the reload animations.
      - SeeAlso: CoreStore's DiffableDataSource implementation is based on https://github.com/ra1028/DiffableDataSources
      */
-    open class TableView<O: DynamicObject>: NSObject, UITableViewDataSource {
-        
-        // MARK: Open
+    open class TableViewAdapter<O: DynamicObject>: BaseAdapter<O, DefaultTableViewTarget<UITableView>>, UITableViewDataSource {
+
+        // MARK: Publi
 
         /**
-         The animation style for row changes
-         */
-        @nonobjc
-        open var defaultRowAnimation: UITableView.RowAnimation = .automatic
-        
-
-        // MARK: Public
-
-        /**
-         The object type represented by this dataSource
-         */
-        public typealias ObjectType = O
-
-        /**
-         Initializes the `DiffableDataSource.TableView`. This instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
+         Initializes the `DiffableDataSource.TableViewAdapter`. This instance needs to be held on (retained) for as long as the `UITableView`'s lifecycle.
          ```
-         self.dataSource = DiffableDataSource.TableView<Person>(
+         self.dataSource = DiffableDataSource.TableViewAdapter<Person>(
              tableView: self.tableView,
              dataStack: CoreStoreDefaults.dataStack,
              cellProvider: { (tableView, indexPath, person) in
@@ -92,78 +78,24 @@ extension DiffableDataSource {
              }
          )
          ```
-         - parameter tableView: the `UITableView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.TableView`.
+         - parameter tableView: the `UITableView` to set the `dataSource` of. This instance is not retained by the `DiffableDataSource.TableViewAdapter`.
          - parameter dataStack: the `DataStack` instance that the dataSource will fetch objects from
          - parameter cellProvider: a closure that configures and returns the `UITableViewCell` for the object
          */
-        @nonobjc
         public init(tableView: UITableView, dataStack: DataStack, cellProvider: @escaping (UITableView, IndexPath, O) -> UITableViewCell?) {
 
-            self.tableView = tableView
             self.cellProvider = cellProvider
-            self.dataStack = dataStack
-            self.dispatcher = Internals.DiffableDataUIDispatcher<O>(dataStack: dataStack)
-
-            super.init()
+            super.init(target: .init(tableView), dataStack: dataStack)
 
             tableView.dataSource = self
         }
-        
-        /**
-         Reloads the `UITableView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
-         ```
-         listPublisher.addObserver(self) { [weak self] (listPublisher) in
-            self?.dataSource?.apply(
-                listPublisher.snapshot,
-                animatingDifferences: true
-            )
-         }
-         ```
-         If the `defaultRowAnimation` is configured to, animations are also applied accordingly.
-         
-         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
-         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
-         */
-        @nonobjc
-        public func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true) {
 
-            self.dispatcher.apply(
-                snapshot.diffableSnapshot,
-                view: self.tableView,
-                animatingDifferences: animatingDifferences,
-                performUpdates: { tableView, changeset, setSections in
+        /**
+         The target `UITableView`
+         */
+        public var tableView: UITableView? {
 
-                    tableView.reload(
-                        using: changeset,
-                        with: self.defaultRowAnimation,
-                        setData: setSections
-                    )
-                }
-            )
-        }
-        
-        /**
-         Returns the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         
-         - parameter indexPath: the `IndexPath` to search for
-         - returns: the object identifier for the item at the specified `IndexPath`, or `nil` if not found
-         */
-        @nonobjc
-        public func itemID(for indexPath: IndexPath) -> O.ObjectID? {
-            
-            return self.dispatcher.itemIdentifier(for: indexPath)
-        }
-        
-        /**
-         Returns the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         
-         - parameter itemID: the object identifier to search for
-         - returns: the `IndexPath` for the item with the specified object identifier, or `nil` if not found
-         */
-        @nonobjc
-        public func indexPath(for itemID: O.ObjectID) -> IndexPath? {
-            
-            return self.dispatcher.indexPath(for: itemID)
+            return self.target.base
         }
         
         
@@ -172,19 +104,19 @@ extension DiffableDataSource {
         @objc
         public dynamic func numberOfSections(in tableView: UITableView) -> Int {
             
-            return self.dispatcher.numberOfSections()
+            return self.numberOfSections()
         }
 
         @objc
         public dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
             
-            return self.dispatcher.numberOfItems(inSection: section)
+            return self.numberOfItems(inSection: section) ?? 0
         }
 
         @objc
         open dynamic func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
             
-            return self.dispatcher.sectionIdentifier(inSection: section)
+            return self.sectionID(for: section)
         }
 
         @objc
@@ -196,7 +128,7 @@ extension DiffableDataSource {
         @objc
         open dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
             
-            guard let objectID = self.dispatcher.itemIdentifier(for: indexPath) else {
+            guard let objectID = self.itemID(for: indexPath) else {
                 
                 Internals.abort("Object at \(Internals.typeName(IndexPath.self)) \(indexPath) already removed from list")
             }
@@ -229,132 +161,106 @@ extension DiffableDataSource {
 
         // MARK: Private
         
-        @nonobjc
-        private weak var tableView: UITableView?
-        
-        @nonobjc
-        private let dataStack: DataStack
-        
         @nonobjc
         private let cellProvider: (UITableView, IndexPath, O) -> UITableViewCell?
-        
-        @nonobjc
-        private let dispatcher: Internals.DiffableDataUIDispatcher<O>
     }
-}
 
 
-// MARK: - UITableView
+    // MARK: - DefaultTableViewTarget
 
-extension UITableView {
+    public struct DefaultTableViewTarget<T: UITableView>: Target {
 
-    // MARK: FilePrivate
-    
-    // Implementation based on https://github.com/ra1028/DiffableDataSources
-    @nonobjc
-    fileprivate func reload<C, O>(
-        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
-        with animation: @autoclosure () -> RowAnimation,
-        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
-        setData: (C) -> Void
-    ) {
-        
-        self.reload(
-            using: stagedChangeset,
-            deleteSectionsAnimation: animation(),
-            insertSectionsAnimation: animation(),
-            reloadSectionsAnimation: animation(),
-            deleteRowsAnimation: animation(),
-            insertRowsAnimation: animation(),
-            reloadRowsAnimation: animation(),
-            interrupt: interrupt,
-            setData: setData
-        )
-    }
-    
-    // Implementation based on https://github.com/ra1028/DiffableDataSources
-    @nonobjc
-    fileprivate func reload<C, O>(
-        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
-        deleteSectionsAnimation: @autoclosure () -> RowAnimation,
-        insertSectionsAnimation: @autoclosure () -> RowAnimation,
-        reloadSectionsAnimation: @autoclosure () -> RowAnimation,
-        deleteRowsAnimation: @autoclosure () -> RowAnimation,
-        insertRowsAnimation: @autoclosure () -> RowAnimation,
-        reloadRowsAnimation: @autoclosure () -> RowAnimation,
-        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
-        setData: (C) -> Void
-    ) {
-        
-        if case .none = window, let data = stagedChangeset.last?.data {
-            
-            setData(data)
-            self.reloadData()
-            return
+        // MARK: Public
+
+        public typealias Base = T
+
+        public internal(set) weak var base: Base?
+
+        public init(_ base: Base) {
+
+            self.base = base
         }
-        for changeset in stagedChangeset {
-            
-            if let interrupt = interrupt, interrupt(changeset), let data = stagedChangeset.last?.data {
-                
-                setData(data)
-                self.reloadData()
+
+
+        // MARK: DiffableDataSource.Target
+
+        public var shouldSuspendBatchUpdates: Bool {
+
+            return self.base?.window == nil
+        }
+
+        public func deleteSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.deleteSections(indices, with: .automatic)
+        }
+
+        public func insertSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.insertSections(indices, with: .automatic)
+        }
+
+        public func reloadSections(at indices: IndexSet, animated: Bool) {
+
+            self.base?.reloadSections(indices, with: .automatic)
+        }
+
+        public func moveSection(at index: IndexSet.Element, to newIndex: IndexSet.Element, animated: Bool) {
+
+            self.base?.moveSection(index, toSection: newIndex)
+        }
+
+        public func deleteItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.deleteRows(at: indexPaths, with: .automatic)
+        }
+
+        public func insertItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.insertRows(at: indexPaths, with: .automatic)
+        }
+
+        public func reloadItems(at indexPaths: [IndexPath], animated: Bool) {
+
+            self.base?.reloadRows(at: indexPaths, with: .automatic)
+        }
+
+        public func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, animated: Bool) {
+
+            self.base?.moveRow(at: indexPath, to: newIndexPath)
+        }
+
+        public func performBatchUpdates(updates: () -> Void, animated: Bool) {
+
+            guard let base = self.base else {
+
                 return
             }
-            self.cs_performBatchUpdates {
-                
-                setData(changeset.data)
+            if #available(iOS 11.0, tvOS 11.0, *) {
 
-                if !changeset.sectionDeleted.isEmpty {
-                    
-                    self.deleteSections(IndexSet(changeset.sectionDeleted), with: deleteSectionsAnimation())
-                }
-                if !changeset.sectionInserted.isEmpty {
-                    
-                    self.insertSections(IndexSet(changeset.sectionInserted), with: insertSectionsAnimation())
-                }
-                if !changeset.sectionUpdated.isEmpty {
-                    
-                    self.reloadSections(IndexSet(changeset.sectionUpdated), with: reloadSectionsAnimation())
-                }
-                for (source, target) in changeset.sectionMoved {
-                    
-                    self.moveSection(source, toSection: target)
-                }
-                if !changeset.elementDeleted.isEmpty {
-                    
-                    self.deleteRows(at: changeset.elementDeleted.map { IndexPath(row: $0.element, section: $0.section) }, with: deleteRowsAnimation())
-                }
-                if !changeset.elementInserted.isEmpty {
-                    
-                    self.insertRows(at: changeset.elementInserted.map { IndexPath(row: $0.element, section: $0.section) }, with: insertRowsAnimation())
-                }
-                if !changeset.elementUpdated.isEmpty {
-                    
-                    self.reloadRows(at: changeset.elementUpdated.map { IndexPath(row: $0.element, section: $0.section) }, with: reloadRowsAnimation())
-                }
-                for (source, target) in changeset.elementMoved {
-                    
-                    self.moveRow(at: IndexPath(row: source.element, section: source.section), to: IndexPath(row: target.element, section: target.section))
-                }
+                base.performBatchUpdates(updates)
+            }
+            else {
+
+                base.beginUpdates()
+                updates()
+                base.endUpdates()
             }
         }
-    }
 
-    @nonobjc
-    private func cs_performBatchUpdates(_ updates: () -> Void) {
-        
-        if #available(iOS 11.0, tvOS 11.0, *) {
-            
-            self.performBatchUpdates(updates)
-        }
-        else {
-            
-            self.beginUpdates()
-            updates()
-            self.endUpdates()
+        public func reloadData() {
+
+            self.base?.reloadData()
         }
     }
 }
 
 
+// MARK: - Deprecated
+
+extension DiffableDataSource {
+
+    @available(*, deprecated, renamed: "TableViewAdapter")
+    public typealias TableView = TableViewAdapter
+}
+
 #endif
diff --git a/Sources/DiffableDataSource.Target.swift b/Sources/DiffableDataSource.Target.swift
new file mode 100644
index 0000000..e4696e1
--- /dev/null
+++ b/Sources/DiffableDataSource.Target.swift
@@ -0,0 +1,211 @@
+//
+//  DiffableDataSource.Target.swift
+//  CoreStore
+//
+//  Copyright © 2018 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - DiffableDataSourc
+
+extension DiffableDataSource {
+
+    // MARK: - Target
+
+    /**
+     The `DiffableDataSource.Target` protocol allows custom views to consume `ListSnapshot` diffable data similar to how `DiffableDataSource.TableViewAdapter` and `DiffableDataSource.CollectionViewAdapter` reloads data for their corresponding views.
+     */
+    public typealias Target = DiffableDataSourceTarget
+}
+
+
+// MARK: - DiffableDataSource.Target
+
+/**
+ The `DiffableDataSource.Target` protocol allows custom views to consume `ListSnapshot` diffable data similar to how `DiffableDataSource.TableViewAdapter` and `DiffableDataSource.CollectionViewAdapter` reloads data for their corresponding views.
+ */
+public protocol DiffableDataSourceTarget {
+
+    // MARK: Public
+
+    /**
+     Whether `reloadData()` should be executed instead of `performBatchUpdates(updates:animated:)`.
+     */
+    var shouldSuspendBatchUpdates: Bool { get }
+
+    /**
+     Deletes one or more sections.
+     */
+    func deleteSections(at indices: IndexSet, animated: Bool)
+
+    /**
+     Inserts one or more sections
+     */
+    func insertSections(at indices: IndexSet, animated: Bool)
+
+    /**
+     Reloads the specified sections.
+     */
+    func reloadSections(at indices: IndexSet, animated: Bool)
+
+    /**
+     Moves a section to a new location.
+     */
+    func moveSection(at index: IndexSet.Element, to newIndex: IndexSet.Element, animated: Bool)
+
+    /**
+     Deletes the items specified by an array of index paths.
+     */
+    func deleteItems(at indexPaths: [IndexPath], animated: Bool)
+
+    /**
+     Inserts items at the locations identified by an array of index paths.
+     */
+    func insertItems(at indexPaths: [IndexPath], animated: Bool)
+
+    /**
+     Reloads the specified items.
+     */
+    func reloadItems(at indexPaths: [IndexPath], animated: Bool)
+
+    /**
+     Moves the item at a specified location to a destination location.
+     */
+    func moveItem(at indexPath: IndexPath, to newIndexPath: IndexPath, animated: Bool)
+
+    /**
+     Animates multiple insert, delete, reload, and move operations as a group.
+     */
+    func performBatchUpdates(updates: () -> Void, animated: Bool)
+
+    /**
+     Reloads all sections and items.
+     */
+    func reloadData()
+}
+
+extension DiffableDataSource.Target {
+
+    // MARK: Internal
+
+    internal func reload<C, O>(
+        using stagedChangeset: Internals.DiffableDataUIDispatcher<O>.StagedChangeset<C>,
+        animated: Bool,
+        interrupt: ((Internals.DiffableDataUIDispatcher<O>.Changeset<C>) -> Bool)? = nil,
+        setData: (C) -> Void
+    ) {
+
+        if self.shouldSuspendBatchUpdates, let data = stagedChangeset.last?.data {
+
+            setData(data)
+            self.reloadData()
+            return
+        }
+        for changeset in stagedChangeset {
+
+            if let interrupt = interrupt,
+                interrupt(changeset),
+                let data = stagedChangeset.last?.data {
+
+                setData(data)
+                self.reloadData()
+                return
+            }
+            self.performBatchUpdates(
+                updates: {
+
+                    setData(changeset.data)
+
+                    if !changeset.sectionDeleted.isEmpty {
+
+                        self.deleteSections(
+                            at: IndexSet(changeset.sectionDeleted),
+                            animated: animated
+                        )
+                    }
+                    if !changeset.sectionInserted.isEmpty {
+
+                        self.insertSections(
+                            at: IndexSet(changeset.sectionInserted),
+                            animated: animated
+                        )
+                    }
+                    if !changeset.sectionUpdated.isEmpty {
+
+                        self.reloadSections(
+                            at: IndexSet(changeset.sectionUpdated),
+                            animated: animated
+                        )
+                    }
+                    for (source, target) in changeset.sectionMoved {
+
+                        self.moveSection(
+                            at: source,
+                            to: target,
+                            animated: animated
+                        )
+                    }
+                    if !changeset.elementDeleted.isEmpty {
+
+                        self.deleteItems(
+                            at: changeset.elementDeleted.map {
+
+                                IndexPath(item: $0.element, section: $0.section)
+                            },
+                            animated: animated
+                        )
+                    }
+                    if !changeset.elementInserted.isEmpty {
+
+                        self.insertItems(
+                            at: changeset.elementInserted.map {
+
+                                IndexPath(item: $0.element, section: $0.section)
+                            },
+                            animated: animated
+                        )
+                    }
+                    if !changeset.elementUpdated.isEmpty {
+
+                        self.reloadItems(
+                            at: changeset.elementUpdated.map {
+
+                                IndexPath(item: $0.element, section: $0.section)
+                            },
+                            animated: animated
+                        )
+                    }
+                    for (source, target) in changeset.elementMoved {
+
+                        self.moveItem(
+                            at: IndexPath(item: source.element, section: source.section),
+                            to: IndexPath(item: target.element, section: target.section),
+                            animated: animated
+                        )
+                    }
+                },
+                animated: animated
+            )
+        }
+    }
+}
diff --git a/Sources/DiffableDataSource.swift b/Sources/DiffableDataSource.swift
index c111e6b..c0c3e9d 100644
--- a/Sources/DiffableDataSource.swift
+++ b/Sources/DiffableDataSource.swift
@@ -28,7 +28,7 @@
 // MARK: - DiffableDataSource
 
 /**
- Namespace for diffable data source types. See `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView` for actual implementations
+ Namespace for diffable data source types. See `DiffableDataSource.TableViewAdapter` and `DiffableDataSource.CollectionViewAdapter` for actual implementations
  */
 public enum DiffableDataSource {}
 
diff --git a/Sources/Internals.DiffableDataUIDispatcher.swift b/Sources/Internals.DiffableDataUIDispatcher.swift
index de370fb..6b32515 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.swift
@@ -52,7 +52,17 @@ extension Internals {
             self.dataStack = dataStack
         }
         
-        func apply<View: AnyObject>(_ snapshot: DiffableDataSourceSnapshot, view: View?, animatingDifferences: Bool, performUpdates: @escaping (View, StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>, @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void) -> Void) {
+        func apply<Target: DiffableDataSource.Target>(
+            _ snapshot: DiffableDataSourceSnapshot,
+            target: Target?,
+            animatingDifferences: Bool,
+            performUpdates: @escaping (
+                Target,
+                StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>,
+                @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void
+            ) -> Void,
+            completion: @escaping () -> Void
+        ) {
             
             self.dispatcher.dispatch { [weak self] in
                 
@@ -64,36 +74,42 @@ extension Internals {
                 self.currentSnapshot = snapshot
 
                 let newSections = snapshot.sections
-                guard let view = view else {
+                guard let target = target else {
                     
-                    return self.sections = newSections
+                    self.sections = newSections
+                    return
                 }
 
                 let performDiffingUpdates: () -> Void = {
                     
                     let changeset = StagedChangeset(source: self.sections, target: newSections)
-                    performUpdates(view, changeset) { sections in
+                    performUpdates(target, changeset) { sections in
                         
                         self.sections = sections
                     }
                 }
 
                 #if canImport(QuartzCore)
-                
+
+                CATransaction.begin()
+                CATransaction.setCompletionBlock(completion)
+
                 if !animatingDifferences {
-                    
-                    CATransaction.begin()
+
                     CATransaction.setDisableActions(true)
-                    
-                    performDiffingUpdates()
-                    
-                    CATransaction.commit()
-                    return
                 }
-                
-                #endif
-                
                 performDiffingUpdates()
+
+                CATransaction.commit()
+
+
+                #else
+
+                performDiffingUpdates()
+                completion()
+
+
+                #endif
             }
         }
 
@@ -104,14 +120,23 @@ extension Internals {
             return snapshot
         }
 
+        func sectionIdentifier(inSection section: Int) -> String? {
+
+            guard self.sections.indices.contains(section) else {
+
+                return nil
+            }
+            return self.sections[section].differenceIdentifier
+        }
+
         func itemIdentifier(for indexPath: IndexPath) -> O.ObjectID? {
-            
-            guard (0 ..< self.sections.endIndex) ~= indexPath.section else {
+
+            guard self.sections.indices.contains(indexPath.section) else {
                 
                 return nil
             }
             let items = self.sections[indexPath.section].elements
-            guard (0 ..< items.endIndex) ~= indexPath.item else {
+            guard items.indices.contains(indexPath.item) else {
                 
                 return nil
             }
@@ -138,15 +163,14 @@ extension Internals {
             return self.sections.count
         }
 
-        func numberOfItems(inSection section: Int) -> Int {
-            
+        func numberOfItems(inSection section: Int) -> Int? {
+
+            guard self.sections.indices.contains(section) else {
+
+                return nil
+            }
             return self.sections[section].elements.count
         }
-        
-        func sectionIdentifier(inSection section: Int) -> String {
-            
-            return self.sections[section].differenceIdentifier
-        }
 
 
         // MARK: Private
diff --git a/Sources/ListPublisher.swift b/Sources/ListPublisher.swift
index 71881e1..7d078b7 100644
--- a/Sources/ListPublisher.swift
+++ b/Sources/ListPublisher.swift
@@ -62,7 +62,7 @@ import SwiftUI
          .orderBy(.ascending(\.lastName))
  )
  ```
- All access to the `ListPublisher` items should be done via its `snapshot` value, which is a `struct` of type `ListSnapshot<O>`. `ListSnapshot`s are also designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. For detailed examples, refer to the documentation for `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView`.
+ All access to the `ListPublisher` items should be done via its `snapshot` value, which is a `struct` of type `ListSnapshot<O>`. `ListSnapshot`s are also designed to work well with `DiffableDataSource.TableViewAdapter`s and `DiffableDataSource.CollectionViewAdapter`s. For detailed examples, refer to the documentation for `DiffableDataSource.TableViewAdapter` and `DiffableDataSource.CollectionViewAdapter`.
  */
 @available(macOS 10.12, *)
 public final class ListPublisher<O: DynamicObject>: Hashable {
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 1d02178..59ec4c0 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -37,7 +37,7 @@ import AppKit
 // MARK: - ListSnapshot
 
 /**
- A `ListSnapshot` holds a stable list of `DynamicObject` identifiers. This is typically created by a `ListPublisher` and are designed to work well with `DiffableDataSource.TableView`s and `DiffableDataSource.CollectionView`s. For detailed examples, see the documentation on `DiffableDataSource.TableView` and `DiffableDataSource.CollectionView`.
+ A `ListSnapshot` holds a stable list of `DynamicObject` identifiers. This is typically created by a `ListPublisher` and are designed to work well with `DiffableDataSource.TableViewAdapter`s and `DiffableDataSource.CollectionViewAdapter`s. For detailed examples, see the documentation on `DiffableDataSource.TableViewAdapter` and `DiffableDataSource.CollectionViewAdapter`.
 
  While the `ListSnapshot` stores only object identifiers, all accessors to its items return `ObjectPublisher`s, which are lazily created. For more details, see the documentation on `ListObject`.
 

From 57745f36a838009d9ce416e2a830bc2639cca016 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Tue, 17 Dec 2019 21:10:01 +0900
Subject: [PATCH 55/58] Allow purging of datasource

---
 CoreStore.xcodeproj/project.pbxproj           | 60 +++++++++----------
 Sources/DiffableDataSource.BaseAdapter.swift  | 31 ++++++++--
 ...Source.CollectionViewAdapter-AppKit.swift} |  2 +-
 ...aSource.CollectionViewAdapter-UIKit.swift} |  2 +-
 ...leDataSource.TableViewAdapter-UIKit.swift} |  2 +-
 .../Internals.DiffableDataUIDispatcher.swift  | 20 +++++++
 Sources/ListSnapshot.swift                    | 10 +++-
 7 files changed, 86 insertions(+), 41 deletions(-)
 rename Sources/{DiffableDataSource.CollectionView-AppKit.swift => DiffableDataSource.CollectionViewAdapter-AppKit.swift} (99%)
 rename Sources/{DiffableDataSource.CollectionView-UIKit.swift => DiffableDataSource.CollectionViewAdapter-UIKit.swift} (99%)
 rename Sources/{DiffableDataSource.TableView-UIKit.swift => DiffableDataSource.TableViewAdapter-UIKit.swift} (99%)

diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 828e458..0e3dfd4 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -472,10 +472,10 @@
 		B56321B31BD6521C006C9394 /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; };
 		B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
 		B56321B61BD6521C006C9394 /* Internals.WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* Internals.WeakObject.swift */; };
-		B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
-		B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
-		B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
-		B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */; };
+		B5635D142356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */; };
+		B5635D152356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */; };
+		B5635D162356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */; };
+		B5635D172356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */; };
 		B56507941D3930BC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507931D3930BC000596DA /* CoreData.framework */; };
 		B56507961D3930C1000596DA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507951D3930C1000596DA /* Foundation.framework */; };
 		B56507981D3930CC000596DA /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B56507971D3930CC000596DA /* CoreData.framework */; };
@@ -590,10 +590,10 @@
 		B5A992201EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992211EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
 		B5A992221EA898720091A2E3 /* UserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A9921E1EA898710091A2E3 /* UserInfo.swift */; };
-		B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
-		B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */; };
+		B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */; };
+		B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */; };
+		B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */; };
+		B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */; };
 		B5AA37FD235C3D1A00FFD4B9 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		B5AEFAB51C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
 		B5AEFAB61C9962AE00AD137F /* CoreStoreBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */; };
@@ -607,10 +607,10 @@
 		B5BF7FB3234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
 		B5BF7FB4234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
 		B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */; };
-		B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
-		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
-		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
-		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */; };
+		B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */; };
+		B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */; };
+		B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */; };
+		B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */; };
 		B5BF7FBC234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBD234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
 		B5BF7FBE234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */; };
@@ -985,7 +985,7 @@
 		B563216F1BD65082006C9394 /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B56321791BD650DE006C9394 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B563217B1BD650E3006C9394 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS2.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
-		B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionView-UIKit.swift"; sourceTree = "<group>"; };
+		B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionViewAdapter-UIKit.swift"; sourceTree = "<group>"; };
 		B56507931D3930BC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B56507951D3930C1000596DA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
 		B56507971D3930CC000596DA /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
@@ -1023,14 +1023,14 @@
 		B5A80DF52212C1BC006096AA /* Playground_iOS.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground_iOS.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		B5A991EB1E9DC2CE0091A2E3 /* VersionLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionLock.swift; sourceTree = "<group>"; };
 		B5A9921E1EA898710091A2E3 /* UserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfo.swift; sourceTree = "<group>"; };
-		B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionView-AppKit.swift"; sourceTree = "<group>"; };
+		B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.CollectionViewAdapter-AppKit.swift"; sourceTree = "<group>"; };
 		B5AA37FA235C3D1300FFD4B9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 		B5AA37FC235C3D1A00FFD4B9 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS6.0.sdk/System/Library/Frameworks/SwiftUI.framework; sourceTree = DEVELOPER_DIR; };
 		B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
 		B5AEFAB41C9962AE00AD137F /* CoreStoreBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreBridge.swift; sourceTree = "<group>"; };
 		B5BF7FAC234C41E90070E741 /* Internals.DiffableDataSourceSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataSourceSnapshot.swift; sourceTree = "<group>"; };
 		B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
-		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.TableView-UIKit.swift"; sourceTree = "<group>"; };
+		B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DiffableDataSource.TableViewAdapter-UIKit.swift"; sourceTree = "<group>"; };
 		B5BF7FBB234C99190070E741 /* Internals.DiffableDataUIDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Internals.DiffableDataUIDispatcher.swift; sourceTree = "<group>"; };
 		B5BF7FC0234D7B2E0070E741 /* ObjectPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectPublisher.swift; sourceTree = "<group>"; };
 		B5BF7FC5234D7E460070E741 /* ObjectSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectSnapshot.swift; sourceTree = "<group>"; };
@@ -1619,9 +1619,9 @@
 				B5BF7FB1234C97910070E741 /* DiffableDataSource.swift */,
 				B514EF0D23A8BEEA0093DBA4 /* DiffableDataSource.Target.swift */,
 				B5D4A6B623A236DC00D7373F /* DiffableDataSource.BaseAdapter.swift */,
-				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift */,
-				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift */,
-				B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift */,
+				B5BF7FB6234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift */,
+				B5635D132356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift */,
+				B5AA37F0235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift */,
 			);
 			name = DataSources;
 			sourceTree = "<group>";
@@ -2101,7 +2101,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
+				B5BF7FB7234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */,
 				B5DE5230230BDA1300A22534 /* CoreStoreDefaults.swift in Sources */,
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B5ECDBF91CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
@@ -2134,7 +2134,7 @@
 				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B53FBA0B1CAB5E6500F0D40A /* CSCoreStore+Migrating.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
-				B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F1235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */,
 				B5D7A5B61CA3BF8F005C752B /* CSInto.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5DE522B230BD7CC00A22534 /* Internals.swift in Sources */,
@@ -2163,7 +2163,7 @@
 				B56923F01EB827F6007C4DC9 /* XcodeSchemaMappingProvider.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B546F9581C99B17400D5AC55 /* CSCoreStore+Setup.swift in Sources */,
-				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
+				B5635D142356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
 				B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */,
 				B50E175223517C6B004F033C /* Internals.DiffableDataUIDispatcher.Changeset.swift in Sources */,
@@ -2330,7 +2330,7 @@
 			files = (
 				82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */,
 				B5ECDBFB1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
-				B5635D152356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
+				B5635D152356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */,
 				B5CA2B091F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E81C6E3A5D00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F61EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2490,7 +2490,7 @@
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166884232B9ED00097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F2235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */,
 				B50E175D2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D162227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322B2346A9AE00FC238B /* ListPublisher.swift in Sources */,
@@ -2508,7 +2508,7 @@
 				B5D339E81E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC7234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				82BA18CC1C4BBD6400A0916E /* Progress+Convenience.swift in Sources */,
-				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
+				B5BF7FB8234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */,
 				82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */,
 				82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */,
 			);
@@ -2556,9 +2556,9 @@
 			files = (
 				B5BF7FB5234C97910070E741 /* DiffableDataSource.swift in Sources */,
 				B5220E1E1D13080D009BC71E /* CSListMonitor.swift in Sources */,
-				B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
-				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
-				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
+				B5AA37F4235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */,
+				B5BF7FBA234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */,
+				B5635D172356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */,
 				B5DBE2D01C9914A900B5CEFA /* CSCoreStore.swift in Sources */,
 				B5CA2B0B1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B56923F81EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2782,7 +2782,7 @@
 			files = (
 				B56321A91BD65219006C9394 /* Progress+Convenience.swift in Sources */,
 				B5ECDBFC1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
-				B5635D162356C39500B80E6B /* DiffableDataSource.CollectionView-UIKit.swift in Sources */,
+				B5635D162356C39500B80E6B /* DiffableDataSource.CollectionViewAdapter-UIKit.swift in Sources */,
 				B5CA2B0A1F7E5ACA004B1936 /* WhereClauseType.swift in Sources */,
 				B5C976E91C6E3A5E00B1AF90 /* Internals.CoreStoreFetchedResultsController.swift in Sources */,
 				B56923F71EB828BF007C4DC9 /* CSDynamicSchema.swift in Sources */,
@@ -2942,7 +2942,7 @@
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
 				18166885232B9ED10097C275 /* KeyPath+KeyPaths.swift in Sources */,
 				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
-				B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionView-AppKit.swift in Sources */,
+				B5AA37F3235C28EE00FFD4B9 /* DiffableDataSource.CollectionViewAdapter-AppKit.swift in Sources */,
 				B50E175E2351848E004F033C /* Internals.DiffableDataUIDispatcher.DiffResult.swift in Sources */,
 				B5474D172227C08700B21FEC /* Internals.CoreStoreFetchRequest.swift in Sources */,
 				B501322D2346A9B000FC238B /* ListPublisher.swift in Sources */,
@@ -2960,7 +2960,7 @@
 				B5D339E91E9493A500C880DE /* Entity.swift in Sources */,
 				B5BF7FC8234D7E460070E741 /* ObjectSnapshot.swift in Sources */,
 				B56321A41BD65216006C9394 /* CoreStore+Migration.swift in Sources */,
-				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableView-UIKit.swift in Sources */,
+				B5BF7FB9234C97CE0070E741 /* DiffableDataSource.TableViewAdapter-UIKit.swift in Sources */,
 				B56321A01BD65216006C9394 /* ObjectObserver.swift in Sources */,
 				B56321951BD65216006C9394 /* TypeErasedClauses.swift in Sources */,
 			);
diff --git a/Sources/DiffableDataSource.BaseAdapter.swift b/Sources/DiffableDataSource.BaseAdapter.swift
index 3886031..7fd589c 100644
--- a/Sources/DiffableDataSource.BaseAdapter.swift
+++ b/Sources/DiffableDataSource.BaseAdapter.swift
@@ -101,7 +101,28 @@ extension DiffableDataSource {
         }
 
         /**
-         Reloads the `UITableView` using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
+         Clears the target.
+         - parameter animatingDifferences: if `true`, animations may be applied accordingly. Defaults to `true`.
+         */
+        open func purge(animatingDifferences: Bool = true, completion: @escaping () -> Void = {}) {
+
+            self.dispatcher.purge(
+                target: self.target,
+                animatingDifferences: animatingDifferences,
+                performUpdates: { target, changeset, setSections in
+
+                    target.reload(
+                        using: changeset,
+                        animated: animatingDifferences,
+                        setData: setSections
+                    )
+                },
+                completion: completion
+            )
+        }
+
+        /**
+         Reloads the target using a `ListSnapshot`. This is typically from the `snapshot` property of a `ListPublisher`:
          ```
          listPublisher.addObserver(self) { [weak self] (listPublisher) in
             self?.dataSource?.apply(
@@ -109,11 +130,9 @@ extension DiffableDataSource {
                 animatingDifferences: true
             )
          }
-         ```
-         If the `defaultRowAnimation` is configured to, animations are also applied accordingly.
-
-         - parameter snapshot: the `ListSnapshot` used to reload the `UITableView` with. This is typically from the `snapshot` property of a `ListPublisher`.
-         - parameter animatingDifferences: if `true`, animations will be applied as configured by the `defaultRowAnimation` value. Defaults to `true`.
+         ``
+         - parameter snapshot: the `ListSnapshot` used to reload the target with. This is typically from the `snapshot` property of a `ListPublisher`.
+         - parameter animatingDifferences: if `true`, animations may be applied accordingly. Defaults to `true`.
          */
         open func apply(_ snapshot: ListSnapshot<O>, animatingDifferences: Bool = true, completion: @escaping () -> Void = {}) {
 
diff --git a/Sources/DiffableDataSource.CollectionView-AppKit.swift b/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift
similarity index 99%
rename from Sources/DiffableDataSource.CollectionView-AppKit.swift
rename to Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift
index 25a65df..860a578 100644
--- a/Sources/DiffableDataSource.CollectionView-AppKit.swift
+++ b/Sources/DiffableDataSource.CollectionViewAdapter-AppKit.swift
@@ -152,7 +152,7 @@ extension DiffableDataSource {
 
         public typealias Base = T
 
-        public internal(set) weak var base: Base?
+        public private(set) weak var base: Base?
 
         public init(_ base: Base) {
 
diff --git a/Sources/DiffableDataSource.CollectionView-UIKit.swift b/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift
similarity index 99%
rename from Sources/DiffableDataSource.CollectionView-UIKit.swift
rename to Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift
index b1573a9..6dfb141 100644
--- a/Sources/DiffableDataSource.CollectionView-UIKit.swift
+++ b/Sources/DiffableDataSource.CollectionViewAdapter-UIKit.swift
@@ -152,7 +152,7 @@ extension DiffableDataSource {
 
         public typealias Base = T
 
-        public internal(set) weak var base: Base?
+        public private(set) weak var base: Base?
 
         public init(_ base: Base) {
 
diff --git a/Sources/DiffableDataSource.TableView-UIKit.swift b/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift
similarity index 99%
rename from Sources/DiffableDataSource.TableView-UIKit.swift
rename to Sources/DiffableDataSource.TableViewAdapter-UIKit.swift
index 7dbe104..7e0052b 100644
--- a/Sources/DiffableDataSource.TableView-UIKit.swift
+++ b/Sources/DiffableDataSource.TableViewAdapter-UIKit.swift
@@ -174,7 +174,7 @@ extension DiffableDataSource {
 
         public typealias Base = T
 
-        public internal(set) weak var base: Base?
+        public private(set) weak var base: Base?
 
         public init(_ base: Base) {
 
diff --git a/Sources/Internals.DiffableDataUIDispatcher.swift b/Sources/Internals.DiffableDataUIDispatcher.swift
index 6b32515..a77d33b 100644
--- a/Sources/Internals.DiffableDataUIDispatcher.swift
+++ b/Sources/Internals.DiffableDataUIDispatcher.swift
@@ -51,6 +51,26 @@ extension Internals {
             
             self.dataStack = dataStack
         }
+
+        func purge<Target: DiffableDataSource.Target>(
+            target: Target?,
+            animatingDifferences: Bool,
+            performUpdates: @escaping (
+                Target,
+                StagedChangeset<[Internals.DiffableDataSourceSnapshot.Section]>,
+                @escaping ([Internals.DiffableDataSourceSnapshot.Section]) -> Void
+            ) -> Void,
+            completion: @escaping () -> Void
+        ) {
+
+            self.apply(
+                .init(),
+                target: target,
+                animatingDifferences: animatingDifferences,
+                performUpdates: performUpdates,
+                completion: completion
+            )
+        }
         
         func apply<Target: DiffableDataSource.Target>(
             _ snapshot: DiffableDataSourceSnapshot,
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index 59ec4c0..b508fa1 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -83,7 +83,10 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      */
     public subscript(safeIndex index: Index) -> ObjectPublisher<O>? {
 
-        let context = self.context!
+        guard let context = self.context else {
+
+            return nil
+        }
         let itemIDs = self.diffableSnapshot.itemIdentifiers
         guard itemIDs.indices.contains(index) else {
 
@@ -118,7 +121,10 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      */
     public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> ObjectPublisher<O>? {
 
-        let context = self.context!
+        guard let context = self.context else {
+
+            return nil
+        }
         let snapshot = self.diffableSnapshot
         let sectionIDs = snapshot.sectionIdentifiers
         guard sectionIDs.indices.contains(sectionIndex) else {

From c025e5acc650a608f074a8751d36760e532ca0d1 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 23 Dec 2019 10:11:26 +0900
Subject: [PATCH 56/58] version bump

---
 CoreStore.podspec                   | 2 +-
 CoreStore.xcodeproj/project.pbxproj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CoreStore.podspec b/CoreStore.podspec
index 7d85d41..d6adb26 100644
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = "CoreStore"
-    s.version = "7.0.1"
+    s.version = "7.0.2"
     s.swift_version = "5.1"
     s.license = "MIT"
     s.homepage = "https://github.com/JohnEstropia/CoreStore"
diff --git a/CoreStore.xcodeproj/project.pbxproj b/CoreStore.xcodeproj/project.pbxproj
index 0e3dfd4..2e738a8 100644
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -3133,7 +3133,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,
@@ -3156,7 +3156,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 7.0.1;
+				MARKETING_VERSION = 7.0.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					Combine,

From b4489301ac65dc36509583eb69731e8862fe0a20 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Mon, 23 Dec 2019 11:53:46 +0900
Subject: [PATCH 57/58] fix SPM spec

---
 Package.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 662641a..cef75e7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -45,8 +45,9 @@ let package = Package(
         .testTarget(
             name: "CoreStoreTests",
             dependencies: ["CoreStore"],
-            path: "CoreStoreTests"
+            path: "CoreStoreTests",
+            exclude: ["*.h", "*.m"]
         )
     ],
-    swiftLanguageVersions: [.v5_1]
+    swiftLanguageVersions: [.v5]
 )

From b7ebda44871fa81251a235334a577ceed2557201 Mon Sep 17 00:00:00 2001
From: John Estropia <rommel.estropia@gmail.com>
Date: Sun, 5 Jan 2020 02:37:42 +0900
Subject: [PATCH 58/58] Use generic collection types in ListSnapshot mutators

---
 ...Internals.DiffableDataSourceSnapshot.swift | 36 +++++++++----------
 Sources/ListSnapshot.swift                    | 20 +++++------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Sources/Internals.DiffableDataSourceSnapshot.swift b/Sources/Internals.DiffableDataSourceSnapshot.swift
index cfa7f05..e4388c6 100644
--- a/Sources/Internals.DiffableDataSourceSnapshot.swift
+++ b/Sources/Internals.DiffableDataSourceSnapshot.swift
@@ -126,22 +126,22 @@ extension Internals {
             return self.structure.allSectionIDs.firstIndex(of: identifier)
         }
 
-        mutating func appendItems(_ identifiers: [NSManagedObjectID], toSection sectionIdentifier: String?) {
+        mutating func appendItems<C: Collection>(_ identifiers: C, toSection sectionIdentifier: String?) where C.Element == NSManagedObjectID {
 
             self.structure.append(itemIDs: identifiers, to: sectionIdentifier)
         }
 
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], beforeItem beforeIdentifier: NSManagedObjectID) {
+        mutating func insertItems<C: Collection>(_ identifiers: C, beforeItem beforeIdentifier: NSManagedObjectID) where C.Element == NSManagedObjectID {
 
             self.structure.insert(itemIDs: identifiers, before: beforeIdentifier)
         }
 
-        mutating func insertItems(_ identifiers: [NSManagedObjectID], afterItem afterIdentifier: NSManagedObjectID) {
+        mutating func insertItems<C: Collection>(_ identifiers: C, afterItem afterIdentifier: NSManagedObjectID) where C.Element == NSManagedObjectID {
 
             self.structure.insert(itemIDs: identifiers, after: afterIdentifier)
         }
 
-        mutating func deleteItems(_ identifiers: [NSManagedObjectID]) {
+        mutating func deleteItems<S: Sequence>(_ identifiers: S) where S.Element == NSManagedObjectID {
 
             self.structure.remove(itemIDs: identifiers)
         }
@@ -161,27 +161,27 @@ extension Internals {
             self.structure.move(itemID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadItems(_ identifiers: [NSManagedObjectID]) {
+        mutating func reloadItems<S: Sequence>(_ identifiers: S) where S.Element == NSManagedObjectID {
 
             self.structure.update(itemIDs: identifiers)
         }
 
-        mutating func appendSections(_ identifiers: [String]) {
+        mutating func appendSections<C: Collection>(_ identifiers: C) where C.Element == String {
 
             self.structure.append(sectionIDs: identifiers)
         }
 
-        mutating func insertSections(_ identifiers: [String], beforeSection toIdentifier: String) {
+        mutating func insertSections<C: Collection>(_ identifiers: C, beforeSection toIdentifier: String) where C.Element == String {
 
             self.structure.insert(sectionIDs: identifiers, before: toIdentifier)
         }
 
-        mutating func insertSections(_ identifiers: [String], afterSection toIdentifier: String) {
+        mutating func insertSections<C: Collection>(_ identifiers: C, afterSection toIdentifier: String) where C.Element == String {
 
             self.structure.insert(sectionIDs: identifiers, after: toIdentifier)
         }
 
-        mutating func deleteSections(_ identifiers: [String]) {
+        mutating func deleteSections<S: Sequence>(_ identifiers: S) where S.Element == String {
 
             self.structure.remove(sectionIDs: identifiers)
         }
@@ -196,7 +196,7 @@ extension Internals {
             self.structure.move(sectionID: identifier, after: toIdentifier)
         }
 
-        mutating func reloadSections(_ identifiers: [String]) {
+        mutating func reloadSections<S: Sequence>(_ identifiers: S) where S.Element == String {
 
             self.structure.update(sectionIDs: identifiers)
         }
@@ -351,7 +351,7 @@ extension Internals {
                 return self.itemPositionMap(itemID)?.section.differenceIdentifier
             }
 
-            mutating func append(itemIDs: [NSManagedObjectID], to sectionID: String?) {
+            mutating func append<C: Collection>(itemIDs: C, to sectionID: String?) where C.Element == NSManagedObjectID {
 
                 let index: Array<Section>.Index
                 if let sectionID = sectionID {
@@ -375,7 +375,7 @@ extension Internals {
                 self.sections[index].elements.append(contentsOf: items)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], before beforeItemID: NSManagedObjectID) {
+            mutating func insert<C: Collection>(itemIDs: C, before beforeItemID: NSManagedObjectID) where C.Element == NSManagedObjectID {
 
                 guard let itemPosition = self.itemPositionMap(beforeItemID) else {
 
@@ -386,7 +386,7 @@ extension Internals {
                     .insert(contentsOf: items, at: itemPosition.itemRelativeIndex)
             }
 
-            mutating func insert(itemIDs: [NSManagedObjectID], after afterItemID: NSManagedObjectID) {
+            mutating func insert<C: Collection>(itemIDs: C, after afterItemID: NSManagedObjectID) where C.Element == NSManagedObjectID {
 
                 guard let itemPosition = self.itemPositionMap(afterItemID) else {
 
@@ -399,7 +399,7 @@ extension Internals {
                     .insert(contentsOf: items, at: itemIndex)
             }
 
-            mutating func remove<C: Collection>(itemIDs: C) where C.Element == NSManagedObjectID {
+            mutating func remove<S: Sequence>(itemIDs: S) where S.Element == NSManagedObjectID {
 
                 let itemPositionMap = self.itemPositionMap()
                 var removeIndexSetMap: [Int: IndexSet] = [:]
@@ -482,13 +482,13 @@ extension Internals {
                 self.reloadedItems.formUnion(newItemIDs)
             }
 
-            mutating func append(sectionIDs: [String]) {
+            mutating func append<C: Collection>(sectionIDs: C) where C.Element == String {
 
                 let newSections = sectionIDs.lazy.map({ Section(differenceIdentifier: $0) })
                 self.sections.append(contentsOf: newSections)
             }
 
-            mutating func insert(sectionIDs: [String], before beforeSectionID: String) {
+            mutating func insert<C: Collection>(sectionIDs: C, before beforeSectionID: String) where C.Element == String {
 
                 guard let sectionIndex = self.sectionIndex(of: beforeSectionID) else {
 
@@ -498,7 +498,7 @@ extension Internals {
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
-            mutating func insert(sectionIDs: [String], after afterSectionID: String) {
+            mutating func insert<C: Collection>(sectionIDs: C, after afterSectionID: String) where C.Element == String {
 
                 guard let beforeIndex = self.sectionIndex(of: afterSectionID) else {
 
@@ -509,7 +509,7 @@ extension Internals {
                 self.sections.insert(contentsOf: newSections, at: sectionIndex)
             }
 
-            mutating func remove(sectionIDs: [String]) {
+            mutating func remove<S: Sequence>(sectionIDs: S) where S.Element == String {
 
                 for sectionID in sectionIDs {
 
diff --git a/Sources/ListSnapshot.swift b/Sources/ListSnapshot.swift
index b508fa1..9ed1f92 100644
--- a/Sources/ListSnapshot.swift
+++ b/Sources/ListSnapshot.swift
@@ -446,7 +446,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      - parameter itemIDs: the object identifiers for the objects to append
      - parameter sectionID: the section to append the items to
      */
-    public mutating func appendItems(withIDs itemIDs: [ItemID], toSectionWithID sectionID: SectionID? = nil) {
+    public mutating func appendItems<C: Collection>(withIDs itemIDs: C, toSectionWithID sectionID: SectionID? = nil) where C.Element == ItemID {
 
         self.diffableSnapshot.appendItems(itemIDs, toSection: sectionID)
     }
@@ -457,7 +457,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      - parameter itemIDs: the object identifiers for the objects to insert
      - parameter beforeItemID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception.
      */
-    public mutating func insertItems(withIDs itemIDs: [ItemID], beforeItemID: ItemID) {
+    public mutating func insertItems<C: Collection>(withIDs itemIDs: C, beforeItemID: ItemID) where C.Element == ItemID {
 
         self.diffableSnapshot.insertItems(itemIDs, beforeItem: beforeItemID)
     }
@@ -468,7 +468,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      - parameter itemIDs: the object identifiers for the objects to insert
      - parameter beforeItemID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception.
      */
-    public mutating func insertItems(withIDs itemIDs: [ItemID], afterItemID: ItemID) {
+    public mutating func insertItems<C: Collection>(withIDs itemIDs: C, afterItemID: ItemID) where C.Element == ItemID {
 
         self.diffableSnapshot.insertItems(itemIDs, afterItem: afterItemID)
     }
@@ -478,7 +478,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - parameter itemIDs: the object identifiers for the objects to delete
      */
-    public mutating func deleteItems(withIDs itemIDs: [ItemID]) {
+    public mutating func deleteItems<S: Sequence>(withIDs itemIDs: S) where S.Element == ItemID {
 
         self.diffableSnapshot.deleteItems(itemIDs)
     }
@@ -518,7 +518,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - parameter itemIDs: the object identifiers to reload
      */
-    public mutating func reloadItems(withIDs itemIDs: [ItemID]) {
+    public mutating func reloadItems<S: Sequence>(withIDs itemIDs: S) where S.Element == ItemID {
 
         self.diffableSnapshot.reloadItems(itemIDs)
     }
@@ -528,7 +528,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - parameter sectionIDs: the sections to append
      */
-    public mutating func appendSections(withIDs sectionIDs: [SectionID]) {
+    public mutating func appendSections<C: Collection>(withIDs sectionIDs: C) where C.Element == SectionID {
 
         self.diffableSnapshot.appendSections(sectionIDs)
     }
@@ -539,7 +539,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      - parameter sectionIDs: the section identifiers for the sections to insert
      - parameter beforeSectionID: an existing identifier to insert items before of. Specifying an invalid value will raise an exception.
      */
-    public mutating func insertSections(withIDs sectionIDs: [SectionID], beforeSectionID: SectionID) {
+    public mutating func insertSections<C: Collection>(withIDs sectionIDs: C, beforeSectionID: SectionID) where C.Element == SectionID {
 
         self.diffableSnapshot.insertSections(sectionIDs, beforeSection: beforeSectionID)
     }
@@ -550,7 +550,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
      - parameter sectionIDs: the section identifiers for the sections to insert
      - parameter beforeSectionID: an existing identifier to insert items after of. Specifying an invalid value will raise an exception.
      */
-    public mutating func insertSections(withIDs sectionIDs: [SectionID], afterSectionID: SectionID) {
+    public mutating func insertSections<C: Collection>(withIDs sectionIDs: C, afterSectionID: SectionID) where C.Element == SectionID {
 
         self.diffableSnapshot.insertSections(sectionIDs, afterSection: afterSectionID)
     }
@@ -560,7 +560,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - parameter sectionIDs: the section identifiers for the sections to delete
      */
-    public mutating func deleteSections(withIDs sectionIDs: [SectionID]) {
+    public mutating func deleteSections<S: Sequence>(withIDs sectionIDs: S) where S.Element == SectionID {
 
         self.diffableSnapshot.deleteSections(sectionIDs)
     }
@@ -592,7 +592,7 @@ public struct ListSnapshot<O: DynamicObject>: RandomAccessCollection, Hashable {
 
      - parameter sectionIDs: the section identifiers to reload
      */
-    public mutating func reloadSections(withIDs sectionIDs: [SectionID]) {
+    public mutating func reloadSections<S: Sequence>(withIDs sectionIDs: S) where S.Element == SectionID {
 
         self.diffableSnapshot.reloadSections(sectionIDs)
     }