Update README.md

fix readme indentations
version bump
2026-01-12 20:30:30 +01:00 · 2020-06-20 17:37:12 +09:00 · 2020-06-20 16:47:52 +09:00 · 2020-06-20 13:16:14 +09:00 · 2020-06-20 13:12:11 +09:00 · 2020-06-20 13:07:10 +09:00
627 changed files with 82030 additions and 24180 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [JohnEstropia]
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@ CoreStore.xcworkspace/xcuserdata
 DerivedData
 *.orig
 build
+Playground_macOS.playground/playground.xcworkspace/xcuserdata
+.swiftpm/xcode/package.xcworkspace/xcuserdata
+.swiftpm/xcode/xcuserdata
+Playground_iOS.playground/playground.xcworkspace/xcuserdata
--- a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
--- a/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/.swiftpm/xcode/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/.swiftpm/xcode/xcuserdata/JohnEstropia.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CoreStore.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +0,0 @@
-language: objective-c
-osx_image: xcode10
-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=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"
-before_install:
-  - gem install cocoapods --no-rdoc --no-ri --no-document --quiet
-  - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
-  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.26.0/Carthage.pkg"
-  - sudo installer -pkg "Carthage.pkg" -target /
-  - rm "Carthage.pkg"
-  - npm install ios-sim -g
-  - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8, 11.0"
-before_script:
-  - carthage update --use-submodules
-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 "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;
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint --quick;
-    fi
--- a/0
+++ b/0
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "5.4.0"
-    s.swift_version = "4.2"
+    s.version = "7.2.0"
+    s.swift_version = "5.2"
    s.license = "MIT"
    s.homepage = "https://github.com/JohnEstropia/CoreStore"
    s.documentation_url = "https://JohnEstropia.github.io/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' }
+    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS[config=Debug]' => '-D DEBUG', 'OTHER_LDFLAGS' => '-weak_framework Combine -weak_framework SwiftUI' }
 end
--- a/CoreStore.sketch
+++ b/CoreStore.sketch
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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"
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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"
--- 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 */; };
+		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 */; };
@@ -23,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 */; };
@@ -34,6 +39,8 @@
 		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 */; };
+		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, ); }; };
@@ -59,6 +66,9 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		B50132232344E24300FC238B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.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>"; };
@@ -78,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>"; };
@@ -89,7 +101,9 @@
 		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; };
+		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>"; };
@@ -105,6 +119,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 */,
@@ -114,14 +129,27 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		B50132222344E20B00FC238B /* SwiftUI Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B50132232344E24300FC238B /* SwiftUIView.swift */,
+				B50132272344E5E900FC238B /* SwiftUIContainerViewController.swift */,
+			);
+			path = "SwiftUI Demo";
+			sourceTree = "<group>";
+		};
 		B503FADA1AFDC71700F90881 /* List and Object Observers Demo */ = {
 			isa = PBXGroup;
 			children = (
+				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>";
@@ -138,6 +166,7 @@
 		B52977E21B120F90003D50A5 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B501323423477D2300FC238B /* SwiftUI.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
 				B5BDC9211C202429008147CD /* CoreStore.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
@@ -166,6 +195,7 @@
 			isa = PBXGroup;
 			children = (
 				B54AAD4E1AF4D26E00848AE0 /* AppDelegate.swift */,
+				B50132222344E20B00FC238B /* SwiftUI Demo */,
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
 				B52977DB1B120F2C003D50A5 /* Transactions Demo */,
@@ -270,13 +300,14 @@
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
 						CreatedOnToolsVersion = 6.3;
+						DevelopmentTeam = 2JT32EJ5BH;
 						LastSwiftMigration = 0900;
 					};
 				};
 			};
 			buildConfigurationList = B54AAD441AF4D26E00848AE0 /* Build configuration list for PBXProject "CoreStoreDemo" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -311,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 */,
@@ -322,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 */,
@@ -332,10 +365,14 @@
 				B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */,
 				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 */,
 				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 */,
 			);
@@ -416,7 +453,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -464,7 +501,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -473,12 +510,12 @@
 			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;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -486,13 +523,13 @@
 			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;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -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"
--- a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
+++ b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
@@ -18,8 +18,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
    
    var window: UIWindow?

-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
-        
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
+
        return true
    }
 }
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -1,11 +1,10 @@
 <?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="16096" 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="16086"/>
+        <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">
@@ -68,10 +67,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 +120,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 +169,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 +199,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 +268,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 +295,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 +322,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 +349,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 +376,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 +403,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 +429,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="rhi-tx-cSW" kind="show" id="kb3-NX-Aao"/>
+                                        </connections>
+                                    </tableViewCell>
                                </cells>
                            </tableViewSection>
                        </sections>
@@ -444,6 +470,38 @@
            </objects>
            <point key="canvasLocation" x="2634" y="2013"/>
        </scene>
+        <!--SwiftUI-->
+        <scene sceneID="Uiz-5a-tKq">
+            <objects>
+                <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="3694" y="4816"/>
+        </scene>
        <!--Object Observer-->
        <scene sceneID="Y7v-tc-8cX">
            <objects>
@@ -453,18 +511,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 +531,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>
@@ -566,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">
@@ -580,34 +638,55 @@
                        <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="64" width="375" height="301.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"/>
-                                <connections>
-                                    <segue destination="sll-yo-mBc" kind="embed" id="AAl-HS-dq2"/>
-                                </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="Rdw-NU-NaK" kind="embed" id="3Ob-Bj-yvz"/>
+                                        </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="trailingMargin" secondItem="6So-f3-4Gp" secondAttribute="trailing" constant="-16" 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 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="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>
                <placeholder placeholderIdentifier="IBFirstResponder" id="C9h-Ba-WoL" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
@@ -620,13 +699,13 @@
                    <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"/>
                        <textAttributes key="titleTextAttributes">
                            <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="24"/>
-                            <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <color key="textColor" red="0.90588235294117647" green="0.92549019607843142" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        </textAttributes>
                    </navigationBar>
                    <nil name="viewControllers"/>
@@ -638,19 +717,19 @@
            </objects>
            <point key="canvasLocation" x="1822" y="2013"/>
        </scene>
-        <!--List Observer-->
+        <!--ListPublisher-->
        <scene sceneID="gkX-bd-Rel">
            <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 +747,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"/>
@@ -688,99 +768,14 @@
                        </connections>
                    </tableView>
                    <extendedEdge key="edgesForExtendedLayout" top="YES"/>
-                    <navigationItem key="navigationItem" title="List Observer" id="JjF-x3-ixG"/>
+                    <navigationItem key="navigationItem" title="ListPublisher" 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"/>
-        </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="301.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"/>
-                                <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"/>
-                                    <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"/>
-                                    </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"/>
+            <point key="canvasLocation" x="5156" y="1144"/>
        </scene>
        <!--Placemarks-->
        <scene sceneID="LRD-q1-hw1">
@@ -791,11 +786,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 +827,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"/>
@@ -887,8 +882,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"/>
@@ -903,6 +898,80 @@
            </objects>
            <point key="canvasLocation" x="4404" y="1144.5"/>
        </scene>
+        <!--ListPublisher-->
+        <scene sceneID="CXQ-vG-dtK">
+            <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.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">
+                            <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="ListPublisher" 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>
+            <point key="canvasLocation" x="5156" y="1484"/>
+        </scene>
        <!--Time Zones-->
        <scene sceneID="nFT-bo-7y9">
            <objects>
@@ -916,7 +985,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 +993,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 +1013,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 +1067,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 +1113,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"/>
@@ -1079,11 +1148,35 @@
            </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>
+    <inferredMetricsTieBreakers>
+        <segue reference="hyN-De-zte"/>
+    </inferredMetricsTieBreakers>
    <resources>
        <image name="second" width="30" height="30"/>
    </resources>
-    <inferredMetricsTieBreakers>
-        <segue reference="fIB-GS-Ppk"/>
-    </inferredMetricsTieBreakers>
 </document>
--- a/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
+++ b/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16F73" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="18G1012" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
    <entity name="Place" representedClassName="CoreStoreDemo.Place" syncable="YES">
        <attribute name="latitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
        <attribute name="longitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
@@ -20,7 +20,7 @@
        <memberEntity name="Place"/>
    </configuration>
    <elements>
-        <element name="Place" positionX="261" positionY="225" width="128" height="105"/>
+        <element name="Place" positionX="261" positionY="225" width="128" height="103"/>
        <element name="TimeZone" positionX="297" positionY="270" width="128" height="120"/>
    </elements>
 </model>
--- a/Demo/FetchingResultsViewController.swift
+++ b/Demo/FetchingResultsViewController.swift
@@ -30,7 +30,7 @@ class FetchingResultsViewController: UITableViewController {
        super.viewDidLoad()
        
        self.tableView.estimatedRowHeight = 60
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
    }
    
    
--- a/Demo/QueryingResultsViewController.swift
+++ b/Demo/QueryingResultsViewController.swift
@@ -49,7 +49,7 @@ class QueryingResultsViewController: UITableViewController {
        super.viewDidLoad()
        
        self.tableView.estimatedRowHeight = 60
-        self.tableView.rowHeight = UITableViewAutomaticDimension
+        self.tableView.rowHeight = UITableView.automaticDimension
    }
    
    
--- a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -90,8 +90,9 @@
      "scale" : "2x"
    },
    {
-      "idiom" : "ios-marketing",
      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Mask + Oval 1 + Oval 1 + Oval 1.png",
      "scale" : "1x"
    },
    {
--- a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask
+++ b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Mask
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/CoreStoreDemo/CoreStoreDemo/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.0</string>
+	<string>6.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -50,5 +50,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 </dict>
 </plist>
--- a/Demo/CollectionViewDemoViewController.swift
+++ b/Demo/CollectionViewDemoViewController.swift
@@ -0,0 +1,168 @@
+//
+//  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.CollectionViewAdapter<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.snapshot.sectionIDs[indexPath.section]
+                    return view
+
+                default:
+                    return nil
+                }
+            }
+        )
+        ColorsDemo.palettes.addObserver(self) { [weak self] (listPublisher) in
+
+            guard let self = self else {
+
+                return
+            }
+            self.filterBarButton?.title = ColorsDemo.filter.rawValue
+            self.dataSource?.apply(listPublisher.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 ObjectPublisher<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.snapshot[indexPath]
+        )
+    }
+
+
+    // MARK: Private
+
+    private var filterBarButton: UIBarButtonItem?
+    private var dataSource: DiffableDataSource.CollectionViewAdapter<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
+
+                _ = transaction.create(Into<Palette>())
+            },
+            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 }
+        )
+    }
+}
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -0,0 +1,88 @@
+//
+//  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 {
+            
+            try! self.palettes.refetch(
+                From<Palette>()
+                    .sectionBy(\.$colorName)
+                    .where(self.filter.whereClause())
+                    .orderBy(.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: ListPublisher<Palette> = {
+
+        return ColorsDemo.stack.publishList(
+            From<Palette>()
+                .sectionBy(\.$colorName)
+                .orderBy(.ascending(\.$hue))
+        )
+    }()
+}
--- a/Demo/ListObserverDemoViewController.swift
+++ b/Demo/ListObserverDemoViewController.swift
@@ -10,89 +10,34 @@ 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 = {
-     
-        return DataStack(
-            CoreStoreSchema(
-                modelVersion: "ColorsDemo",
-                entities: [
-                    Entity<Palette>("Palette"),
-                ],
-                versionLock: [
-                    "Palette": [0x8c25aa53c7c90a28, 0xa243a34d25f1a3a7, 0x56565b6935b6055a, 0x4f988bb257bf274f]
-                ]
-            )
-        )
-    }()
-    
-    static let palettes: ListMonitor<Palette> = {
-        
-        try! ColorsDemo.stack.addStorageAndWait(
-            SQLiteStore(
-                fileName: "ColorsDemo.sqlite",
-                localStorageOptions: .recreateStoreOnModelMismatch
-            )
-        )
-        return ColorsDemo.stack.monitorSectionedList(
-            From<Palette>()
-                .sectionBy(\.colorName)
-                .orderBy(.ascending(\.hue))
-        )
-    }()
-}
-
-
 // MARK: - ListObserverDemoViewController

-class ListObserverDemoViewController: UITableViewController, ListSectionObserver {
-    
-    // MARK: NSObject
-    
-    deinit {
-        
-        ColorsDemo.palettes.removeObserver(self)
+final class ListObserverDemoViewController: UITableViewController {
+
+    // MARK: - EditableDataSource
+
+    final class EditableDataSource: DiffableDataSource.TableViewAdapter<Palette> {
+
+        override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
+
+            switch editingStyle {
+
+            case .delete:
+                let palette = ColorsDemo.palettes.snapshot[indexPath]
+                ColorsDemo.stack.perform(
+                    asynchronous: { (transaction) in
+
+                        transaction.delete(palette)
+                    },
+                    completion: { _ in }
+                )
+
+            default:
+                break
+            }
+        }
    }
-    
+
    
    // MARK: UIViewController

@@ -130,10 +75,28 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
            filterBarButton
        ]
        self.filterBarButton = filterBarButton
-        
-        ColorsDemo.palettes.addObserver(self)
-        
-        self.setTable(enabled: !ColorsDemo.palettes.isPendingRefetch)
+
+        self.dataSource = EditableDataSource(
+            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] (listPublisher) in
+            
+            guard let self = self else {
+                
+                return
+            }
+            self.filterBarButton?.title = ColorsDemo.filter.rawValue
+            self.dataSource?.apply(listPublisher.snapshot, animatingDifferences: true)
+        }
+        self.dataSource?.apply(ColorsDemo.palettes.snapshot, animatingDifferences: false)
    }
    
    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
@@ -142,8 +105,8 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
        
        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 ObjectPublisher<Palette>):
+            destinationViewController.setPalette(palette)
            
        default:
            break
@@ -151,30 +114,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) {
@@ -183,105 +122,20 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
        
        self.performSegue(
            withIdentifier: "ObjectObserverDemoViewController",
-            sender: ColorsDemo.palettes[indexPath]
+            sender: ColorsDemo.palettes.snapshot[indexPath]
        )
    }
    
-    override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
-        
-        switch editingStyle {
-            
-        case .delete:
-            let palette = ColorsDemo.palettes[indexPath]
-            ColorsDemo.stack.perform(
-                asynchronous: { (transaction) in
-                    
-                    transaction.delete(palette)
-                },
-                completion: { _ in }
-            )
-            
-        default:
-            break
-        }
-    }
-    
-    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.deleteRows(at: [fromIndexPath], with: .automatic)
-        self.tableView.insertRows(at: [toIndexPath], with: .automatic)
-    }
-    
-    
-    // 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.TableViewAdapter<Palette>?
+    
+    deinit {
+        
+        ColorsDemo.palettes.removeObserver(self)
+    }
    
    @IBAction private dynamic func resetBarButtonItemTouched(_ sender: AnyObject?) {
        
@@ -304,44 +158,24 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
        ColorsDemo.stack.perform(
            asynchronous: { (transaction) in
                
-                let palette = transaction.create(Into<Palette>())
-                palette.setInitialValues(in: transaction)
+                _ = transaction.create(Into<Palette>())
            },
            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
+                    palette.hue = Palette.randomHue()
+                    palette.colorName = nil
                }
            },
            completion: { _ in }
        )
    }
-    
-    private func setTable(enabled: Bool) {
-        
-        UIView.animate(
-            withDuration: 0.2,
-            delay: 0,
-            options: .beginFromCurrentState,
-            animations: { () -> Void in
-                
-                if let tableView = self.tableView {
-                    
-                    tableView.alpha = enabled ? 1.0 : 0.5
-                    tableView.isUserInteractionEnabled = enabled
-                }
-            },
-            completion: nil
-        )
-    }
 }

--- a/Demo/ObjectObserverDemoViewController.swift
+++ b/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?.object?.objectID() != newValue?.objectID() else {
            
-            return self.monitor?.object
+            return
        }
-        set {
+        if let newValue = newValue {
            
-            guard self.monitor?.object != newValue else {
-                
-                return
-            }
+            self.monitor = newValue.asReadOnly(in: ColorsDemo.stack).map(ColorsDemo.stack.monitorObject(_:))
+        }
+        else {
            
-            if let palette = newValue {
-                
-                self.monitor = ColorsDemo.stack.monitorObject(palette)
-            }
-            else {
-                
-                self.monitor = nil
-            }
+            self.monitor = nil
        }
    }
    
+    
    // MARK: NSObject
    
    deinit {
@@ -50,7 +43,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
    
    required init?(coder aDecoder: NSCoder) {
        
-        if let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
+        if let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.$hue))) {
            
            self.monitor = ColorsDemo.stack.monitorObject(palette)
        }
@@ -59,12 +52,11 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
            _ = try? ColorsDemo.stack.perform(
                synchronous: { (transaction) in
                    
-                    let palette = transaction.create(Into<Palette>())
-                    palette.setInitialValues(in: transaction)
+                    _ = transaction.create(Into<Palette>())
                }
            )
            
-            let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
+            let palette = try! ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.$hue)))!
            self.monitor = ColorsDemo.stack.monitorObject(palette)
        }
        
@@ -126,7 +118,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                
                if let palette = transaction.edit(self?.monitor?.object) {
                    
-                    palette.hue .= Int(hue)
+                    palette.hue = Int(hue)
                }
            },
            completion: { _ in }
@@ -141,7 +133,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                
                if let palette = transaction.edit(self?.monitor?.object) {
                    
-                    palette.saturation .= saturation
+                    palette.saturation = saturation
                }
            },
            completion: { _ in }
@@ -156,7 +148,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                
                if let palette = transaction.edit(self?.monitor?.object) {
                    
-                    palette.brightness .= brightness
+                    palette.brightness = brightness
                }
            },
            completion: { _ in }
@@ -176,7 +168,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
    
    func reloadPaletteInfo(_ palette: Palette, changedKeys: Set<String>?) {
        
-        self.colorNameLabel?.text = palette.colorName.value
+        self.colorNameLabel?.text = palette.colorName
        
        let color = palette.color
        self.colorNameLabel?.textColor = color
@@ -184,17 +176,17 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
        
        self.hsbLabel?.text = palette.colorText
        
-        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.hue)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$hue)) == true {
            
-            self.hueSlider?.value = Float(palette.hue.value)
+            self.hueSlider?.value = Float(palette.hue)
        }
-        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.saturation)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$saturation)) == true {
            
-            self.saturationSlider?.value = palette.saturation.value
+            self.saturationSlider?.value = palette.saturation
        }
-        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.brightness)) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.$brightness)) == true {
            
-            self.brightnessSlider?.value = palette.brightness.value
+            self.brightnessSlider?.value = palette.brightness
        }
    }
 }
--- a/Demo/ObserversViewController.swift
+++ b/Demo/ObserversViewController.swift
@@ -27,4 +27,33 @@ 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 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() {
+
+        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() {
+
+        UIView.animate(withDuration: 0.2) {
+
+            self.bottomContainerView!.isHidden.toggle()
+        }
+        self.toggleTopBarButtonItem!.isEnabled = !self.bottomContainerView!.isHidden
+        self.toggleBottomBarButtonItem!.isEnabled = !self.topContainerView!.isHidden
+    }
 }
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -16,44 +16,53 @@ import CoreStore

 final class Palette: CoreStoreObject {
    
-    let hue = Value.Required<Int>("hue", initial: 0)
-    let saturation = Value.Required<Float>("saturation", initial: 0)
-    let brightness = Value.Required<Float>("brightness", initial: 0)
-    
-    let colorName = Value.Optional<String>(
-        "colorName",
-        isTransient: true,
-        customGetter: Palette.getColorName
+    @Field.Stored(
+        "hue",
+        dynamicInitialValue: { Palette.randomHue() }
    )
+    var hue: Int

-    static func randomHue() -> Int {
-
-        return Int(arc4random_uniform(360))
-    }
+    @Field.Stored("saturation")
+    var saturation: Float = 1
    
-    private static func getColorName(_ partialObject: PartialObject<Palette>) -> String? {
-        
-        if let colorName = partialObject.primitiveValue(for: { $0.colorName }) {
-            
+    @Field.Stored(
+        "brightness",
+        dynamicInitialValue: { Palette.randomBrightness() }
+    )
+    var brightness: Float
+    
+    @Field.Virtual(
+        "colorName",
+        customGetter: { object, field in
+            if let colorName = field.primitiveValue {
+                return colorName
+            }
+            let colorName: String
+            switch object.$hue.value % 360 {
+            case 0 ..< 20: colorName = "Lower Reds"
+            case 20 ..< 57: colorName = "Oranges and Browns"
+            case 57 ..< 90: colorName = "Yellow-Greens"
+            case 90 ..< 159: colorName = "Greens"
+            case 159 ..< 197: colorName = "Blue-Greens"
+            case 197 ..< 241: colorName = "Blues"
+            case 241 ..< 297: colorName = "Violets"
+            case 297 ..< 331: colorName = "Magentas"
+            default: colorName = "Upper Reds"
+            }
+            field.primitiveValue = colorName
            return colorName
        }
+    )
+    var colorName: String!
+    
+    static func randomHue() -> Int {
        
-        let colorName: String
-        switch partialObject.value(for: { $0.hue }) % 360 {
-            
-        case 0 ..< 20: colorName = "Lower Reds"
-        case 20 ..< 57: colorName = "Oranges and Browns"
-        case 57 ..< 90: colorName = "Yellow-Greens"
-        case 90 ..< 159: colorName = "Greens"
-        case 159 ..< 197: colorName = "Blue-Greens"
-        case 197 ..< 241: colorName = "Blues"
-        case 241 ..< 297: colorName = "Violets"
-        case 297 ..< 331: colorName = "Magentas"
-        default: colorName = "Upper Reds"
-        }
+        return Int.random(in: 0 ..< 360)
+    }
+    
+    static func randomBrightness() -> Float {
        
-        partialObject.setPrimitiveValue(colorName, for: { $0.colorName })
-        return colorName
+        return (Float.random(in: 0 ..< 70) + 30) / 100.0
    }
 }

@@ -62,22 +71,15 @@ extension Palette {
    var color: UIColor {
        
        return UIColor(
-            hue: CGFloat(self.hue.value) / 360.0,
-            saturation: CGFloat(self.saturation.value),
-            brightness: CGFloat(self.brightness.value),
+            hue: CGFloat(self.hue) / 360.0,
+            saturation: CGFloat(self.saturation),
+            brightness: CGFloat(self.brightness),
            alpha: 1.0
        )
    }
    
    var colorText: String {
        
-        return "H: \(self.hue.value)˚, S: \(round(self.saturation.value * 100.0))%, B: \(round(self.brightness.value * 100.0))%"
-    }
-    
-    func setInitialValues(in transaction: BaseDataTransaction) {
-        
-        self.hue .= Palette.randomHue()
-        self.saturation .= Float(1.0)
-        self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
+        return "H: \(self.hue)˚, S: \(round(self.saturation * 100.0))%, B: \(round(self.brightness * 100.0))%"
    }
 }
--- a/Demo/PaletteCollectionSectionHeaderView.swift
+++ b/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?
+}
--- a/Demo/PaletteCollectionViewCell.swift
+++ b/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?
+}
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -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?
--- a/Demo/CustomLoggerViewController.swift
+++ b/Demo/CustomLoggerViewController.swift
@@ -31,7 +31,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
        
        super.viewDidAppear(animated)

-        CoreStore.logger = self
+        CoreStoreDefaults.logger = self

        let alert = UIAlertController(
            title: "Logger Demo",
@@ -46,7 +46,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {

        super.viewDidDisappear(animated)

-        CoreStore.logger = DefaultLogger()
+        CoreStoreDefaults.logger = DefaultLogger()
    }

    
--- a/Demo/MigrationsDemoViewController.swift
+++ b/Demo/MigrationsDemoViewController.swift
@@ -360,7 +360,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
        if let dataStack = dataStack, let model = model {
            
            self.segmentedControl?.selectedSegmentIndex = self.models
-                .index(
+                .firstIndex(
                    where: { (arg) -> Bool in
                        
                        let (_, _, schemaHistory) = arg
@@ -386,7 +386,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
        }
        else {
           
-            self.segmentedControl?.selectedSegmentIndex = UISegmentedControlNoSegment
+            self.segmentedControl?.selectedSegmentIndex = UISegmentedControl.noSegment
            self._listMonitor = nil
            self._dataStack = nil
        }
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -8,7 +8,7 @@

 import Foundation

-protocol OrganismProtocol: class {
+protocol OrganismProtocol: AnyObject {
    
    var dna: Int64 { get set }
    
--- a/Demo/SwiftUIContainerViewController.swift
+++ b/Demo/SwiftUIContainerViewController.swift
@@ -0,0 +1,53 @@
+//
+//  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
+
+#if canImport(Combine)
+import Combine
+
+#endif
+
+import Compression
+final class SwiftUIContainerViewController: UIViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        #if canImport(SwiftUI) && canImport(Combine)
+        
+        if #available(iOS 13, *) {
+            
+            let hostingController = UIHostingController(
+                rootView: SwiftUIView(
+                    palettes: ColorsDemo.stack.publishList(
+                        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
+    }
+}
--- a/CoreStoreDemo/CoreStoreDemo/SwiftUI
+++ b/CoreStoreDemo/CoreStoreDemo/SwiftUI
@@ -0,0 +1,183 @@
+//
+//  SwiftUIView.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2019/10/02.
+//  Copyright © 2019 John Rommel Estropia. All rights reserved.
+//
+
+#if canImport(SwiftUI) && canImport(Combine)
+import SwiftUI
+import Combine
+
+import CoreStore
+
+
+@available(iOS 13.0.0, *)
+struct SwiftUIView: View {
+    
+    @Environment(\.dataStack)
+    var dataStack: DataStack
+
+    @ObservedObject
+    var palettes: ListPublisher<Palette>
+
+    var body: some View {
+        NavigationView {
+            List {
+                ForEach(palettes.snapshot.sectionIDs, id: \.self) { (sectionID) in
+                    Section(header: Text(sectionID)) {
+                        ForEach(self.palettes.snapshot.items(inSectionWithID: sectionID), id: \.self) { palette in
+                            NavigationLink(
+                                destination: DetailView(palette: palette),
+                                label: { ColorCell(palette: palette) }
+                            )
+                        }
+                        .onDelete { itemIndices in
+                            let objectIDsToDelete = self.palettes.snapshot.itemIDs(
+                                inSectionWithID: sectionID,
+                                atIndices: itemIndices
+                            )
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
+
+                                    transaction.delete(objectIDs: objectIDsToDelete)
+                                },
+                                completion: { _ in }
+                            )
+                        }
+                    }
+                }
+            }
+            .navigationBarTitle(Text("SwiftUI (\(palettes.snapshot.numberOfItems) objects)"))
+            .navigationBarItems(
+                leading: EditButton(),
+                trailing: HStack {
+                    Button(
+                        action: {
+
+                            self.dataStack.perform(
+                                asynchronous: { transaction in
+
+                                    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
+
+                                    _ = transaction.create(Into<Palette>())
+                                },
+                                completion: { _ in }
+                            )
+                        },
+                        label: {
+                            Image(systemName: "plus")
+                        }
+                    )
+                    .frame(width: 30)
+                }
+            )
+            .alert(
+                isPresented: $needsShowAlert,
+                content: {
+                    Alert(
+                        title: Text("SwiftUI Binding Demo"),
+                        message: Text("This demo shows how to bind to ListPublisher and to CoreStoreObject when using SwiftUI"),
+                        dismissButton: .cancel(Text("OK"))
+                    )
+                }
+            )
+            .onAppear {
+                
+                self.needsShowAlert = true
+            }
+        }
+    }
+
+    @State
+    private var needsShowAlert = false
+}
+
+@available(iOS 13.0.0, *)
+struct ColorCell: View {
+
+    @ObservedObject
+    var palette: ObjectPublisher<Palette>
+
+    var body: some View {
+        HStack {
+            Color(palette.color ?? UIColor.clear)
+                .cornerRadius(5)
+                .frame(width: 30, height: 30, alignment: .leading)
+            Text(palette.colorText ?? "<Deleted>")
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct DetailView: View {
+
+    @Environment(\.dataStack)
+    var dataStack: DataStack
+
+    @ObservedObject
+    var palette: ObjectPublisher<Palette>
+
+    @State var hue: Float = 0
+    @State var saturation: Float = 0
+    @State var brightness: Float = 0
+
+    init(palette: ObjectPublisher<Palette>) {
+
+        self.palette = palette
+        self.hue = Float(palette.hue ?? 0)
+        self.saturation = palette.saturation ?? 0
+        self.brightness = palette.brightness ?? 0
+    }
+
+    var body: some View {
+        ZStack {
+            Color(palette.color ?? UIColor.clear)
+                .cornerRadius(20)
+                .padding(20)
+            VStack {
+                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>)
+                Slider(value: $brightness, in: 0.0 ... 0.1 as ClosedRange<Float>)
+            }
+        }
+    }
+}
+
+@available(iOS 13.0.0, *)
+struct SwiftUIView_Previews: PreviewProvider {
+    
+    static var previews: some View {
+        SwiftUIView(
+            palettes: ColorsDemo.stack.publishList(
+                From<Palette>()
+                    .sectionBy(\.$colorName)
+                    .orderBy(.ascending(\.$hue))
+            )
+        )
+        .environment(\.dataStack, ColorsDemo.stack)
+    }
+}
+
+#endif
--- a/Demo/TransactionsDemoViewController.swift
+++ b/Demo/TransactionsDemoViewController.swift
@@ -15,10 +15,12 @@ import CoreStore


 private struct Static {
-    
+
+    static let dataStack = DataStack()
+
    static let placeController: ObjectMonitor<Place> = {
        
-        try! CoreStore.addStorageAndWait(
+        try! Static.dataStack.addStorageAndWait(
            SQLiteStore(
                fileName: "PlaceDemo.sqlite",
                configuration: "TransactionsDemo",
@@ -26,20 +28,20 @@ private struct Static {
            )
        )
        
-        var place = try! CoreStore.fetchOne(From<Place>())
+        var place = try! Static.dataStack.fetchOne(From<Place>())
        if place == nil {
            
-            _ = try? CoreStore.perform(
+            _ = try? Static.dataStack.perform(
                synchronous: { (transaction) in
                    
                    let place = transaction.create(Into<Place>())
                    place.setInitialValues()
                }
            )
-            place = try! CoreStore.fetchOne(From<Place>())
+            place = try! Static.dataStack.fetchOne(From<Place>())
        }
        
-        return CoreStore.monitorObject(place!)
+        return Static.dataStack.monitorObject(place!)
    }()
 }

@@ -170,7 +172,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
                gesture.location(in: mapView),
                toCoordinateFrom: mapView
            )
-            CoreStore.perform(
+            Static.dataStack.perform(
                asynchronous: { (transaction) in
                    
                    let place = transaction.edit(Static.placeController.object)
@@ -183,7 +185,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
    
    @IBAction dynamic func refreshButtonTapped(_ sender: AnyObject?) {
        
-        _ = try? CoreStore.perform(
+        _ = try? Static.dataStack.perform(
            synchronous: { (transaction) in
                
                let place = transaction.edit(Static.placeController.object)
@@ -194,7 +196,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
    
    func geocode(place: Place) {
        
-        let transaction = CoreStore.beginUnsafe()
+        let transaction = Static.dataStack.beginUnsafe()
        
        self.geocoder?.cancelGeocode()
        
--- a/CoreStoreTests/BaseTests/BaseTestCase.swift
+++ b/CoreStoreTests/BaseTests/BaseTestCase.swift
@@ -40,7 +40,7 @@ class BaseTestCase: XCTestCase {
        
        let stack = DataStack(
            xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
        )
        do {
            
@@ -50,7 +50,7 @@ class BaseTestCase: XCTestCase {
                    SQLiteStore(
                        fileURL: SQLiteStore.defaultRootDirectory
                            .appendingPathComponent(UUID().uuidString)
-                            .appendingPathComponent("\(type(of: self))_\(($0 ?? "-null-")).sqlite"),
+                            .appendingPathComponent("\(Self.self)_\(($0 ?? "-null-")).sqlite"),
                        configuration: $0,
                        localStorageOptions: .recreateStoreOnModelMismatch
                    )
@@ -62,16 +62,19 @@ class BaseTestCase: XCTestCase {
            
            XCTFail(error.coreStoreDumpString)
        }
+        self.addTeardownBlock {
+            stack.unsafeRemoveAllPersistentStoresAndWait()
+        }
    }
    
    @nonobjc
    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () throws -> T) rethrows -> T {
        
-        CoreStore.logger = TestLogger(self.prepareLoggerExpectations(expectations))
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations(expectations))
        defer {
            
            self.checkExpectationsImmediately()
-            CoreStore.logger = TestLogger([:])
+            CoreStoreDefaults.logger = TestLogger([:])
        }
        return try closure()
    }
@@ -79,7 +82,34 @@ class BaseTestCase: XCTestCase {
    @nonobjc
    func expectLogger(_ expectations: [TestLogger.Expectation: XCTestExpectation]) {
        
-        CoreStore.logger = TestLogger(expectations)
+        CoreStoreDefaults.logger = TestLogger(expectations)
+    }
+
+    @nonobjc
+    func expectError<T>(code: CoreStoreErrorCode, closure: () throws -> T) {
+
+        CoreStoreDefaults.logger = TestLogger(self.prepareLoggerExpectations([.logError]))
+        defer {
+
+            self.checkExpectationsImmediately()
+            CoreStoreDefaults.logger = TestLogger([:])
+        }
+        do {
+
+            _ = try closure()
+        }
+        catch let error as CoreStoreError {
+
+            if error.errorCode == code.rawValue {
+
+                return
+            }
+            XCTFail("Expected error code \(code) different from actual error: \((error as NSError).coreStoreDumpString)")
+        }
+        catch {
+
+            XCTFail("Error not wrapped as \(Internals.typeName(CoreStoreError.self)): \((error as NSError).coreStoreDumpString)")
+        }
    }
    
    @nonobjc
@@ -111,12 +141,12 @@ class BaseTestCase: XCTestCase {
        
        super.setUp()
        self.deleteStores()
-        CoreStore.logger = TestLogger([:])
+        CoreStoreDefaults.logger = TestLogger([:])
    }
    
    override func tearDown() {
        
-        CoreStore.logger = DefaultLogger()
+        CoreStoreDefaults.logger = DefaultLogger()
        self.deleteStores()
        super.tearDown()
    }
--- a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
+++ b/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
@@ -34,7 +34,7 @@ import CoreStore
 class BaseTestDataTestCase: BaseTestCase {
    
    @nonobjc
-    let dateFormatter: DateFormatter = cs_lazy {
+    let dateFormatter: DateFormatter = Internals.with {
        
        let formatter = DateFormatter()
        formatter.locale = Locale(identifier: "en_US_POSIX")
--- a/CoreStoreTests/BridgingTests.m
+++ b/CoreStoreTests/BridgingTests.m
@@ -30,6 +30,10 @@

@import CoreData;

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+
 // MARK: - BridgingTests

@implementation BridgingTests
@@ -168,14 +172,8 @@
                              versionChain:nil];
    XCTAssertNotNil(dataStack);
    
-    [CSCoreStore setDefaultStack:dataStack];
-    XCTAssertTrue([dataStack isEqual:[CSCoreStore defaultStack]]);
-}
-
- (void)test_ThatStorages_BridgeCorrectly {
-    
    NSError *memoryError;
-    CSInMemoryStore *memoryStorage = [CSCoreStore
+    CSInMemoryStore *memoryStorage = [dataStack
                                      addInMemoryStorageAndWait:[CSInMemoryStore new]
                                      error:&memoryError];
    XCTAssertNotNil(memoryStorage);
@@ -186,7 +184,7 @@
    XCTAssertNil(memoryError);
    
    NSError *sqliteError;
-    CSSQLiteStore *sqliteStorage = [CSCoreStore
+    CSSQLiteStore *sqliteStorage = [dataStack
                                    addSQLiteStorageAndWait:[CSSQLiteStore new]
                                    error:&sqliteError];
    XCTAssertNotNil(sqliteStorage);
@@ -208,18 +206,19 @@
 }

 - (void)test_ThatTransactions_BridgeCorrectly {
-    
-    [CSCoreStore
-     setDefaultStack:[[CSDataStack alloc]
-                      initWithXcodeModelName:@"Model"
-                      bundle:[NSBundle bundleForClass:[self class]]
-                      versionChain:nil]];
-    [CSCoreStore
+
+    CSDataStack *dataStack = [[CSDataStack alloc]
+                              initWithXcodeModelName:@"Model"
+                              bundle:[NSBundle bundleForClass:[self class]]
+                              versionChain:nil];
+    XCTAssertNotNil(dataStack);
+
+    [dataStack
     addInMemoryStorageAndWait:[CSInMemoryStore new]
     error:nil];
    
    {
-        CSUnsafeDataTransaction *transaction = [CSCoreStore beginUnsafe];
+        CSUnsafeDataTransaction *transaction = [dataStack beginUnsafe];
        XCTAssertNotNil(transaction);
        XCTAssert([transaction isKindOfClass:[CSUnsafeDataTransaction class]]);
        NSError *error;
@@ -230,23 +229,24 @@
    {
        XCTestExpectation *expectation = [self expectationWithDescription:@"sync"];
        NSError *error;
-        BOOL result = [CSCoreStore
+        BOOL result =
+        [dataStack
         beginSynchronous:^(CSSynchronousDataTransaction * _Nonnull transaction) {
-             
-             XCTAssertNotNil(transaction);
-             XCTAssert([transaction isKindOfClass:[CSSynchronousDataTransaction class]]);
-             NSError *error;
-             XCTAssertTrue([transaction commitAndWaitWithError:&error]);
-             XCTAssertNil(error);
-             [expectation fulfill];
-         }
-                       error:&error];
+
+            XCTAssertNotNil(transaction);
+            XCTAssert([transaction isKindOfClass:[CSSynchronousDataTransaction class]]);
+            NSError *error;
+            XCTAssertTrue([transaction commitAndWaitWithError:&error]);
+            XCTAssertNil(error);
+            [expectation fulfill];
+        }
+         error:&error];
        XCTAssertTrue(result);
        XCTAssertNil(error);
    }
    {
        XCTestExpectation *expectation = [self expectationWithDescription:@"async"];
-        [CSCoreStore beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
+        [dataStack beginAsynchronous:^(CSAsynchronousDataTransaction * _Nonnull transaction) {
            
            XCTAssertNotNil(transaction);
            XCTAssert([transaction isKindOfClass:[CSAsynchronousDataTransaction class]]);
@@ -265,3 +265,5 @@
 }

@end
+
+#pragma clang diagnostic pop
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -30,79 +30,156 @@ import CoreStore

 #if os(macOS)
    typealias Color = NSColor
+
 #else
-    
    typealias Color = UIColor
+
 #endif

 class Animal: CoreStoreObject {
-    
-    let species = Value.Required<String>("species", initial: "Swift")
-    let master = Relationship.ToOne<Person>("master")
-    let color = Transformable.Optional<Color>("color")
+
+    @Field.Stored("species")
+    var species: String = "Swift"
+
+    @Field.Coded("color", coder: FieldCoders.NSCoding.self)
+    var color: Color? = .blue
+
+    @Field.Relationship("master")
+    var master: Person?
 }

 class Dog: Animal {
    
-    let nickname = Value.Optional<String>("nickname")
-    let age = Value.Required<Int>("age", initial: 1)
-    let friends = Relationship.ToManyOrdered<Dog>("friends")
-    let friendedBy = Relationship.ToManyUnordered<Dog>("friendedBy", inverse: { $0.friends })
+    static let commonNicknames = ["Spot", "Benjie", "Max", "Milo"]
+
+    @Field.Stored(
+        "nickname",
+        dynamicInitialValue: {
+            commonNicknames[.random(in: commonNicknames.indices)]
+        }
+    )
+    var nickname: String
+
+    @Field.Stored("age")
+    var age: Int = 1
+
+    @Field.Relationship("friends")
+    var friends: [Dog]
+
+    @Field.Relationship("friendedBy", inverse: \.$friends)
+    var friendedBy: Set<Dog>
+}
+
+struct CustomType {
+    var string = "customString"
+}
+
+enum Job: String, CaseIterable {
+
+    case unemployed
+    case engineer
+    case doctor
+    case lawyer
+
+    init?(data: Data) {
+
+        guard
+            let rawValue = String(data: data, encoding: .utf8),
+            let value = Self.init(rawValue: rawValue)
+            else {
+
+            return nil
+        }
+        self = value
+    }
+
+    func toData() -> Data {
+
+        return Data(self.rawValue.utf8)
+    }
 }

 class Person: CoreStoreObject {
-    
-    let title = Value.Required<String>(
+
+    @Field.Stored(
        "title",
-        initial: "Mr.",
-        customSetter: Person.setTitle
+        customSetter: { (object, field, newValue) in
+            field.primitiveValue = newValue
+            object.$displayName.primitiveValue = nil
+        }
    )
-    
-    let name = Value.Required<String>(
+    var title: String = "Mr."
+
+    @Field.Stored(
        "name",
-        initial: "",
-        customSetter: Person.setName
+        customSetter: { (object, field, newValue) in
+            field.primitiveValue = newValue
+            object.$displayName.primitiveValue = nil
+        }
    )
-    
-    let displayName = Value.Optional<String>(
+    var name: String = ""
+
+    @Field.Virtual(
        "displayName",
-        isTransient: true,
-        customGetter: Person.getDisplayName(_:),
+        customGetter: Person.getDisplayName(_:_:),
        affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
    )
-    
-    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
-    
-    private static func setTitle(_ partialObject: PartialObject<Person>, _ newValue: String) {
-        
-        partialObject.setPrimitiveValue(newValue, for: { $0.title })
-        partialObject.setPrimitiveValue(nil, for: { $0.displayName })
-    }
-    
-    private static func setName(_ partialObject: PartialObject<Person>, _ newValue: String) {
-        
-        partialObject.setPrimitiveValue(newValue, for: { $0.name })
-        partialObject.setPrimitiveValue(nil, for: { $0.displayName })
-    }
-    
-    static func getDisplayName(_ partialObject: PartialObject<Person>) -> String? {
-        
-        if let displayName = partialObject.primitiveValue(for: { $0.displayName }) {
-            
-            return displayName
+    var displayName: String?
+
+    @Field.Virtual(
+        "customType",
+        customGetter: { (object, field) in
+
+            if let value = field.primitiveValue {
+
+                return value
+            }
+            let value = CustomType()
+            field.primitiveValue = value
+            return value
        }
-        let title = partialObject.value(for: { $0.title })
-        let name = partialObject.value(for: { $0.name })
-        let displayName = "\(title) \(name)"
-        partialObject.setPrimitiveValue(displayName, for: { $0.displayName })
-        return displayName
+    )
+    var customField: CustomType
+
+    @Field.Coded(
+        "job",
+        coder: (
+            encode: { $0.toData() },
+            decode: { $0.flatMap(Job.init(data:)) ?? .unemployed }
+        ),
+        dynamicInitialValue: {
+            Job.allCases[.random(in: Job.allCases.indices)]
+        }
+    )
+    var job: Job
+
+    @Field.Relationship("spouse")
+    var spouse: Person?
+
+    @Field.Relationship("pets", inverse: \.$master)
+    var pets: Set<Animal>
+
+    @Field.Relationship("_spouseInverse", inverse: \.$spouse)
+    private var spouseInverse: Person?
+    
+    private static func getDisplayName(_ object: ObjectProxy<Person>, _ field: ObjectProxy<Person>.FieldProxy<String?>) -> String? {
+
+        if let value = field.primitiveValue {
+
+            return value
+        }
+        let title = object.$title.value
+        let name = object.$name.value
+        let value = "\(title) \(name)"
+        field.primitiveValue = value
+        return value
    }
    
-    static func keyPathsAffectingDisplayName() -> Set<String> {
+    private static func keyPathsAffectingDisplayName() -> Set<String> {
        
        return [
-            String(keyPath: \Person.title),
-            String(keyPath: \Person.name)
+            String(keyPath: \Person.$title),
+            String(keyPath: \Person.$name)
        ]
    }
 }
@@ -125,20 +202,20 @@ class DynamicModelTests: BaseTestDataTestCase {
                ],
                versionLock: [
                    "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
-                    "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
-                    "Person": [0x66d8bbfd8b21561f, 0xcecec69ecae3570f, 0xc4b73d71256214ef, 0x89b99bfe3e013e8b]
+                    "Dog": [0xad6de93adc5565d, 0x7897e51253eba5a3, 0xd12b9ce0b13600f3, 0x5a4827cd794cd15e],
+                    "Person": [0xf3e6ba6016bbedc6, 0x50dedf64f0eba490, 0xa32088a0ee83468d, 0xb72d1d0b37bd0992]
                ]
            )
        )
        self.prepareStack(dataStack, configurations: [nil]) { (stack) in
            
-            let k1 = String(keyPath: \Animal.species)
+            let k1 = String(keyPath: \Animal.$species)
            XCTAssertEqual(k1, "species")
-            
-            let k2 = String(keyPath: \Dog.species)
+
+            let k2 = String(keyPath: \Dog.$species)
            XCTAssertEqual(k2, "species")
            
-            let k3 = String(keyPath: \Dog.nickname)
+            let k3 = String(keyPath: \Dog.$nickname)
            XCTAssertEqual(k3, "nickname")
            
            let updateDone = self.expectation(description: "update-done")
@@ -150,31 +227,93 @@ class DynamicModelTests: BaseTestDataTestCase {
                asynchronous: { (transaction) in
                    
                    let animal = transaction.create(Into<Animal>())
-                    XCTAssertEqual(animal.species.value, "Swift")
-                    XCTAssertTrue(type(of: animal.species.value) == String.self)
+                    XCTAssertEqual(animal.species, "Swift")
+                    XCTAssertTrue(type(of: animal.species) == String.self)
+                    XCTAssertEqual(animal.color, Color.blue)
                    
-                    animal.species .= "Sparrow"
-                    XCTAssertEqual(animal.species.value, "Sparrow")
+                    animal.species = "Sparrow"
+                    XCTAssertEqual(animal.species, "Sparrow")
                    
-                    animal.color .= .yellow
-                    XCTAssertEqual(animal.color.value, Color.yellow)
+                    animal.color = .yellow
+                    XCTAssertEqual(animal.color, Color.yellow)
+
+                    for property in Animal.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Animal.$species):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Stored<String>)
+
+                        case String(keyPath: \Animal.$master):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Relationship<Person?>)
+
+                        case String(keyPath: \Animal.$color):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Coded<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)
+                    XCTAssertEqual(dog.species, "Swift")
+                    XCTAssertEqual(dog.age, 1)
+                    XCTAssertTrue(Dog.commonNicknames.contains(dog.nickname))

-                    let didSetObserver = dog.species.observe(options: [.new, .old]) { (object, change) in
+                    for property in Dog.metaProperties(includeSuperclasses: true) {
+
+                        switch property.keyPath {
+
+                        case String(keyPath: \Dog.$species):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Stored<String>)
+
+                        case String(keyPath: \Dog.$master):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Relationship<Person?>)
+
+                        case String(keyPath: \Dog.$color):
+                            XCTAssertTrue(property is FieldContainer<Animal>.Coded<Color?>)
+
+                        case String(keyPath: \Dog.$nickname):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Stored<String>)
+
+                        case String(keyPath: \Dog.$age):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Stored<Int>)
+
+                        case String(keyPath: \Dog.$friends):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Relationship<[Dog]>)
+
+                        case String(keyPath: \Dog.$friendedBy):
+                            XCTAssertTrue(property is FieldContainer<Dog>.Relationship<Set<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.observe(\.$species, options: [.new, .old]) { (object, change) in

                        XCTAssertEqual(object, dog)
                        XCTAssertEqual(change.kind, .setting)
                        XCTAssertEqual(change.newValue, "Dog")
                        XCTAssertEqual(change.oldValue, "Swift")
                        XCTAssertFalse(change.isPrior)
-                        XCTAssertEqual(object.species.value, "Dog")
+                        XCTAssertEqual(object.species, "Dog")
                        didSetObserverDone.fulfill()
                    }
-                    let willSetObserver = dog.species.observe(options: [.new, .old, .prior]) { (object, change) in
+                    let willSetObserver = dog.observe(\.$species, options: [.new, .old, .prior]) { (object, change) in

                        XCTAssertEqual(object, dog)
                        XCTAssertEqual(change.kind, .setting)
@@ -183,35 +322,40 @@ class DynamicModelTests: BaseTestDataTestCase {
                        if change.isPrior {

                            XCTAssertNil(change.newValue)
-                            XCTAssertEqual(object.species.value, "Swift")
+                            XCTAssertEqual(object.species, "Swift")
                            willSetPriorObserverDone.fulfill()
                        }
                        else {

                            XCTAssertEqual(change.newValue, "Dog")
-                            XCTAssertEqual(object.species.value, "Dog")
+                            XCTAssertEqual(object.species, "Dog")
                            willSetNotPriorObserverDone.fulfill()
                        }
                    }
                    
-                    dog.species .= "Dog"
-                    XCTAssertEqual(dog.species.value, "Dog")
+                    dog.species = "Dog"
+                    XCTAssertEqual(dog.species, "Dog")

                    didSetObserver.invalidate()
                    willSetObserver.invalidate()
                    
-                    dog.nickname .= "Spot"
-                    XCTAssertEqual(dog.nickname.value, "Spot")
+                    dog.nickname = "Spot"
+                    XCTAssertEqual(dog.nickname, "Spot")
                    
                    let person = transaction.create(Into<Person>())
-                    XCTAssertTrue(person.pets.value.isEmpty)
+                    XCTAssertTrue(person.pets.isEmpty)
+                    XCTAssertEqual(person.customField.string, "customString")
+                    let initialJob = person.job
+                    XCTAssertTrue(Job.allCases.contains(initialJob))
                    
                    XCTAssertEqual(
-                        cs_dynamicType(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
+                        person.rawObject!
+                            .runtimeType()
+                            .keyPathsForValuesAffectingValue(forKey: "displayName"),
                        ["title", "name"]
                    )
                    
-                    person.name .= "Joe"
+                    person.name = "Joe"
                    
                    XCTAssertEqual(person.rawObject!.value(forKey: "name") as! String?, "Joe")
                    XCTAssertEqual(person.rawObject!.value(forKey: "displayName") as! String?, "Mr. Joe")
@@ -219,22 +363,66 @@ class DynamicModelTests: BaseTestDataTestCase {
                    person.rawObject!.setValue("AAAA", forKey: "displayName")
                    XCTAssertEqual(person.rawObject!.value(forKey: "displayName") as! String?, "AAAA")
                    
-                    person.name .= "John"
-                    XCTAssertEqual(person.name.value, "John")
-                    XCTAssertEqual(person.displayName.value, "Mr. John") // Custom getter
+                    person.name = "John"
+                    XCTAssertEqual(person.name, "John")
+                    XCTAssertEqual(person.displayName, "Mr. John") // Custom getter
                    
-                    person.title .= "Sir"
-                    XCTAssertEqual(person.displayName.value, "Sir John")
+                    let personSnapshot1 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name, personSnapshot1.$name)
+                    XCTAssertEqual(person.title, personSnapshot1.$title)
+                    XCTAssertEqual(person.displayName, personSnapshot1.$displayName)
+                    XCTAssertEqual(person.job, personSnapshot1.$job)
                    
-                    person.pets.value.insert(dog)
+                    person.title = "Sir"
+                    XCTAssertEqual(person.displayName, "Sir John")
+                    
+                    XCTAssertEqual(personSnapshot1.$name, "John")
+                    XCTAssertEqual(personSnapshot1.$title, "Mr.")
+                    XCTAssertEqual(personSnapshot1.$displayName, "Mr. John")
+
+                    person.customField.string = "newCustomString"
+                    XCTAssertEqual(person.customField.string, "newCustomString")
+
+                    person.job = .engineer
+                    XCTAssertEqual(person.job, .engineer)
+                    
+                    let personSnapshot2 = person.asSnapshot(in: transaction)!
+                    XCTAssertEqual(person.name, personSnapshot2.$name)
+                    XCTAssertEqual(person.title, personSnapshot2.$title)
+                    XCTAssertEqual(person.displayName, personSnapshot2.$displayName)
+                    XCTAssertEqual(person.job, personSnapshot2.$job)
+
+                    var personSnapshot3 = personSnapshot2
+                    personSnapshot3.$name = "James"
+                    XCTAssertEqual(personSnapshot1.$name, "John")
+                    XCTAssertEqual(personSnapshot1.$displayName, "Mr. John")
+                    XCTAssertEqual(personSnapshot1.$job, initialJob)
+                    XCTAssertEqual(personSnapshot2.$name, "John")
+                    XCTAssertEqual(personSnapshot2.$displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot2.$job, .engineer)
+                    XCTAssertEqual(personSnapshot3.$name, "James")
+                    XCTAssertEqual(personSnapshot3.$displayName, "Sir John")
+                    XCTAssertEqual(personSnapshot3.$job, .engineer)
+                    
+
+                    
+                    person.pets.insert(dog)
                    XCTAssertEqual(person.pets.count, 1)
-                    XCTAssertEqual(person.pets.value.first, dog)
-                    XCTAssertEqual(person.pets.value.first?.master.value, person)
-                    XCTAssertEqual(dog.master.value, person)
-                    XCTAssertEqual(dog.master.value?.pets.value.first, dog)
+                    XCTAssertEqual(person.pets.first, dog)
+                    XCTAssertEqual(person.pets.first?.master, person)
+                    XCTAssertEqual(dog.master, person)
+                    XCTAssertEqual(dog.master?.pets.first, dog)
                },
                success: { _ in
-                    
+
+                    let person = try! stack.fetchOne(From<Person>())
+                    XCTAssertNotNil(person)
+
+                    let personPublisher = person!.asPublisher(in: stack)
+                    XCTAssertEqual(personPublisher.$name, "John")
+                    XCTAssertEqual(personPublisher.$displayName, "Sir John")
+                    XCTAssertEqual(personPublisher.$job, .engineer)
+
                    updateDone.fulfill()
                },
                failure: { _ in
@@ -245,59 +433,67 @@ class DynamicModelTests: BaseTestDataTestCase {
            stack.perform(
                asynchronous: { (transaction) in
                    
-                    let p1 = Where<Animal>({ $0.species == "Sparrow" })
+                    let p1 = Where<Animal>({ $0.$species == "Sparrow" })
                    XCTAssertEqual(p1.predicate, NSPredicate(format: "%K == %@", "species", "Sparrow"))
                    
                    let bird = try transaction.fetchOne(From<Animal>(), p1)
                    XCTAssertNotNil(bird)
-                    XCTAssertEqual(bird!.species.value, "Sparrow")
+                    XCTAssertEqual(bird!.species, "Sparrow")
+                    XCTAssertEqual(bird!.color, Color.yellow)
                    
-                    let p2 = Where<Dog>({ $0.nickname == "Spot" })
+                    let p2 = Where<Dog>({ $0.$nickname == "Spot" })
                    XCTAssertEqual(p2.predicate, NSPredicate(format: "%K == %@", "nickname", "Spot"))
                    
-                    let dog = try transaction.fetchOne(From<Dog>().where(\.nickname == "Spot"))
+                    let dog = try transaction.fetchOne(From<Dog>().where(\.$nickname == "Spot"))
                    XCTAssertNotNil(dog)
-                    XCTAssertEqual(dog!.nickname.value, "Spot")
-                    XCTAssertEqual(dog!.species.value, "Dog")
+                    XCTAssertEqual(dog!.nickname, "Spot")
+                    XCTAssertEqual(dog!.species, "Dog")
                    
                    let person = try transaction.fetchOne(From<Person>())
                    XCTAssertNotNil(person)
-                    XCTAssertEqual(person!.pets.value.first, dog)
+                    XCTAssertEqual(person!.name, "John")
+                    XCTAssertEqual(person!.title, "Sir")
+                    XCTAssertEqual(person!.displayName, "Sir John")
+                    XCTAssertEqual(person!.customField.string, "customString")
+                    XCTAssertEqual(person!.job, .engineer)
+                    XCTAssertEqual(person!.pets.first, dog)
                    
-                    let p3 = Where<Dog>({ $0.age == 10 })
+                    let p3 = Where<Dog>({ $0.$age == 10 })
                    XCTAssertEqual(p3.predicate, NSPredicate(format: "%K == %d", "age", 10))

-                    let totalAge = try transaction.queryValue(From<Dog>().select(Int.self, .sum(\Dog.age)))
+                    let totalAge = try transaction.queryValue(
+                        From<Dog>().select(Int.self, .sum(\.$age))
+                    )
                    XCTAssertEqual(totalAge, 1)
                    
                    _ = try transaction.fetchAll(
                        From<Dog>()
-                            .where(\Animal.species == "Dog" && \.age == 10)
+                            .where(\Animal.$species == "Dog" && \Dog.$age == 10)
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>()
-                            .where(\.age == 10 && \Animal.species == "Dog")
-                            .orderBy(.ascending({ $0.species }))
+                            .where(\Dog.$age == 10 && \Animal.$species == "Dog")
+                            .orderBy(.ascending({ $0.$species }))
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>(),
-                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                        Where<Dog>({ $0.$age > 10 && $0.$age <= 15 })
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>(),
-                        Where<Dog>({ $0.species == "Dog" && $0.age == 10 })
+                        Where<Dog>({ $0.$species == "Dog" && $0.$age == 10 })
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>(),
-                        Where<Dog>({ $0.age == 10 && $0.species == "Dog" })
+                        Where<Dog>({ $0.$age == 10 && $0.$species == "Dog" })
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>(),
-                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
+                        Where<Dog>({ $0.$age > 10 && $0.$age <= 15 })
                    )
                    _ = try transaction.fetchAll(
                        From<Dog>(),
-                        (\Dog.age > 10 && \Dog.age <= 15)
+                        (\Dog.$age > 10 && \Dog.$age <= 15)
                    )
                },
                success: { _ in
@@ -309,15 +505,20 @@ class DynamicModelTests: BaseTestDataTestCase {
                    XCTFail()
                }
            )
-            self.waitAndCheckExpectations()
+        }
+        
+        self.waitForExpectations(timeout: 10, handler: { _ in })
+        
+        self.addTeardownBlock {
+            dataStack.unsafeRemoveAllPersistentStoresAndWait()
        }
    }
    
    @objc
    dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
        
-        XCTAssertEqual(String(keyPath: \Animal.species), "species")
-        XCTAssertEqual(String(keyPath: \Dog.species), "species")
+        XCTAssertEqual(String(keyPath: \Animal.$species), "species")
+        XCTAssertEqual(String(keyPath: \Dog.$species), "species")
    }
    
    @nonobjc
@@ -331,7 +532,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                    SQLiteStore(
                        fileURL: SQLiteStore.defaultRootDirectory
                            .appendingPathComponent(UUID().uuidString)
-                            .appendingPathComponent("\(type(of: self))_\((configuration ?? "-null-")).sqlite"),
+                            .appendingPathComponent("\(Self.self)_\((configuration ?? "-null-")).sqlite"),
                        configuration: configuration,
                        localStorageOptions: .recreateStoreOnModelMismatch
                    )
--- a/CoreStoreTests/ErrorTests.swift
+++ b/CoreStoreTests/ErrorTests.swift
@@ -31,6 +31,7 @@ import CoreStore

 // MARK: - ErrorTests

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 final class ErrorTests: XCTestCase {

    @objc
@@ -88,7 +89,7 @@ final class ErrorTests: XCTestCase {
        let schemaHistory = SchemaHistory(
            XcodeDataModelSchema.from(
                modelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
            )
        )
        let version = "1.0.0"
--- a/CoreStoreTests/FetchTests.swift
+++ b/CoreStoreTests/FetchTests.swift
@@ -132,8 +132,8 @@ final class FetchTests: BaseTestDataTestCase {
                    }
                )
            }
+            self.waitAndCheckExpectations()
        }
-        self.waitAndCheckExpectations()
    }
    
    @objc
@@ -267,8 +267,8 @@ final class FetchTests: BaseTestDataTestCase {
                    }
                )
            }
+            self.waitAndCheckExpectations()
        }
-        self.waitAndCheckExpectations()
    }
    
    @objc
@@ -376,17 +376,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                        OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchOne(from, fetchClauses)
                    }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectID(from, fetchClauses)
                    }
-                    XCTAssertNil(objectID as Any?)
                }
                do {
                    
@@ -394,17 +391,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                        OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchOne(from, fetchClauses)
                    }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectID(from, fetchClauses)
                    }
-                    XCTAssertNil(objectID as Any?)
                }
            }
        }
@@ -559,17 +553,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                        OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchOne(from, fetchClauses)
                    }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectID(from, fetchClauses)
                    }
-                    XCTAssertNil(objectID as Any?)
                }
                do {
                    
@@ -577,17 +568,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                        OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let object = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchOne(from, fetchClauses)
                    }
-                    XCTAssertNil(object as Any?)
-                    
-                    let objectID = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectID(from, fetchClauses)
                    }
-                    XCTAssertNil(objectID as Any?)
                }
            }
        }
@@ -881,17 +869,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                        OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchAll(from, fetchClauses)
                    }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectIDs(from, fetchClauses)
                    }
-                    XCTAssertNil(objectIDs)
                }
                do {
                    
@@ -899,17 +884,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: 0),
                        OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchAll(from, fetchClauses)
                    }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectIDs(from, fetchClauses)
                    }
-                    XCTAssertNil(objectIDs)
                }
                do {
                    
@@ -917,17 +899,14 @@ final class FetchTests: BaseTestDataTestCase {
                        Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: nil),
                        OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchAll(from, fetchClauses)
                    }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectIDs(from, fetchClauses)
                    }
-                    XCTAssertNil(objectIDs)
                }
            }
        }
@@ -1119,34 +1098,28 @@ final class FetchTests: BaseTestDataTestCase {
                    let fetchClauses: [FetchClause] = [
                        OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchAll(from, fetchClauses)
                    }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectIDs(from, fetchClauses)
                    }
-                    XCTAssertNil(objectIDs)
                }
                do {
                    
                    let fetchClauses: [FetchClause] = [
                        OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                    ]
-                    let objects = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchAll(from, fetchClauses)
                    }
-                    XCTAssertNil(objects)
-                    
-                    let objectIDs = try? self.expectLogger([.logError]) {
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchObjectIDs(from, fetchClauses)
                    }
-                    XCTAssertNil(objectIDs)
                }
            }
        }
@@ -1411,8 +1384,8 @@ final class FetchTests: BaseTestDataTestCase {
                
                let from = From<TestEntity1>("Config1")
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1420,11 +1393,10 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1432,11 +1404,10 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1444,7 +1415,6 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
            }
        }
@@ -1561,8 +1531,8 @@ final class FetchTests: BaseTestDataTestCase {
                
                let from = From<TestEntity1>("Config2")
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1570,11 +1540,10 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1582,11 +1551,10 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
                do {
-                    
-                    let count = try? self.expectLogger([.logError]) {
+
+                    self.expectError(code: .persistentStoreNotFound) {
                        
                        try stack.fetchCount(
                            from,
@@ -1594,7 +1562,6 @@ final class FetchTests: BaseTestDataTestCase {
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        )
                    }
-                    XCTAssertNil(count)
                }
            }
        }
@@ -1821,17 +1788,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchOne(from, fetchClauses)
                        }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectID(from, fetchClauses)
                        }
-                        XCTAssertNil(objectID as Any?)
                    }
                    do {
                        
@@ -1839,17 +1803,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchOne(from, fetchClauses)
                        }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectID(from, fetchClauses)
                        }
-                        XCTAssertNil(objectID as Any?)
                    }
                    try transaction.cancel()
                }
@@ -2015,17 +1976,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>("%K > %@", #keyPath(TestEntity1.testNumber), 1),
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchOne(from, fetchClauses)
                        }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectID(from, fetchClauses)
                        }
-                        XCTAssertNil(objectID as Any?)
                    }
                    do {
                        
@@ -2033,17 +1991,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let object = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchOne(from, fetchClauses)
                        }
-                        XCTAssertNil(object as Any?)
-                        
-                        let objectID = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectID(from, fetchClauses)
                        }
-                        XCTAssertNil(objectID as Any?)
                    }
                    try transaction.cancel()
                }
@@ -2353,17 +2308,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>("%K < %@", #keyPath(TestEntity1.testNumber), 4),
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchAll(from, fetchClauses)
                        }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectIDs(from, fetchClauses)
                        }
-                        XCTAssertNil(objectIDs)
                    }
                    do {
                        
@@ -2371,17 +2323,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: 0),
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchAll(from, fetchClauses)
                        }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectIDs(from, fetchClauses)
                        }
-                        XCTAssertNil(objectIDs)
                    }
                    do {
                        
@@ -2389,17 +2338,14 @@ final class FetchTests: BaseTestDataTestCase {
                            Where<TestEntity1>(#keyPath(TestEntity1.testNumber), isEqualTo: nil),
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchAll(from, fetchClauses)
                        }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectIDs(from, fetchClauses)
                        }
-                        XCTAssertNil(objectIDs)
                    }
                    try transaction.cancel()
                }
@@ -2614,34 +2560,28 @@ final class FetchTests: BaseTestDataTestCase {
                        let fetchClauses: [FetchClause] = [
                            OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchAll(from, fetchClauses)
                        }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectIDs(from, fetchClauses)
                        }
-                        XCTAssertNil(objectIDs)
                    }
                    do {
                        
                        let fetchClauses: [FetchClause] = [
                            OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                        ]
-                        let objects = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchAll(from, fetchClauses)
                        }
-                        XCTAssertNil(objects)
-                        
-                        let objectIDs = try? self.expectLogger([.logError]) {
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchObjectIDs(from, fetchClauses)
                        }
-                        XCTAssertNil(objectIDs)
                    }
                    try transaction.cancel()
                }
@@ -2940,8 +2880,8 @@ final class FetchTests: BaseTestDataTestCase {
                    
                    let from = From<TestEntity1>("Config1")
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -2949,11 +2889,10 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -2961,11 +2900,10 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -2973,7 +2911,6 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    try transaction.cancel()
                }
@@ -3101,8 +3038,8 @@ final class FetchTests: BaseTestDataTestCase {
                    
                    let from = From<TestEntity1>("Config2")
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -3110,11 +3047,10 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -3122,11 +3058,10 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    do {
-                        
-                        let count = try? self.expectLogger([.logError]) {
+
+                        self.expectError(code: .persistentStoreNotFound) {
                            
                            try transaction.fetchCount(
                                from,
@@ -3134,7 +3069,6 @@ final class FetchTests: BaseTestDataTestCase {
                                OrderBy<TestEntity1>(.descending(#keyPath(TestEntity1.testEntityID)))
                            )
                        }
-                        XCTAssertNil(count)
                    }
                    try transaction.cancel()
                }
--- a/CoreStoreTests/FromTests.swift
+++ b/CoreStoreTests/FromTests.swift
@@ -74,32 +74,31 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                try from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
            }
            do {
                
                let from = From<TestEntity1>("Config1")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
        }
@@ -114,102 +113,98 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config1"])
            }
            do {
-                
+
                let from = From<TestEntity1>("Config1")
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config1"])
            }
            do {
                
                let from = From<TestEntity1>("Config2")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>()
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>("Config1")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>("Config2")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
        }
@@ -224,99 +219,96 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(Set(affectedConfigurations), ["PF_DEFAULT_CONFIGURATION_NAME", "Config1"] as Set)
            }
            do {
                
                let from = From<TestEntity1>("Config1")
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config1"])
            }
            do {
                
                let from = From<TestEntity1>("Config2")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["PF_DEFAULT_CONFIGURATION_NAME"])
            }
            do {
                
                let from = From<TestEntity2>("Config1")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>("Config2")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
        }
@@ -331,96 +323,94 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config1"])
            }
            do {
                
                let from = From<TestEntity1>("Config1")
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config1"])
            }
            do {
                
                let from = From<TestEntity1>("Config2")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>()
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config2"])
            }
            do {
                
                let from = From<TestEntity2>("Config1")
                
-                let request = CoreStoreFetchRequest()
-                let storesFound: Void? = try? self.expectLogger([.logError]) {
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertTrue(affectedConfigurations.isEmpty)
            }
            do {
                
                let from = From<TestEntity2>("Config2")
                
-                let request = CoreStoreFetchRequest()
+                let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
                let storesFound: Void? = try? from.applyToFetchRequest(request, context: dataStack.mainContext)
                XCTAssertNotNil(storesFound)
                XCTAssertNotNil(request.entity)
-                XCTAssertNotNil(request.safeAffectedStores)
+                XCTAssertNotNil(request.safeAffectedStores())
                
                XCTAssert(from.entityClass == NSClassFromString(request.entity!.managedObjectClassName))
                
-                let affectedConfigurations = request.safeAffectedStores!.map { $0.configurationName }
+                let affectedConfigurations = request.safeAffectedStores()?.map { $0.configurationName } ?? []
                XCTAssertEqual(affectedConfigurations, ["Config2"])
            }
        }
--- a/CoreStoreTests/GroupByTests.swift
+++ b/CoreStoreTests/GroupByTests.swift
@@ -68,7 +68,7 @@ final class GroupByTests: BaseTestCase {
            
            let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
            
-            let request = CoreStoreFetchRequest()
+            let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
            try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
            groupBy.applyToFetchRequest(request)
            
--- a/CoreStoreTests/Info.plist
+++ b/CoreStoreTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.1</string>
+	<string>6.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStoreTests/ListObserverTests.swift
+++ b/CoreStoreTests/ListObserverTests.swift
@@ -53,7 +53,7 @@ class ListObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -67,7 +67,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 0
                }
            )
-            let didInsertSectionExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertSection:toSectionIndex:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -87,7 +87,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 1
                }
            )
-            let didInsertObjectExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -119,7 +119,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 2
                }
            )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -184,7 +184,7 @@ class ListObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -199,7 +199,7 @@ class ListObserverTests: BaseTestDataTestCase {
                }
            )
            
-            let didUpdateObjectExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didUpdateObject:atIndexPath:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -250,7 +250,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 1 || events == 2
                }
            )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -329,7 +329,7 @@ class ListObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -343,7 +343,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 0
                }
            )
-            let didMoveObjectExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didMoveObject:fromIndexPath:toIndexPath:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -376,7 +376,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 1
                }
            )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -437,7 +437,7 @@ class ListObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -451,7 +451,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 0
                }
            )
-            let didUpdateObjectExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteObject:fromIndexPath:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -480,7 +480,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 1 || events == 2
                }
            )
-            let didDeleteSectionExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didDeleteSection:fromSectionIndex:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -508,7 +508,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    return events == 3
                }
            )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                object: observer,
                handler: { (note) -> Bool in
--- a/CoreStoreTests/ListPublisherTests.swift
+++ b/CoreStoreTests/ListPublisherTests.swift
@@ -0,0 +1,304 @@
+//
+//  ListPublisherTests.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: - ListPublisherTests
+
+@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+class ListPublisherTests: BaseTestDataTestCase {
+
+    @objc
+    dynamic func test_ThatListPublishers_CanReceiveInsertNotifications() {
+
+        self.prepareStack { (stack) in
+
+            let observer = NSObject()
+            let listPublisher = stack.publishList(
+                From<TestEntity1>(),
+                SectionBy(#keyPath(TestEntity1.testBoolean)),
+                OrderBy<TestEntity1>(.ascending(#keyPath(TestEntity1.testBoolean)), .ascending(#keyPath(TestEntity1.testEntityID)))
+            )
+            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
+
+                    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(listPublisher, {})
+            withExtendedLifetime(observer, {})
+        }
+    }
+
+    @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), 1)
+                XCTAssertEqual(listPublisher.snapshot.numberOfItems(inSectionIndex: 1), 4)
+
+                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
+
--- a/CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents
+++ b/CoreStoreTests/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C67" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="17G2307" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
    <entity name="TestEntity1AAA" representedClassName="CoreStoreTests.TestEntity1" syncable="YES">
        <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
        <attribute name="testData" optional="YES" attributeType="Binary" syncable="YES"/>
@@ -9,6 +9,8 @@
        <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="testNumber" optional="YES" attributeType="Integer 32" usesScalarValueType="NO" syncable="YES"/>
        <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="testToManyUnordered" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToOne" inverseEntity="TestEntity1AAA" syncable="YES"/>
+        <relationship name="testToOne" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TestEntity1AAA" inverseName="testToManyUnordered" inverseEntity="TestEntity1AAA" syncable="YES"/>
    </entity>
    <entity name="TestEntity2" representedClassName="CoreStoreTests.TestEntity2" syncable="YES">
        <attribute name="testBoolean" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
@@ -19,6 +21,8 @@
        <attribute name="testNil" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="testNumber" optional="YES" attributeType="Integer 32" usesScalarValueType="NO" syncable="YES"/>
        <attribute name="testString" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="testToManyOrdered" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="TestEntity2" inverseName="testToOne" inverseEntity="TestEntity2" syncable="YES"/>
+        <relationship name="testToOne" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="TestEntity2" inverseName="testToManyOrdered" inverseEntity="TestEntity2" syncable="YES"/>
    </entity>
    <configuration name="Config1">
        <memberEntity name="TestEntity1AAA"/>
@@ -27,7 +31,7 @@
        <memberEntity name="TestEntity2"/>
    </configuration>
    <elements>
-        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="165"/>
-        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="165"/>
+        <element name="TestEntity1AAA" positionX="-63" positionY="-18" width="128" height="195"/>
+        <element name="TestEntity2" positionX="-63" positionY="9" width="128" height="195"/>
    </elements>
 </model>
--- a/CoreStoreTests/ObjectObserverTests.swift
+++ b/CoreStoreTests/ObjectObserverTests.swift
@@ -57,7 +57,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let willUpdateExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "objectMonitor:willUpdateObject:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -74,7 +74,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
                    return events == 0
                }
            )
-            let didUpdateExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "objectMonitor:didUpdateObject:changedPersistentKeys:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -154,7 +154,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
            
            var events = 0
            
-            let didDeleteExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "objectMonitor:didDeleteObject:"),
                object: observer,
                handler: { (note) -> Bool in
--- a/CoreStoreTests/ObjectPublisherTests.swift
+++ b/CoreStoreTests/ObjectPublisherTests.swift
@@ -0,0 +1,155 @@
+//
+//  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.object?.testNumber, NSNumber(value: 10))
+                XCTAssertEqual(objectPublisher.object?.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, {})
+        }
+    }
+}
+
--- a/CoreStoreTests/OrderByTests.swift
+++ b/CoreStoreTests/OrderByTests.swift
@@ -179,7 +179,7 @@ final class OrderByTests: XCTestCase {
    dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
        
        let orderBy = OrderBy<NSManagedObject>(.ascending("key"))
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
        orderBy.applyToFetchRequest(request)
        XCTAssertNotNil(request.sortDescriptors)
        XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)
--- a/CoreStoreTests/SetupTests.swift
+++ b/CoreStoreTests/SetupTests.swift
@@ -39,7 +39,7 @@ class SetupTests: BaseTestDataTestCase {
            let schemaHistory = SchemaHistory(
                XcodeDataModelSchema.from(
                    modelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    bundle: Bundle(for: Self.self)
                )
            )
            let stack = DataStack(schemaHistory: schemaHistory)
@@ -56,9 +56,6 @@ class SetupTests: BaseTestDataTestCase {
            XCTAssertTrue(stack.schemaHistory.migrationChain.isEmpty)
            XCTAssertTrue(stack.schemaHistory.migrationChain.rootVersions.isEmpty)
            XCTAssertTrue(stack.schemaHistory.migrationChain.leafVersions.isEmpty)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
        }
        do {
            
@@ -68,15 +65,12 @@ class SetupTests: BaseTestDataTestCase {
                
                DataStack(
                    xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self)),
+                    bundle: Bundle(for: Self.self),
                    migrationChain: migrationChain
                )
            }
            XCTAssertEqual(stack.modelVersion, "Model")
            XCTAssertEqual(stack.schemaHistory.migrationChain, migrationChain)
-            
-            CoreStore.defaultStack = stack
-            XCTAssertEqual(CoreStore.defaultStack, stack)
        }
    }
    
@@ -85,7 +79,7 @@ class SetupTests: BaseTestDataTestCase {
        
        let stack = DataStack(
            xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
        )
        do {
            
@@ -140,7 +134,7 @@ class SetupTests: BaseTestDataTestCase {
        
        let stack = DataStack(
            xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
        )
        do {
            
@@ -208,7 +202,7 @@ class SetupTests: BaseTestDataTestCase {
                
                let stack = DataStack(
                    xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    bundle: Bundle(for: Self.self)
                )
                try! stack.addStorageAndWait(sqliteStore)
                self.prepareTestDataForStack(stack)
@@ -227,7 +221,7 @@ class SetupTests: BaseTestDataTestCase {
            let metadata = try createStore()
            let stack = DataStack(
                xcodeModelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
            )
            try sqliteStore.cs_eraseStorageAndWait(
                metadata: metadata,
@@ -260,7 +254,7 @@ class SetupTests: BaseTestDataTestCase {
        
        let stack = DataStack(
            xcodeModelName: "Model",
-            bundle: Bundle(for: type(of: self))
+            bundle: Bundle(for: Self.self)
        )
        do {
            
@@ -328,9 +322,16 @@ class SetupTests: BaseTestDataTestCase {
                
                let stack = DataStack(
                    xcodeModelName: "Model",
-                    bundle: Bundle(for: type(of: self))
+                    bundle: Bundle(for: Self.self)
+                )
+                try! stack.addStorageAndWait(
+                    SQLiteStore.legacy(
+                        fileName: sqliteStore.fileURL.lastPathComponent,
+                        configuration: sqliteStore.configuration,
+                        migrationMappingProviders: sqliteStore.migrationMappingProviders,
+                        localStorageOptions: .recreateStoreOnModelMismatch
+                    )
                )
-                try! stack.addStorageAndWait(sqliteStore)
                self.prepareTestDataForStack(stack)
            }
            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
@@ -347,7 +348,7 @@ class SetupTests: BaseTestDataTestCase {
            let metadata = try createStore()
            let stack = DataStack(
                xcodeModelName: "Model",
-                bundle: Bundle(for: type(of: self))
+                bundle: Bundle(for: Self.self)
            )
            try sqliteStore.cs_eraseStorageAndWait(
                metadata: metadata,
--- a/CoreStoreTests/StorageInterfaceTests.swift
+++ b/CoreStoreTests/StorageInterfaceTests.swift
@@ -112,7 +112,7 @@ final class StorageInterfaceTests: XCTestCase {
            .appendingPathExtension("db")
        let mappingProvider = XcodeSchemaMappingProvider(
            from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
        )
        
        let store = SQLiteStore(
@@ -150,7 +150,7 @@ final class StorageInterfaceTests: XCTestCase {
        let fileName = UUID().uuidString + ".db"
        let mappingProvider = XcodeSchemaMappingProvider(
            from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
        )
        let store = SQLiteStore(
            fileName: fileName,
@@ -236,7 +236,7 @@ final class StorageInterfaceTests: XCTestCase {
        let fileName = UUID().uuidString + ".db"
        let mappingProvider = XcodeSchemaMappingProvider(
            from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: type(of: self))
+            mappingModelBundle: Bundle(for: Self.self)
        )
        let store = SQLiteStore.legacy(
            fileName: fileName,
--- a/CoreStoreTests/TestEntities/TestEntity1.swift
+++ b/CoreStoreTests/TestEntities/TestEntity1.swift
@@ -36,4 +36,6 @@ class TestEntity1: NSManagedObject {
    @NSManaged var testDecimal: NSDecimalNumber?
    @NSManaged var testData: Data?
    @NSManaged var testNil: String?
+    @NSManaged var testToOne: TestEntity1?
+    @NSManaged var testToManyUnordered: NSSet?
 }
--- a/CoreStoreTests/TestEntities/TestEntity2.swift
+++ b/CoreStoreTests/TestEntities/TestEntity2.swift
@@ -36,4 +36,6 @@ class TestEntity2: NSManagedObject {
    @NSManaged var testDecimal: NSDecimalNumber?
    @NSManaged var testData: Data?
    @NSManaged var testNil: String?
+    @NSManaged var testToOne: TestEntity2?
+    @NSManaged var testToManyOrdered: NSOrderedSet?
 }
--- a/CoreStoreTests/TransactionTests.swift
+++ b/CoreStoreTests/TransactionTests.swift
@@ -303,8 +303,8 @@ final class TransactionTests: BaseTestCase {
            do {
                
                let createExpectation = self.expectation(description: "create")
-                let dataPrepared: Void? = try? stack.perform(
-                    synchronous: { (transaction) in
+                try stack.perform(
+                    synchronous: { (transaction) -> Void in
                        
                        let object = transaction.create(Into<TestEntity1>())
                        object.testEntityID = NSNumber(value: 1)
@@ -313,10 +313,7 @@ final class TransactionTests: BaseTestCase {
                        object.testDate = testDate
                    }
                )
-                if dataPrepared != nil {
-                    
-                    createExpectation.fulfill()
-                }
+                createExpectation.fulfill()
                self.checkExpectationsImmediately()
            }
            do {
@@ -403,7 +400,7 @@ final class TransactionTests: BaseTestCase {
            XCTAssertFalse(monitor.hasObjects())
            
            var events = 0
-            let willChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorWillChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -417,7 +414,7 @@ final class TransactionTests: BaseTestCase {
                    return events == 0
                }
            )
-            let didInsertObjectExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitor:didInsertObject:toIndexPath:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -447,7 +444,7 @@ final class TransactionTests: BaseTestCase {
                    return events == 1
                }
            )
-            let didChangeExpectation = self.expectation(
+            _ = self.expectation(
                forNotification: NSNotification.Name(rawValue: "listMonitorDidChange:"),
                object: observer,
                handler: { (note) -> Bool in
@@ -625,8 +622,8 @@ final class TransactionTests: BaseTestCase {
                    }
                )
            }
+            self.waitAndCheckExpectations()
        }
-        self.waitAndCheckExpectations()
    }
    
    @objc
@@ -758,8 +755,8 @@ final class TransactionTests: BaseTestCase {
                    }
                )
            }
+            self.waitAndCheckExpectations()
        }
-        self.waitAndCheckExpectations()
    }
    
    @objc
@@ -899,8 +896,8 @@ final class TransactionTests: BaseTestCase {
                    }
                )
            }
+            self.waitAndCheckExpectations()
        }
-        self.waitAndCheckExpectations()
    }
    
    @objc
--- a/CoreStoreTests/TweakTests.swift
+++ b/CoreStoreTests/TweakTests.swift
@@ -43,7 +43,7 @@ final class TweakTests: XCTestCase {
            $0.fetchLimit = 200
            $0.predicate = predicate
        }
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
        tweak.applyToFetchRequest(request)
        XCTAssertEqual(request.fetchOffset, 100)
        XCTAssertEqual(request.fetchLimit, 200)
--- a/CoreStoreTests/VersionLockTests.swift
+++ b/CoreStoreTests/VersionLockTests.swift
@@ -0,0 +1,55 @@
+//
+//  VersionLockTests.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: - VersionLockTests
+
+final class VersionLockTests: XCTestCase {
+
+    @objc
+    dynamic func test_ThatVersionLocksProduceCorrectHashes() {
+        
+        let versionLock: VersionLock = [
+            "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
+            "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
+            "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
+        ]
+        XCTAssertEqual(
+            versionLock.description,
+            """
+            [
+                "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
+                "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
+                "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
+            ]
+            """
+        )
+    }
+}
--- 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 {
        
@@ -47,6 +47,17 @@ private func XCTAssertAllEqual<D>(_ whereClauses: [Where<D>]) {
    }
 }

+private func XCTAssertAllEqual<D: Equatable>(_ items: D...) {
+
+    for i in items.indices {
+
+        for j in items.indices where j != i {
+
+            XCTAssertEqual(items[i], items[j])
+        }
+    }
+}
+

 //MARK: - WhereTests

@@ -55,7 +66,283 @@ final class WhereTests: XCTestCase {
    @objc
    dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
        
-        XCTAssertEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertAllEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertAllEqual(String(keyPath: \Animal.$color), "color")
+    }
+
+    @objc
+    dynamic func test_ThatExpressions_HaveCorrectKeyPaths() {
+
+        do {
+
+            do {
+
+//                let keyPathBuilder = TestEntity1.keyPathBuilder()
+
+//                let kp = \TestEntity1.testToOne
+//                print(keyPathBuilder.testString)
+//                print(keyPathBuilder.testToOne)
+//                print(keyPathBuilder.testToOne.testEntityID)
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testEntityID),
+                    (\TestEntity1.testToOne ~ \.testEntityID).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testEntityID)
+//                    keyPathBuilder.testToOne.testEntityID.keyPathString
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered)
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).description,
+                    String(keyPath: \TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered)
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "master.pets",
+                    (\Animal.$master ~ \.$pets).description,
+                    String(keyPath: \Animal.$master ~ \.$pets)
+                )
+                XCTAssertAllEqual(
+                    "master.pets.species",
+                    (\Animal.$master ~ \.$pets ~ \.$species).description,
+                    String(keyPath: \Animal.$master ~ \.$pets ~ \.$species)
+                )
+                XCTAssertAllEqual(
+                    "master.pets.master",
+                    (\Animal.$master ~ \.$pets ~ \.$master).description,
+                    String(keyPath: \Animal.$master ~ \.$pets ~ \.$master)
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity1.testToOne.testToManyUnordered) + ".@count",
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).count().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).count())
+                )
+                XCTAssertAllEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered) + ".@count",
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "master.pets.@count",
+                    (\Animal.$master ~ \.$pets).count().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets).count())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "ANY " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).any().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).any())
+                )
+                XCTAssertAllEqual(
+                    "ANY " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "ANY master.pets",
+                    (\Animal.$master ~ \.$pets).any().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets).any())
+                )
+                XCTAssertAllEqual(
+                    "ANY master.pets.species",
+                    (\Animal.$master ~ \.$pets ~ \.$species).any().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets ~ \.$species).any())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "ALL " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).all().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).all())
+                )
+                XCTAssertAllEqual(
+                    "ALL " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "ALL master.pets",
+                    (\Animal.$master ~ \.$pets).all().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets).all())
+                )
+                XCTAssertAllEqual(
+                    "ALL master.pets.species",
+                    (\Animal.$master ~ \.$pets ~ \.$species).all().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets ~ \.$species).all())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertAllEqual(
+                    "NONE " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).none().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).none())
+                )
+                XCTAssertAllEqual(
+                    "NONE " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none())
+                )
+            }
+            do {
+
+                XCTAssertAllEqual(
+                    "NONE master.pets",
+                    (\Animal.$master ~ \.$pets).none().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets).none())
+                )
+                XCTAssertAllEqual(
+                    "NONE master.pets.species",
+                    (\Animal.$master ~ \.$pets ~ \.$species).none().description,
+                    String(keyPath: (\Animal.$master ~ \.$pets ~ \.$species).none())
+                )
+            }
+        }
+    }
+
+    @objc
+    dynamic func test_ThatWhereClauses_CanBeCreatedFromExpressionsCorrectly() {
+
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testString) == dummy
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$name) == dummy
+                let predicate = NSPredicate(format: "master.name == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToOne ~ \.testString) == dummy
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToOne.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$spouse ~ \.$name) == dummy
+                let predicate = NSPredicate(format: "master.spouse.name == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let count = 3
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered).count() == count
+                let predicate = NSPredicate(format: "\(#keyPath(TestEntity1.testToOne.testToManyUnordered)).@count == %d", count)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$pets).count() == count
+                let predicate = NSPredicate(format: "master.pets.@count == %d", count)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).any() == dummy
+                let predicate = NSPredicate(format: "ANY \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$pets ~ \.$species).any() == dummy
+                let predicate = NSPredicate(format: "ANY master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).all() == dummy
+                let predicate = NSPredicate(format: "ALL \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$pets ~ \.$species).all() == dummy
+                let predicate = NSPredicate(format: "ALL master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
+        do {
+
+            let dummy = "dummy"
+            do {
+
+                let whereClause: Where<TestEntity1> = (\.testToOne ~ \.testToManyUnordered ~ \TestEntity1.testString).none() == dummy
+                let predicate = NSPredicate(format: "NONE \(#keyPath(TestEntity1.testToOne.testToManyUnordered)).\(#keyPath(TestEntity1.testString)) == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.$master ~ \.$pets ~ \.$species).none() == dummy
+                let predicate = NSPredicate(format: "NONE master.pets.species == %@", dummy)
+                XCTAssertAllEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertAllEqual(whereClause.predicate, predicate)
+            }
+        }
    }
    
    @objc
@@ -64,51 +351,51 @@ final class WhereTests: XCTestCase {
        do {
            
            let whereClause = Where<NSManagedObject>()
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(true))
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(true))
            XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
        }
        do {
            
            let whereClause = Where<NSManagedObject>(true)
-            XCTAssertEqual(whereClause, Where<NSManagedObject>())
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>())
            XCTAssertNotEqual(whereClause, Where<NSManagedObject>(false))
-            XCTAssertEqual(whereClause.predicate, NSPredicate(value: true))
+            XCTAssertAllEqual(whereClause.predicate, NSPredicate(value: true))
        }
        do {
            
            let predicate = NSPredicate(format: "%K == %@", "key", "value")
            let whereClause = Where<NSManagedObject>(predicate)
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
        }
        do {
            
            let whereClause = Where<NSManagedObject>("%K == %@", "key", "value")
            let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
        }
        do {
            
            let whereClause = Where<NSManagedObject>("%K == %@", argumentArray: ["key", "value"])
            let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
        }
        do {
            
            let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
            let predicate = NSPredicate(format: "%K == %@", "key", "value")
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
        }
        do {
            
            let whereClause = Where<NSManagedObject>("key", isMemberOf: ["value1", "value2", "value3"])
            let predicate = NSPredicate(format: "%K IN %@", "key", ["value1", "value2", "value3"])
-            XCTAssertEqual(whereClause, Where<NSManagedObject>(predicate))
-            XCTAssertEqual(whereClause.predicate, predicate)
+            XCTAssertAllEqual(whereClause, Where<NSManagedObject>(predicate))
+            XCTAssertAllEqual(whereClause.predicate, predicate)
        }
    }
    
@@ -243,8 +530,8 @@ final class WhereTests: XCTestCase {
                type: .not,
                subpredicates: [whereClause1.predicate]
            )
-            XCTAssertEqual(notWhere.predicate, notPredicate)
-            XCTAssertEqual(notWhere, !whereClause1)
+            XCTAssertAllEqual(notWhere.predicate, notPredicate)
+            XCTAssertAllEqual(notWhere, !whereClause1)
        }
        do {
            
@@ -259,8 +546,8 @@ final class WhereTests: XCTestCase {
                    whereClause3.predicate
                ]
            )
-            XCTAssertEqual(andWhere.predicate, andPredicate)
-            XCTAssertEqual(andWhere, whereClause1 && whereClause2 && whereClause3)
+            XCTAssertAllEqual(andWhere.predicate, andPredicate)
+            XCTAssertAllEqual(andWhere, whereClause1 && whereClause2 && whereClause3)
        }
        do {
            
@@ -274,8 +561,8 @@ final class WhereTests: XCTestCase {
            let unwrappedFinalSomeWhere = andWhere && someWhere!

        
-            XCTAssertEqual(andWhere.predicate, finalNoneWhere.predicate)
-            XCTAssertEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
+            XCTAssertAllEqual(andWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
        }
        do {
            
@@ -290,8 +577,8 @@ final class WhereTests: XCTestCase {
                    whereClause3.predicate
                ]
            )
-            XCTAssertEqual(orWhere.predicate, orPredicate)
-            XCTAssertEqual(orWhere, whereClause1 || whereClause2 || whereClause3)
+            XCTAssertAllEqual(orWhere.predicate, orPredicate)
+            XCTAssertAllEqual(orWhere, whereClause1 || whereClause2 || whereClause3)
        }
        do {
            
@@ -304,8 +591,8 @@ final class WhereTests: XCTestCase {
            let finalSomeWhere = orWhere &&? someWhere
            let unwrappedFinalSomeWhere = orWhere && someWhere!
            
-            XCTAssertEqual(orWhere.predicate, finalNoneWhere.predicate)
-            XCTAssertEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
+            XCTAssertAllEqual(orWhere.predicate, finalNoneWhere.predicate)
+            XCTAssertAllEqual(finalSomeWhere.predicate, unwrappedFinalSomeWhere.predicate)
        }

    }
@@ -314,9 +601,9 @@ final class WhereTests: XCTestCase {
    dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
        
        let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
-        let request = CoreStoreFetchRequest()
+        let request = Internals.CoreStoreFetchRequest<NSFetchRequestResult>()
        whereClause.applyToFetchRequest(request)
        XCTAssertNotNil(request.predicate)
-        XCTAssertEqual(request.predicate, whereClause.predicate)
+        XCTAssertAllEqual(request.predicate, whereClause.predicate)
    }
 }
--- a/Package.swift
+++ b/Package.swift
@@ -1,3 +1,4 @@
+// swift-tools-version:5.0
 //
 //  Package.swift
 //  CoreStore
@@ -25,21 +26,28 @@

 import PackageDescription

-let targets: [Target]
-#if os(iOS)
-targets = [Target(name: "CoreStore iOS")]
-#elseif os(macOS)
-targets = [Target(name: "CoreStore OSX")]
-#elseif os(watchOS)
-targets = [Target(name: "CoreStore watchOS")]
-#elseif os(tvOS)
-targets = [Target(name: "CoreStore tvOS")]
-#else
-targets = []
-#endif
-
 let package = Package(
    name: "CoreStore",
-    targets: targets,
-    exclude: ["Carthage", "CoreStoreDemo", "Sources/libA/images"]
+    platforms: [
+           .macOS(.v10_12), .iOS(.v10), .tvOS(.v10), .watchOS(.v3)
+    ],
+    products: [
+        .library(name: "CoreStore", type: .static, targets: ["CoreStore"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "CoreStore",
+            dependencies: [],
+            path: "Sources",
+            exclude: ["CoreStoreBridge.h", "CoreStoreBridge.m"]
+        ),
+        .testTarget(
+            name: "CoreStoreTests",
+            dependencies: ["CoreStore"],
+            path: "CoreStoreTests",
+            exclude: ["BridgingTests.h", "BridgingTests.m"]
+        )
+    ],
+    swiftLanguageVersions: [.v5]
 )
--- a/Playground.playground/Contents.swift
+++ b/Playground.playground/Contents.swift
@@ -1,53 +0,0 @@
-import UIKit
-import CoreStore
-
-/// Model Declaration =====
-class Animal: CoreStoreObject {
-    let species = Value.Required<String>("species", initial: "Swift")
-    let master = Relationship.ToOne<Person>("master")
-    let color = Transformable.Optional<UIColor>("color", initial: .orange)
-}
-
-class Person: CoreStoreObject {
-    let name = Value.Optional<String>("name")
-    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
-}
-/// =======================
-
-/// Stack setup ===========
-let dataStack = DataStack(
-    CoreStoreSchema(
-        modelVersion: "V1",
-        entities: [
-            Entity<Animal>("Animal"),
-            Entity<Person>("Person")
-        ]
-    )
-)
-try dataStack.addStorageAndWait(SQLiteStore(fileName: "data.sqlite"))
-/// =======================
-
-/// Transactions ==========
-dataStack.perform(synchronous: { transaction in
-
-    let animal = transaction.create(Into<Animal>())
-    animal.species .= "Sparrow"
-    animal.color .= .yellow
-
-    let person = transaction.create(Into<Person>())
-    person.name .= "John"
-    person.pets.value.insert(animal)
-})
-/// =======================
-
-/// Accessing Objects =====
-let bird = dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
-bird.species.value
-bird.color.value
-print(bird)
-
-let owner = bird.master.value!
-owner.name.value
-owner.pets.count
-print(owner)
-/// =======================
--- a/Playground_iOS.playground/Contents.swift
+++ b/Playground_iOS.playground/Contents.swift
@@ -0,0 +1,79 @@
+import UIKit
+import CoreStore
+import PlaygroundSupport
+
+PlaygroundPage.current.needsIndefiniteExecution = true
+
+/// Model Declaration =====
+class Animal: CoreStoreObject {
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<UIColor>("color", initial: .orange)
+}
+
+class Person: CoreStoreObject {
+    let name = Value.Optional<String>("name")
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+}
+/// =======================
+
+/// Stack setup ===========
+let dataStack = DataStack(
+    CoreStoreSchema(
+        modelVersion: "V1",
+        entities: [
+            Entity<Animal>("Animal"),
+            Entity<Person>("Person")
+        ]
+    )
+)
+dataStack.addStorage(
+    SQLiteStore(fileName: "data.sqlite"),
+    completion: { result in
+
+        switch result {
+
+        case .failure(let error):
+            print(error)
+
+        case .success:
+            /// Transactions ==========
+            dataStack.perform(
+                asynchronous: { transaction in
+
+                    let animal = transaction.create(Into<Animal>())
+                    animal.species .= "Sparrow"
+                    animal.color .= .yellow
+
+                    let person = transaction.create(Into<Person>())
+                    person.name .= "John"
+                    person.pets.value.insert(animal)
+                },
+                completion: { result in
+
+                    switch result {
+
+                    case .failure(let error):
+                        print(error)
+
+                    case .success:
+                        /// Accessing Objects =====
+                        let bird = try! dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
+                        print(bird.species.value)
+                        print(bird.color.value as Any)
+                        print(bird)
+
+                        let owner = bird.master.value!
+                        print(owner.name.value as Any)
+                        print(owner.pets.count)
+                        print(owner)
+                        /// =======================
+                    }
+                }
+            )
+            /// =======================
+        }
+    }
+)
+
+
--- a/Playground_iOS.playground/contents.xcplayground
+++ b/Playground_iOS.playground/contents.xcplayground
--- a/Playground_iOS.playground/playground.xcworkspace/contents.xcworkspacedata
+++ b/Playground_iOS.playground/playground.xcworkspace/contents.xcworkspacedata
--- a/Playground_iOS.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Playground_iOS.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/Playground_macOS.playground/Contents.swift
+++ b/Playground_macOS.playground/Contents.swift
@@ -0,0 +1,77 @@
+import AppKit
+import CoreStore
+import PlaygroundSupport
+
+PlaygroundPage.current.needsIndefiniteExecution = true
+
+/// Model Declaration =====
+class Animal: CoreStoreObject {
+    let species = Value.Required<String>("species", initial: "Swift")
+    let master = Relationship.ToOne<Person>("master")
+    let color = Transformable.Optional<NSColor>("color", initial: .orange)
+}
+
+class Person: CoreStoreObject {
+    let name = Value.Optional<String>("name")
+    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+}
+/// =======================
+
+/// Stack setup ===========
+let dataStack = DataStack(
+    CoreStoreSchema(
+        modelVersion: "V1",
+        entities: [
+            Entity<Animal>("Animal"),
+            Entity<Person>("Person")
+        ]
+    )
+)
+dataStack.addStorage(
+    SQLiteStore(fileName: "data.sqlite"),
+    completion: { result in
+
+        switch result {
+
+        case .failure(let error):
+            print(error)
+
+        case .success:
+            /// Transactions ==========
+            dataStack.perform(
+                asynchronous: { transaction in
+
+                    let animal = transaction.create(Into<Animal>())
+                    animal.species .= "Sparrow"
+                    animal.color .= .yellow
+
+                    let person = transaction.create(Into<Person>())
+                    person.name .= "John"
+                    person.pets.value.insert(animal)
+                },
+                completion: { result in
+
+                    switch result {
+
+                    case .failure(let error):
+                        print(error)
+
+                    case .success:
+                        /// Accessing Objects =====
+                        let bird = try! dataStack.fetchOne(From<Animal>().where(\.species == "Sparrow"))!
+                        print(bird.species.value)
+                        print(bird.color.value as Any)
+                        print(bird)
+
+                        let owner = bird.master.value!
+                        print(owner.name.value as Any)
+                        print(owner.pets.count)
+                        print(owner)
+                        /// =======================
+                    }
+                }
+            )
+            /// =======================
+        }
+    }
+)
--- a/Playground_macOS.playground/contents.xcplayground
+++ b/Playground_macOS.playground/contents.xcplayground
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='macos' executeOnSourceChanges='false'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>
--- a/Playground_macOS.playground/playground.xcworkspace/contents.xcworkspacedata
+++ b/Playground_macOS.playground/playground.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
--- a/Playground_macOS.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Playground_macOS.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/README.md
+++ b/README.md
--- 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 {
    
@@ -50,45 +50,11 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    // MARK: - Result
    
    /**
-     The `Result` contains the success or failure information for a completed transaction
+     The `Result` contains the success or failure information for a completed transaction.
+     `Result<T>.success` indicates that the transaction succeeded, either because the save succeeded or because there were no changes to save. The associated `userInfo` is the value returned from the transaction closure.
+     `Result<T>.failure` indicates that the transaction either failed or was cancelled. The associated object for this value is a `CoreStoreError` enum value.
     */
-    public enum Result<T> {
-        
-        /**
-         `Result<T>.success` indicates that the transaction succeeded, either because the save succeeded or because there were no changes to save. The associated `userInfo` is the value returned from the transaction closure.
-         */
-        case success(userInfo: T)
-        
-        /**
-         `Result<T>.failure` indicates that the transaction either failed or was cancelled. The associated object for this value is a `CoreStoreError` enum value.
-         */
-        case failure(error: CoreStoreError)
-        
-        /**
-         Returns `true` if the result indicates `.success`, `false` if the result is `.failure`.
-         */
-        public var boolValue: Bool {
-            
-            switch self {
-                
-            case .success: return true
-            case .failure: return false
-            }
-        }
-        
-        
-        // MARK: Internal
-        
-        internal init(userInfo: T) {
-            
-            self = .success(userInfo: userInfo)
-        }
-        
-        internal init(error: CoreStoreError) {
-            
-            self = .failure(error: error)
-        }
-    }
+    public typealias Result<UserInfoType> = Swift.Result<UserInfoType, CoreStoreError>
    
    // MARK: -
    
@@ -100,11 +66,11 @@ 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 {
        
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to create an entity of type \(cs_typeName(into.entityClass)) from an already committed \(cs_typeName(self))."
+            "Attempted to create an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
        )
        
        return super.create(into)
@@ -116,11 +82,11 @@ 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to update an entity of type \(cs_typeName(object)) from an already committed \(cs_typeName(self))."
+            "Attempted to update an entity of type \(Internals.typeName(object)) from an already committed \(Internals.typeName(self))."
        )
        
        return super.edit(object)
@@ -133,60 +99,59 @@ 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to update an entity of type \(cs_typeName(into.entityClass)) from an already committed \(cs_typeName(self))."
+            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) from an already committed \(Internals.typeName(self))."
        )
        
        return super.edit(into, objectID)
    }
-    
+
    /**
-     Deletes a specified `NSManagedObject` or `CoreStoreObject`.
-     
-     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be deleted
+     Deletes the objects with the specified `NSManagedObjectID`s.
+
+     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
     */
-    public override func delete<D: DynamicObject>(_ object: D?) {
-        
-        CoreStore.assert(
+    public override func delete<S: Sequence>(objectIDs: S) where S.Iterator.Element: NSManagedObjectID {
+
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to delete an entity of type \(cs_typeName(object)) from an already committed \(cs_typeName(self))."
+            "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
        )
-        
-        super.delete(object)
+
+        super.delete(objectIDs: objectIDs)
    }
-    
+
    /**
-     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
+     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>(_ object1: D?, _ object2: D?, _ objects: D?...) {
-        
-        CoreStore.assert(
+    public override func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
+
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to delete an entities from an already committed \(cs_typeName(self))."
+            "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 {
-        
-        CoreStore.assert(
+    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 \(cs_typeName(self))."
+            "Attempted to delete an entities from an already committed \(Internals.typeName(self))."
        )
-        
+
        super.delete(objects)
    }
    
@@ -212,67 +177,4 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
        group.wait()
        self.context.reset()
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the new auto-commiting methods `DataStack.perform(asynchronous:completion:)` or `DataStack.perform(asynchronous:success:failure:)`. Please read the documentation on the behavior of the new methods.")
-    public func commit(_ completion: @escaping (_ result: SaveResult) -> Void = { _ in }) {
-        
-        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to commit a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to commit a \(cs_typeName(self)) more than once."
-        )
-        self.autoCommit { (hasChanges, error) in
-            
-            if let error = error {
-                
-                completion(SaveResult(error))
-            }
-            else {
-                
-                completion(SaveResult(hasChanges: hasChanges))
-            }
-        }
-    }
-    
-    @available(*, deprecated, message: "Secondary tasks spawned from AsynchronousDataTransactions and SynchronousDataTransactions are no longer supported. ")
-    @discardableResult
-    public func beginSynchronous(_ closure: @escaping (_ transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
-        
-        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to begin a child transaction from a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to begin a child transaction from an already committed \(cs_typeName(self))."
-        )
-        let childTransaction = SynchronousDataTransaction(
-            mainContext: self.context,
-            queue: self.childTransactionQueue
-        )
-        childTransaction.transactionQueue.cs_sync {
-            
-            closure(childTransaction)
-            
-            if !childTransaction.isCommitted && childTransaction.hasChanges {
-                
-                CoreStore.log(
-                    .warning,
-                    message: "The closure for the \(cs_typeName(childTransaction)) completed without being committed. All changes made within the transaction were discarded."
-                )
-            }
-        }
-        switch childTransaction.result {
-            
-        case .none:                         return nil
-        case .some(let hasChanges, nil):    return SaveResult(hasChanges: hasChanges)
-        case .some(_, let error?):          return SaveResult(error)
-        }
-    }
 }
--- a/Sources/AttributeProtocol.swift
+++ b/Sources/AttributeProtocol.swift
@@ -29,19 +29,22 @@ import CoreData

 // MARK: - AttributeProtocol

-internal protocol AttributeProtocol: class {
-    
-    static var attributeType: NSAttributeType { get }
-    
-    var keyPath: KeyPathString { get }
-    var isOptional: Bool { get }
-    var isTransient: Bool { get }
-    var allowsExternalBinaryDataStorage: Bool { get }
-    var versionHashModifier: () -> String? { get }
-    var renamingIdentifier: () -> String? { get }
-    var defaultValue: () -> Any? { get }
-    var affectedByKeyPaths: () -> Set<String> { get }
+internal protocol AttributeProtocol: AnyObject, PropertyProtocol {
+
+    typealias EntityDescriptionValues = (
+        attributeType: NSAttributeType,
+        isOptional: Bool,
+        isTransient: Bool,
+        allowsExternalBinaryDataStorage: Bool,
+        versionHashModifier: String?,
+        renamingIdentifier: String?,
+        affectedByKeyPaths: Set<String>,
+        defaultValue: Any?
+    )
+
+    var entityDescriptionValues: () -> EntityDescriptionValues { get }
    var rawObject: CoreStoreManagedObject? { get set }
    var getter: CoreStoreManagedObject.CustomGetter? { get }
    var setter: CoreStoreManagedObject.CustomSetter? { get }
+    var valueForSnapshot: Any? { get }
 }
--- a/Sources/BaseDataTransaction+Importing.swift
+++ b/Sources/BaseDataTransaction+Importing.swift
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - BaseDataTransaction

-public extension BaseDataTransaction {
+extension BaseDataTransaction {
    
    /**
     Creates an `ImportableObject` by importing from the specified import source.
@@ -39,13 +39,13 @@ public 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? {
            
-            CoreStore.assert(
+            Internals.assert(
                self.isRunningInAllowedQueue(),
-                "Attempted to import an object of type \(cs_typeName(into.entityClass)) outside the transaction's designated queue."
+                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
            )
        
            return try autoreleasepool {
@@ -65,22 +65,22 @@ public 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 {
            
-            CoreStore.assert(
+            Internals.assert(
                self.isRunningInAllowedQueue(),
-                "Attempted to import an object of type \(cs_typeName(object)) outside the transaction's designated queue."
+                "Attempted to import an object of type \(Internals.typeName(object)) outside the transaction's designated queue."
            )
            
            try autoreleasepool {
              
-                let entityType = cs_dynamicType(of: object)
+                let entityType = object.runtimeType()
                guard entityType.shouldInsert(from: source, in: self) else {
                    
                    return
@@ -97,18 +97,18 @@ public 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 {
            
-            CoreStore.assert(
+            Internals.assert(
                self.isRunningInAllowedQueue(),
-                "Attempted to import an object of type \(cs_typeName(into.entityClass)) outside the transaction's designated queue."
+                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
            )
            
            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,13 +133,13 @@ public 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? {
            
-            CoreStore.assert(
+            Internals.assert(
                self.isRunningInAllowedQueue(),
-                "Attempted to import an object of type \(cs_typeName(into.entityClass)) outside the transaction's designated queue."
+                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
            )
            
            return try autoreleasepool {
@@ -151,7 +151,7 @@ public 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,23 +185,23 @@ public 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 {
            
-            CoreStore.assert(
+            Internals.assert(
                self.isRunningInAllowedQueue(),
-                "Attempted to import an object of type \(cs_typeName(into.entityClass)) outside the transaction's designated queue."
+                "Attempted to import an object of type \(Internals.typeName(into.entityClass)) outside the transaction's designated queue."
            )
            
            return try autoreleasepool {
              
                let entityType = into.entityClass 
-                var importSourceByID = Dictionary<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 @@ public 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) {
                    
--- a/Sources/BaseDataTransaction+Querying.swift
+++ b/Sources/BaseDataTransaction+Querying.swift
@@ -39,11 +39,11 @@ 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 {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.deleteAll(from, deleteClauses)
    }
@@ -56,11 +56,11 @@ 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 {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.deleteAll(from, deleteClauses)
    }
@@ -76,9 +76,9 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
    @discardableResult
    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to delete from a \(Internals.typeName(self)) outside its designated queue."
        )
        
        return try self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
@@ -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)
    }
@@ -137,13 +137,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchOne(from, fetchClauses)
    }
@@ -154,13 +154,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchOne(from, fetchClauses)
    }
@@ -176,13 +176,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchOne(clauseChain)
    }
@@ -193,13 +193,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchAll(from, fetchClauses)
    }
@@ -210,13 +210,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchAll(from, fetchClauses)
    }
@@ -232,13 +232,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchAll(clauseChain)
    }
@@ -249,13 +249,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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 {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchCount(from, fetchClauses)
    }
@@ -266,13 +266,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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 {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchCount(from, fetchClauses)
    }
@@ -288,13 +288,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchCount(clauseChain)
    }
@@ -305,13 +305,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectID(from, fetchClauses)
    }
@@ -322,13 +322,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectID(from, fetchClauses)
    }
@@ -344,13 +344,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectID(clauseChain)
    }
@@ -361,13 +361,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectIDs(from, fetchClauses)
    }
@@ -378,13 +378,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - 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.
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectIDs(from, fetchClauses)
    }
@@ -400,13 +400,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.fetchObjectIDs(clauseChain)
    }
@@ -423,13 +423,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
     - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
     - 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: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryValue(from, selectClause, queryClauses)
    }
@@ -443,13 +443,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
     - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
     - 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: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryValue(from, selectClause, queryClauses)
    }
@@ -467,13 +467,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `QueryChainableBuilderType` indicating the property/aggregate to fetch and the series of queries for the request.
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
    }
@@ -487,13 +487,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
     - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
     - 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: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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]] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryAttributes(from, selectClause, queryClauses)
    }
@@ -507,13 +507,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter selectClause: a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
     - parameter queryClauses: a series of `QueryClause` instances for the query request. Accepts `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
     - 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: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - 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]] {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryAttributes(from, selectClause, queryClauses)
    }
@@ -540,13 +540,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     ```
     - parameter clauseChain: a `QueryChainableBuilderType` indicating the properties to fetch and the series of queries for the request.
     - returns: the result of the the query as specified by the `QueryChainableBuilderType`
-     - throws: a `CoreStoreError` value indicating the failure if the specified entity could not be found in any store's schema.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return try self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
    }
@@ -561,13 +561,4 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
        
        return self.context
    }
-    
-    
-    // MARK: Obsoleted
-    
-    @available(*, obsoleted: 3.1, renamed: "unsafeContext()")
-    public func internalContext() -> NSManagedObjectContext {
-        
-        fatalError()
-    }
 }
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -50,17 +50,17 @@ 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
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to create an entity of type \(cs_typeName(entityClass)) outside its designated queue."
+            "Attempted to create an entity of type \(Internals.typeName(entityClass)) outside its designated queue."
        )
        
        let context = self.context
        let dataStack = context.parentStack!
-        let entityIdentifier = EntityIdentifier(entityClass)
+        let entityIdentifier = Internals.EntityIdentifier(entityClass)
        if into.inferStoreIfPossible {
            
            switch dataStack.persistentStore(
@@ -77,10 +77,10 @@ public /*abstract*/ class BaseDataTransaction {
                )
                
            case (nil, true):
-                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                Internals.abort("Attempted to create an entity of type \(Internals.typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
                
            default:
-                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)), but a destination persistent store containing the entity type could not be found.")
+                Internals.abort("Attempted to create an entity of type \(Internals.typeName(entityClass)), but a destination persistent store containing the entity type could not be found.")
            }
        }
        else {
@@ -100,16 +100,16 @@ public /*abstract*/ class BaseDataTransaction {
                )
                
            case (nil, true):
-                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                Internals.abort("Attempted to create an entity of type \(Internals.typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
                
            default:
                if let configuration = into.configuration {
                    
-                    CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) into the configuration \"\(configuration)\", which it doesn't belong to.")
+                    Internals.abort("Attempted to create an entity of type \(Internals.typeName(entityClass)) into the configuration \"\(configuration)\", which it doesn't belong to.")
                }
                else {
                    
-                    CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) into the default configuration, which it doesn't belong to.")
+                    Internals.abort("Attempted to create an entity of type \(Internals.typeName(entityClass)) into the default configuration, which it doesn't belong to.")
                }
            }
        }
@@ -121,11 +121,11 @@ 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to update an entity of type \(cs_typeName(object)) outside its designated queue."
+            "Attempted to update an entity of type \(Internals.typeName(object)) outside its designated queue."
        )
        guard let object = object else {
            
@@ -141,62 +141,69 @@ 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? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to update an entity of type \(cs_typeName(into.entityClass)) outside its designated queue."
+            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            into.inferStoreIfPossible
                || (into.configuration ?? DataStack.defaultConfigurationName) == objectID.persistentStore?.configurationName,
-            "Attempted to update an entity of type \(cs_typeName(into.entityClass)) but the specified persistent store do not match the `NSManagedObjectID`."
+            "Attempted to update an entity of type \(Internals.typeName(into.entityClass)) but the specified persistent store do not match the `NSManagedObjectID`."
        )
        return self.fetchExisting(objectID)
    }
-    
+
    /**
-     Deletes a specified `NSManagedObject` or `CoreStoreObject`.
-     
-     - parameter object: the `NSManagedObject` or `CoreStoreObject` to be deleted
+     Deletes the objects with the specified `NSManagedObjectID`s.
+
+     - parameter objectIDs: the `NSManagedObjectID`s of the objects to delete
     */
-    public func delete<D: DynamicObject>(_ object: D?) {
-        
-        CoreStore.assert(
+    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
-        object
-            .flatMap(context.fetchExisting)
-            .flatMap({ context.delete($0.cs_toRaw()) })
+        objectIDs.forEach {
+
+            context.fetchExisting($0).map(context.delete(_:))
+        }
    }
    
    /**
-     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s.
+     Deletes the specified `NSManagedObject`s or `CoreStoreObject`s represented by series of `ObjectRepresentation`s.
     
-     - 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 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>(_ object1: D?, _ object2: D?, _ objects: D?...) {
+    public func delete<O: ObjectRepresentation>(_ object: O?, _ objects: O?...) {
        
-        self.delete(([object1, object2] + objects).compactMap { $0 })
+        Internals.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to delete an entity outside its designated queue."
+        )
+        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 objects: the `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<S: Sequence>(_ objects: S) where S.Iterator.Element: DynamicObject {
+    public func delete<S: Sequence>(_ objects: S) where S.Iterator.Element: ObjectRepresentation {
        
-        CoreStore.assert(
+        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.asEditable(in: self).map({ context.delete($0.cs_toRaw()) })
+        }
    }
    
    /**
@@ -204,7 +211,7 @@ public /*abstract*/ class BaseDataTransaction {
     */
    public func refreshAndMergeAllObjects() {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to refresh entities outside their designated queue."
        )
@@ -213,6 +220,25 @@ public /*abstract*/ class BaseDataTransaction {
    
    
    // MARK: Inspecting Pending Objects
+
+    /**
+     Returns `true` if the object has any property values changed. This method should not be called after the `commit()` method was called.
+
+     - parameter object: the `DynamicObject` instance
+     - returns: `true` if the object has any property values changed.
+     */
+    public func objectHasPersistentChangedValues<O: DynamicObject>(_ object: O) -> Bool {
+
+        Internals.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to access inserted objects from a \(Internals.typeName(self)) outside its designated queue."
+        )
+        Internals.assert(
+            !self.isCommitted,
+            "Attempted to access inserted objects from an already committed \(Internals.typeName(self))."
+        )
+        return object.cs_toRaw().hasPersistentChangedValues
+    }
    
    /**
     Returns all pending `DynamicObject`s of the specified type that were inserted to the transaction. This method should not be called after the `commit()` method was called.
@@ -220,15 +246,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access inserted objects from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access inserted objects from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access inserted objects from an already committed \(cs_typeName(self))."
+            "Attempted to access inserted objects from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.insertedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
@@ -240,13 +266,13 @@ public /*abstract*/ class BaseDataTransaction {
     */
    public func insertedObjectIDs() -> Set<NSManagedObjectID> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access inserted object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access inserted objects IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access inserted objects IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.insertedObjects.map { $0.objectID })
    }
@@ -257,15 +283,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access inserted object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access inserted objects IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access inserted objects IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.insertedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
@@ -276,15 +302,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access updated objects from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access updated objects from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access updated objects from an already committed \(cs_typeName(self))."
+            "Attempted to access updated objects from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.updatedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
@@ -296,13 +322,13 @@ public /*abstract*/ class BaseDataTransaction {
     */
    public func updatedObjectIDs() -> Set<NSManagedObjectID> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access updated object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access updated object IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access updated object IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.updatedObjects.map { $0.objectID })
    }
@@ -313,15 +339,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access updated object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access updated object IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access updated object IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.updatedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
@@ -332,15 +358,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access deleted objects from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access deleted objects from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access deleted objects from an already committed \(cs_typeName(self))."
+            "Attempted to access deleted objects from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.deletedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
@@ -353,13 +379,13 @@ public /*abstract*/ class BaseDataTransaction {
     */
    public func deletedObjectIDs() -> Set<NSManagedObjectID> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access deleted object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access deleted object IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access deleted object IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.deletedObjects.map { $0.objectID })
    }
@@ -370,15 +396,15 @@ 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> {
        
-        CoreStore.assert(
+        Internals.assert(
            self.isRunningInAllowedQueue(),
-            "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to access deleted object IDs from a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.isCommitted,
-            "Attempted to access deleted object IDs from an already committed \(cs_typeName(self))."
+            "Attempted to access deleted object IDs from an already committed \(Internals.typeName(self))."
        )
        return Set(self.context.deletedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
@@ -442,49 +468,4 @@ public /*abstract*/ class BaseDataTransaction {
        
        self.context.reset()
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use insertedObjects(_:) and pass the specific entity type")
-    public func insertedObjects() -> Set<NSManagedObject> {
-        
-        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to access inserted objects from a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to access inserted objects from an already committed \(cs_typeName(self))."
-        )
-        return self.context.insertedObjects
-    }
-    
-    @available(*, deprecated, message: "Use updatedObjects(_:) and pass the specific entity type")
-    public func updatedObjects() -> Set<NSManagedObject> {
-        
-        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to access updated objects from a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to access updated objects from an already committed \(cs_typeName(self))."
-        )
-        return self.context.updatedObjects
-    }
-    
-    @available(*, deprecated, message: "Use deletedObjects(_:) and pass the specific entity type")
-    public func deletedObjects() -> Set<NSManagedObject> {
-        
-        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to access deleted objects from a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.isCommitted,
-            "Attempted to access deleted objects from an already committed \(cs_typeName(self))."
-        )
-        return self.context.deletedObjects
-    }
 }
--- a/Sources/CSAsynchronousDataTransaction.swift
+++ b/Sources/CSAsynchronousDataTransaction.swift
@@ -34,6 +34,7 @@ import CoreData
 
 - SeeAlso: `AsynchronousDataTransaction`
 */
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
@objc
 public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreStoreObjectiveCType {
    
@@ -46,13 +47,13 @@ public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreSto
    @objc
    public func commitWithSuccess(_ success: (() -> Void)?, failure: ((CSError) -> Void)?) {
        
-        CoreStore.assert(
+        Internals.assert(
            self.bridgeToSwift.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to commit a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to commit a \(Internals.typeName(self)) outside its designated queue."
        )
-        CoreStore.assert(
+        Internals.assert(
            !self.bridgeToSwift.isCommitted,
-            "Attempted to commit a \(cs_typeName(self)) more than once."
+            "Attempted to commit a \(Internals.typeName(self)) more than once."
        )
        self.bridgeToSwift.autoCommit { (_, error) in
            
@@ -72,7 +73,7 @@ public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreSto
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -156,46 +157,12 @@ public final class CSAsynchronousDataTransaction: CSBaseDataTransaction, CoreSto
        
        super.init(swiftValue)
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the new -[CSAsynchronousDataTransaction commitWithSuccess:failure:] method.")
-    @objc
-    public func commitWithCompletion(_ completion: ((_ result: CSSaveResult) -> Void)?) {
-        
-        CoreStore.assert(
-            self.bridgeToSwift.transactionQueue.cs_isCurrentExecutionContext(),
-            "Attempted to commit a \(cs_typeName(self)) outside its designated queue."
-        )
-        CoreStore.assert(
-            !self.bridgeToSwift.isCommitted,
-            "Attempted to commit a \(cs_typeName(self)) more than once."
-        )
-        self.bridgeToSwift.commit { (result) in
-            
-            completion?(result.bridgeToObjectiveC)
-        }
-    }
-    
-    @available(*, deprecated, message: "Secondary tasks spawned from CSAsynchronousDataTransactions and CSSynchronousDataTransactions are no longer supported. ")
-    @objc
-    @discardableResult
-    public func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void) -> CSSaveResult? {
-        
-        return bridge {
-            
-            self.bridgeToSwift.beginSynchronous { (transaction) in
-                
-                closure(transaction.bridgeToObjectiveC)
-            }
-        }
-    }
 }


 // MARK: - AsynchronousDataTransaction

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 extension AsynchronousDataTransaction: CoreStoreSwiftType {
    
    // MARK: CoreStoreSwiftType
--- a/Sources/CSBaseDataTransaction+Querying.swift
+++ b/Sources/CSBaseDataTransaction+Querying.swift
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSBaseDataTransaction

-public extension CSBaseDataTransaction {
+extension CSBaseDataTransaction {
    
    /**
     Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
@@ -89,9 +89,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func fetchOneFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> Any? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.fetchOne(from, fetchClauses))?
            .flatMap({ $0 })
@@ -107,9 +107,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func fetchAllFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [Any]? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.fetchAll(from, fetchClauses))
            .flatMap({ $0 })
@@ -125,9 +125,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func fetchCountFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSNumber? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.fetchCount(from, fetchClauses))
            .flatMap({ NSNumber(value: $0) })
@@ -143,9 +143,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func fetchObjectIDFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSManagedObjectID? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.fetchObjectID(from, fetchClauses))
            .flatMap({ $0 })
@@ -164,9 +164,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func queryValueFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> Any? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.queryValue(from, selectClause, queryClauses))
            .flatMap({ $0 })
@@ -185,9 +185,9 @@ public extension CSBaseDataTransaction {
    @objc
    public func queryAttributesFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> [[String: Any]]? {
        
-        CoreStore.assert(
+        Internals.assert(
            self.swiftTransaction.isRunningInAllowedQueue(),
-            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
+            "Attempted to query from a \(Internals.typeName(self)) outside its designated queue."
        )
        return (try? self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses))
            .flatMap({ $0 })
--- a/Sources/CSBaseDataTransaction.swift
+++ b/Sources/CSBaseDataTransaction.swift
@@ -251,28 +251,4 @@ public class CSBaseDataTransaction: NSObject {
        self.swiftTransaction = swiftValue
        super.init()
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use -[insertedObjectsOfType:] and pass the specific entity class")
-    @objc
-    public func insertedObjects() -> Set<NSManagedObject> {
-        
-        return self.swiftTransaction.insertedObjects()
-    }
-    
-    @available(*, deprecated, message: "Use -[updatedObjectsOfType:] and pass the specific entity class")
-    @objc
-    public func updatedObjects() -> Set<NSManagedObject> {
-        
-        return self.swiftTransaction.updatedObjects()
-    }
-    
-    @available(*, deprecated, message: "Use -[deletedObjectsOfType:] and pass the specific entity class")
-    @objc
-    public func deletedObjects() -> Set<NSManagedObject> {
-        
-        return self.swiftTransaction.deletedObjects()
-    }
 }
--- a/Sources/CSCoreStore+Migrating.swift
+++ b/Sources/CSCoreStore+Migrating.swift
@@ -29,7 +29,8 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+@available(*, deprecated, message: "Call methods directly from the CSDataStack instead")
+extension CSCoreStore {
    
    /**
     Asynchronously adds a `CSInMemoryStore` to the `defaultStack`. Migrations are also initiated by default.
--- a/Sources/CSCoreStore+Observing.swift
+++ b/Sources/CSCoreStore+Observing.swift
@@ -29,8 +29,9 @@ import CoreData

 // MARK: - CSCoreStore

+@available(*, deprecated, message: "Call methods directly from the CSDataStack instead")
@available(macOS 10.12, *)
-public extension CSCoreStore {
+extension CSCoreStore {
    
    /**
     Using the `defaultStack`, creates an `CSObjectMonitor` for the specified `NSManagedObject`. Multiple `CSObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
--- a/Sources/CSCoreStore+Querying.swift
+++ b/Sources/CSCoreStore+Querying.swift
@@ -29,7 +29,8 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+@available(*, deprecated, message: "Call methods directly from the DataStack instead")
+extension CSCoreStore {
    
    /**
     Using the `defaultStack`, fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
--- a/Sources/CSCoreStore+Setup.swift
+++ b/Sources/CSCoreStore+Setup.swift
@@ -29,7 +29,8 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+@available(*, deprecated, message: "Call methods directly from the CSDataStack instead")
+extension CSCoreStore {
    
    /**
     Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
@@ -37,7 +38,7 @@ public extension CSCoreStore {
    @objc
    public static var modelVersion: String {
        
-        return CoreStore.modelVersion
+        return self.defaultStack.modelVersion
    }
    
    /**
@@ -46,7 +47,7 @@ public 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)
    }
    
    /**
@@ -55,7 +56,7 @@ public extension CSCoreStore {
    @objc
    public static func entityDescriptionForClass(_ type: NSManagedObject.Type) -> NSEntityDescription? {
        
-        return CoreStore.entityDescription(for: type)
+        return self.defaultStack.bridgeToSwift.entityDescription(for: type)
    }
    
    /**
@@ -125,21 +126,4 @@ public extension CSCoreStore {
        
        return self.defaultStack.addSQLiteStorageAndWait(storage, error: error)
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the new +entityTypesByNameForType: method passing `[NSManagedObject class]` as argument.")
-    @objc
-    public static var entityClassesByName: [EntityName: NSManagedObject.Type] {
-        
-        return CoreStore.entityTypesByName
-    }
-    
-    @available(*, deprecated, message: "Use the new +entityTypesByNameForType: method passing `[NSManagedObject class]` as argument.")
-    @objc
-    public static func entityClassWithName(_ name: EntityName) -> NSManagedObject.Type? {
-        
-        return CoreStore.entityTypesByName[name]
-    }
 }
--- a/Sources/CSCoreStore+Transaction.swift
+++ b/Sources/CSCoreStore+Transaction.swift
@@ -28,7 +28,8 @@ import Foundation

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+@available(*, deprecated, message: "Call methods directly from the CSDataStack instead")
+extension CSCoreStore {
    
    /**
     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
@@ -45,7 +46,7 @@ public extension CSCoreStore {
     Using the `defaultStack`, begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
     
     - parameter closure: the block 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`.
-     - returns: a `CSSaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     - returns: `YES` if the commit succeeded, `NO` if the commit failed. If `NO`, the `error` argument will hold error information.
     */
    @objc
    public static func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void, error: NSErrorPointer) -> Bool {
@@ -64,7 +65,7 @@ public extension CSCoreStore {
        
        return bridge {
            
-            CoreStore.beginUnsafe()
+            self.defaultStack.bridgeToSwift.beginUnsafe()
        }
    }
    
@@ -79,7 +80,7 @@ public extension CSCoreStore {
        
        return bridge {
            
-            CoreStore.beginUnsafe(supportsUndo: supportsUndo)
+            self.defaultStack.bridgeToSwift.beginUnsafe(supportsUndo: supportsUndo)
        }
    }
    
@@ -89,17 +90,6 @@ public extension CSCoreStore {
    @objc
    public static func refreshAndMergeAllObjects() {
        
-        CoreStore.refreshAndMergeAllObjects()
-    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the new +[CSCoreStore beginSynchronous:error:] API that reports failure using an error instance.")
-    @objc
-    @discardableResult
-    public static func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void) -> CSSaveResult? {
-        
-        return self.defaultStack.beginSynchronous(closure)
+        self.defaultStack.refreshAndMergeAllObjects()
    }
 }
--- a/Sources/CSCoreStore.swift
+++ b/Sources/CSCoreStore.swift
@@ -33,6 +33,7 @@ import Foundation
 
 - SeeAlso: `CoreStore`
 */
+@available(*, deprecated, message: "Call methods directly from the CSDataStack instead")
@objc
 public final class CSCoreStore: NSObject {
    
@@ -45,14 +46,8 @@ public final class CSCoreStore: NSObject {
    @objc
    public static var defaultStack: CSDataStack {
        
-        get {
-            
-            return CoreStore.defaultStack.bridgeToObjectiveC
-        }
-        set {
-            
-            CoreStore.defaultStack = newValue.bridgeToSwift
-        }
+        get { return CoreStoreDefaults.dataStack.bridgeToObjectiveC }
+        set { CoreStoreDefaults.dataStack = newValue.bridgeToSwift }
    }
    
    
--- a/Sources/CSDataStack+Migrating.swift
+++ b/Sources/CSDataStack+Migrating.swift
@@ -29,7 +29,8 @@ import CoreData

 // MARK: - CSDataStack

-public extension CSDataStack {
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
+extension CSDataStack {
    
    /**
     Asynchronously adds a `CSInMemoryStore` to the stack. Migrations are also initiated by default.
--- a/Sources/CSDataStack+Observing.swift
+++ b/Sources/CSDataStack+Observing.swift
@@ -29,14 +29,15 @@ import CoreData

 // MARK: - CSDataStack

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
@available(macOS 10.12, *)
-public extension CSDataStack {
+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 {
@@ -54,11 +55,11 @@ public extension CSDataStack {
    @objc
    public func monitorListFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> CSListMonitor {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to observe objects from \(cs_typeName(self)) outside the main thread."
+            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
        )
-        CoreStore.assert(
+        Internals.assert(
            fetchClauses.contains { $0 is CSOrderBy },
            "A CSListMonitor requires a CSOrderBy clause."
        )
@@ -68,7 +69,7 @@ public extension CSDataStack {
            sectionBy: nil,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            }
        ).bridgeToObjectiveC
    }
@@ -83,11 +84,11 @@ public extension CSDataStack {
    @objc
    public func monitorListByCreatingAsynchronously(_ createAsynchronously: @escaping (CSListMonitor) -> Void, from: CSFrom, fetchClauses: [CSFetchClause]) {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to observe objects from \(cs_typeName(self)) outside the main thread."
+            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
        )
-        CoreStore.assert(
+        Internals.assert(
            fetchClauses.contains { $0 is CSOrderBy },
            "A CSListMonitor requires an CSOrderBy clause."
        )
@@ -97,7 +98,7 @@ public extension CSDataStack {
            sectionBy: nil,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            },
            createAsynchronously: {
                
@@ -117,11 +118,11 @@ public extension CSDataStack {
    @objc
    public func monitorSectionedListFrom(_ from: CSFrom, sectionBy: CSSectionBy, fetchClauses: [CSFetchClause]) -> CSListMonitor {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to observe objects from \(cs_typeName(self)) outside the main thread."
+            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
        )
-        CoreStore.assert(
+        Internals.assert(
            fetchClauses.contains { $0 is CSOrderBy },
            "A CSListMonitor requires an CSOrderBy clause."
        )
@@ -131,7 +132,7 @@ public extension CSDataStack {
            sectionBy: sectionBy.bridgeToSwift,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            }
        ).bridgeToObjectiveC
    }
@@ -146,11 +147,11 @@ public extension CSDataStack {
     */
    public func monitorSectionedListByCreatingAsynchronously(_ createAsynchronously: @escaping (CSListMonitor) -> Void, from: CSFrom, sectionBy: CSSectionBy, fetchClauses: [CSFetchClause]) {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to observe objects from \(cs_typeName(self)) outside the main thread."
+            "Attempted to observe objects from \(Internals.typeName(self)) outside the main thread."
        )
-        CoreStore.assert(
+        Internals.assert(
            fetchClauses.contains { $0 is CSOrderBy },
            "A CSListMonitor requires an CSOrderBy clause."
        )
@@ -160,7 +161,7 @@ public extension CSDataStack {
            sectionBy: sectionBy.bridgeToSwift,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            },
            createAsynchronously: {
                
--- a/Sources/CSDataStack+Querying.swift
+++ b/Sources/CSDataStack+Querying.swift
@@ -29,7 +29,8 @@ import CoreData

 // MARK: - CSDataStack

-public extension CSDataStack {
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
+extension CSDataStack {
    
    /**
     Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
@@ -89,9 +90,9 @@ public extension CSDataStack {
    @objc
    public func fetchOneFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> Any? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses))?
            .flatMap({ $0 })
@@ -107,9 +108,9 @@ public extension CSDataStack {
    @objc
    public func fetchAllFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [Any]? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses))
            .flatMap({ $0 })
@@ -125,9 +126,9 @@ public extension CSDataStack {
    @objc
    public func fetchCountFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSNumber? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.fetchCount(from, fetchClauses))
            .flatMap({ NSNumber(value: $0) })
@@ -143,9 +144,9 @@ public extension CSDataStack {
    @objc
    public func fetchObjectIDFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> NSManagedObjectID? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses))?
            .flatMap({ $0 })
@@ -161,9 +162,9 @@ public extension CSDataStack {
    @objc
    public func fetchObjectIDsFrom(_ from: CSFrom, fetchClauses: [CSFetchClause]) -> [NSManagedObjectID]? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to fetch from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses))
            .flatMap({ $0 })
@@ -182,9 +183,9 @@ public extension CSDataStack {
    @objc
    public func queryValueFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> Any? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to query from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses))
            .flatMap({ $0 })
@@ -203,9 +204,9 @@ public extension CSDataStack {
    @objc
    public func queryAttributesFrom(_ from: CSFrom, selectClause: CSSelect, queryClauses: [CSQueryClause]) -> [[String: Any]]? {
        
-        CoreStore.assert(
+        Internals.assert(
            Thread.isMainThread,
-            "Attempted to query from a \(cs_typeName(self)) outside the main thread."
+            "Attempted to query from a \(Internals.typeName(self)) outside the main thread."
        )
        return (try? self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses))
            .flatMap({ $0 })
--- a/Sources/CSDataStack+Transaction.swift
+++ b/Sources/CSDataStack+Transaction.swift
@@ -28,7 +28,8 @@ import Foundation

 // MARK: - CSDataStack

-public extension CSDataStack {
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
+extension CSDataStack {
    
    /**
     Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
@@ -45,9 +46,9 @@ public extension CSDataStack {
                closure(csTransaction)
                if !transaction.isCommitted && transaction.hasChanges {
                    
-                    CoreStore.log(
+                    Internals.log(
                        .warning,
-                        message: "The closure for the \(cs_typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
+                        message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
                    )
                }
                try transaction.cancel()
@@ -77,9 +78,9 @@ public extension CSDataStack {
                        closure(csTransaction)
                        if !transaction.isCommitted && transaction.hasChanges {
                            
-                            CoreStore.log(
+                            Internals.log(
                                .warning,
-                                message: "The closure for the \(cs_typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
+                                message: "The closure for the \(Internals.typeName(csTransaction)) completed without being committed. All changes made within the transaction were discarded."
                            )
                        }
                        try transaction.cancel()
@@ -131,21 +132,4 @@ public extension CSDataStack {
        
        self.bridgeToSwift.refreshAndMergeAllObjects()
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the new -[CSDataStack beginSynchronous:error:] API that reports failure using an error instance.")
-    @objc
-    @discardableResult
-    public func beginSynchronous(_ closure: @escaping (_ transaction: CSSynchronousDataTransaction) -> Void) -> CSSaveResult? {
-        
-        return bridge {
-            
-            self.bridgeToSwift.beginSynchronous { (transaction) in
-                
-                closure(transaction.bridgeToObjectiveC)
-            }
-        }
-    }
 }
--- a/Sources/CSDataStack.swift
+++ b/Sources/CSDataStack.swift
@@ -34,6 +34,7 @@ import CoreData
 
 - SeeAlso: `DataStack`
 */
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
@objc
 public final class CSDataStack: NSObject, CoreStoreObjectiveCType {
    
@@ -191,7 +192,7 @@ public final class CSDataStack: NSObject, CoreStoreObjectiveCType {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -204,65 +205,12 @@ public final class CSDataStack: NSObject, CoreStoreObjectiveCType {
        self.bridgeToSwift = swiftValue
        super.init()
    }
-    
-    
-    // MARK: Deprecated
-    
-    @available(*, deprecated, message: "Use the -[initWithXcodeModelName:bundle:versionChain:] initializer.")
-    @objc
-    public convenience init(modelName: XcodeDataModelFileName?, bundle: Bundle?, versionChain: [String]?) {
-        
-        self.init(
-            DataStack(
-                xcodeModelName: modelName ?? DataStack.applicationName,
-                bundle: bundle ?? Bundle.main,
-                migrationChain: versionChain.flatMap { MigrationChain($0) } ?? nil
-            )
-        )
-    }
-    
-    @available(*, deprecated, message: "Use the -[initWithModelName:bundle:versionChain:] initializer.")
-    @objc
-    public convenience init(model: NSManagedObjectModel, versionChain: [String]?) {
-        
-        self.init(
-            DataStack(
-                model: model,
-                migrationChain: versionChain.flatMap { MigrationChain($0) } ?? nil
-            )
-        )
-    }
-    
-    @available(*, deprecated, message: "Use the -[initWithModelName:bundle:versionTree:] initializer.")
-    @objc
-    public convenience init(model: NSManagedObjectModel, versionTree: [String]?) {
-        
-        self.init(
-            DataStack(
-                model: model,
-                migrationChain: versionTree.flatMap { MigrationChain($0) } ?? nil
-            )
-        )
-    }
-    
-    @available(*, deprecated, message: "Use the new -entityTypesByNameForType: method passing `[NSManagedObject class]` as argument.")
-    @objc
-    public var entityClassesByName: [EntityName: NSManagedObject.Type] {
-        
-        return self.bridgeToSwift.entityTypesByName
-    }
-    
-    @available(*, deprecated, message: "Use the new -entityTypesByNameForType: method passing `[NSManagedObject class]` as argument.")
-    @objc
-    public func entityClassWithName(_ name: EntityName) -> NSManagedObject.Type? {
-        
-        return self.bridgeToSwift.entityTypesByName[name]
-    }
 }


 // MARK: - DataStack

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 extension DataStack: CoreStoreSwiftType {
    
    // MARK: CoreStoreSwiftType
--- a/Sources/CSError.swift
+++ b/Sources/CSError.swift
@@ -35,7 +35,7 @@ import CoreData
 - SeeAlso: `CoreStoreError`
 */
@objc
-public final class CSError: NSError, CoreStoreObjectiveCType {
+public final class CSError: NSError {
    
    /**
     The `NSError` error domain for `CSError`.
@@ -44,6 +44,17 @@ public final class CSError: NSError, CoreStoreObjectiveCType {
     */
    @objc
    public static let errorDomain = CoreStoreErrorDomain
+
+    public var bridgeToSwift: CoreStoreError {
+
+        if let swift = self.swiftError {
+
+            return swift
+        }
+        let swift = CoreStoreError(_bridgedNSError: self) ?? .unknown
+        self.swiftError = swift
+        return swift
+    }
    
    
    // MARK: NSObject
@@ -64,21 +75,7 @@ public final class CSError: NSError, CoreStoreObjectiveCType {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
-    }
-    
-    
-    // MARK: CoreStoreObjectiveCType
-    
-    public var bridgeToSwift: CoreStoreError {
-        
-        if let swift = self.swiftError {
-            
-            return swift
-        }
-        let swift = CoreStoreError(_bridgedNSError: self) ?? .unknown
-        self.swiftError = swift
-        return swift
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    /**
@@ -101,6 +98,9 @@ public final class CSError: NSError, CoreStoreObjectiveCType {
    private var swiftError: CoreStoreError?
 }

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
+extension CSError: CoreStoreObjectiveCType {}
+

 // MARK: - CSErrorCode

@@ -110,6 +110,7 @@ public final class CSError: NSError, CoreStoreObjectiveCType {
 - SeeAlso: `CSError`
 - SeeAlso: `CoreStoreError`
 */
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
@objc
 public enum CSErrorCode: Int {
    
@@ -152,15 +153,7 @@ public enum CSErrorCode: Int {

 // MARK: - CoreStoreError

-extension CoreStoreError: CoreStoreSwiftType, _ObjectiveCBridgeableError {
-    
-    // MARK: CoreStoreSwiftType
-    
-    public var bridgeToObjectiveC: CSError {
-        
-        return CSError(self)
-    }
-    
+extension CoreStoreError: _ObjectiveCBridgeableError {
    
    // MARK: _ObjectiveCBridgeableError
    
@@ -260,9 +253,11 @@ extension CoreStoreError: CoreStoreSwiftType, _ObjectiveCBridgeableError {
 }


-// MARK: Internal
+// MARK: - Error

-internal extension Error {
+extension Error {
+
+    // MARK: Internal
    
    internal var bridgeToSwift: CoreStoreError {
        
@@ -274,14 +269,15 @@ internal extension Error {
        case let error as CSError:
            return error.bridgeToSwift
            
-        case let error as NSError where type(of: self) is NSError.Type:
+        case let error as NSError where Self.self is NSError.Type:
            return .internalError(NSError: error)
            
        default:
            return .unknown
        }
    }
-    
+
+    @available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
    internal var bridgeToObjectiveC: NSError {
        
        switch self {
@@ -297,3 +293,17 @@ internal extension Error {
        }
    }
 }
+
+
+// MARK: - CoreStoreError
+
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
+extension CoreStoreError: CoreStoreSwiftType {
+
+    // MARK: CoreStoreSwiftType
+
+    public var bridgeToObjectiveC: CSError {
+
+        return CSError(self)
+    }
+}
--- a/Sources/CSFrom.swift
+++ b/Sources/CSFrom.swift
@@ -97,7 +97,7 @@ public final class CSFrom: NSObject {
            self.init(From(entityClass, nil))
            
        default:
-            CoreStore.abort("The configuration argument only accepts NSString and NSNull values")
+            Internals.abort("The configuration argument only accepts NSString and NSNull values")
        }
    }
    
@@ -126,7 +126,7 @@ public final class CSFrom: NSObject {
                arguments.append(nil)
                
            default:
-                CoreStore.abort("The configurations argument only accepts NSString and NSNull values")
+                Internals.abort("The configurations argument only accepts NSString and NSNull values")
            }
        }
        self.init(From(entityClass, arguments))
@@ -137,7 +137,7 @@ public final class CSFrom: NSObject {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -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
    
--- a/Sources/CSGroupBy.swift
+++ b/Sources/CSGroupBy.swift
@@ -87,7 +87,7 @@ public final class CSGroupBy: NSObject, CSQueryClause {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -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
    
--- a/Sources/CSInMemoryStore.swift
+++ b/Sources/CSInMemoryStore.swift
@@ -34,6 +34,7 @@ import CoreData
 
 - SeeAlso: `InMemoryStore`
 */
+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
@objc
 public final class CSInMemoryStore: NSObject, CSStorageInterface, CoreStoreObjectiveCType {
    
@@ -103,7 +104,7 @@ public final class CSInMemoryStore: NSObject, CSStorageInterface, CoreStoreObjec
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -121,6 +122,7 @@ public final class CSInMemoryStore: NSObject, CSStorageInterface, CoreStoreObjec

 // MARK: - InMemoryStore

+@available(*, deprecated, message: "CoreStore Objective-C API will be removed soon.")
 extension InMemoryStore: CoreStoreSwiftType {
    
    // MARK: CoreStoreSwiftType
--- a/Sources/CSInto.swift
+++ b/Sources/CSInto.swift
@@ -104,7 +104,7 @@ public final class CSInto: NSObject {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
@@ -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
    
--- a/Sources/CSListMonitor.swift
+++ b/Sources/CSListMonitor.swift
@@ -495,14 +495,15 @@ public final class CSListMonitor: NSObject {
     
     `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. Note that only specified clauses will be changed; unspecified clauses will use previous values.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - Important: Starting CoreStore 4.0, all `CSFetchClause`s required by the `CSListMonitor` should be provided in the arguments list of `refetch(...)`.
     */
    @objc
    public func refetch(_ fetchClauses: [CSFetchClause]) {
        
        self.bridgeToSwift.refetch { (fetchRequest) in
            
-            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+            fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
        }
    }
    
@@ -525,7 +526,7 @@ public final class CSListMonitor: NSObject {
    
    public override var description: String {
        
-        return "(\(String(reflecting: type(of: self)))) \(self.bridgeToSwift.coreStoreDumpString)"
+        return "(\(String(reflecting: Self.self))) \(self.bridgeToSwift.coreStoreDumpString)"
    }
    
    
--- a/Sources/CSListObserver.swift
+++ b/Sources/CSListObserver.swift
@@ -42,7 +42,7 @@ import CoreData
 */
@available(macOS 10.12, *)
@objc
-public protocol CSListObserver: class {
+public protocol CSListObserver: AnyObject {
    
    /**
     Handles processing just before a change to the observed list occurs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Estropia	e720504855	Update README.md	2020-06-20 17:37:12 +09:00
John Estropia	ee51c5ad9c	fix readme indentations	2020-06-20 16:47:52 +09:00
John Estropia	4ac7df7364	version bump	2020-06-20 13:16:14 +09:00
John Estropia	56f873ccb3	fix readme table of contents	2020-06-20 13:12:11 +09:00
John Estropia	1f90f846f3	readme update	2020-06-20 13:07:10 +09:00
John Estropia	4a97d5a8dc	remove persistentstores during DataStack deinitialization to prevent warnings in Unit tests during teardown	2020-05-26 09:43:39 +09:00
John Estropia	0eb9b6393d	add unit testst for Field dynamic initializers	2020-05-24 10:54:16 +09:00
John Estropia	56d0ea46ea	Implement dynamic initializers for Field properties (fixes #382 )	2020-05-23 12:07:16 +09:00
John Estropia	a7568eebdb	fix comments	2020-04-15 16:49:45 +09:00
John Estropia	4049e1944a	trigger lazy initialization of ObjectPublisher observation after addObserver() (fixes #383 )	2020-04-15 16:48:42 +09:00
John Estropia	73b7fcd907	Merge branch 'prototype/propertyWrapperFields' into develop	2020-03-26 02:04:33 +09:00
John Estropia	74c1a97af4	Version bump	2020-03-26 02:04:10 +09:00
John Estropia	97f2a53124	AppleDocs for Field source files	2020-03-26 01:57:32 +09:00
John Estropia	b6db872be0	Merge branch 'prototype/propertyWrapperFields' of github.com:JohnEstropia/CoreStore into prototype/propertyWrapperFields	2020-03-25 19:00:56 +09:00
John Estropia	0d9299f900	WIP: docs	2020-03-25 14:21:49 +09:00
John Estropia	7f928dc684	docs	2020-03-19 14:12:09 +09:00
John Estropia	231e138ab0	performant access of relationship objectIDs for snapshots	2020-02-21 13:51:17 +09:00
John Estropia	361dba58c6	bypass thread checks depending on location of Field call	2020-02-21 11:52:11 +09:00
John Estropia	e1b03b4a89	fix wrong optional configuration in Field.Virtual	2020-02-21 11:20:32 +09:00
John Estropia	0df6c737c1	fix wrong optional configuration in Field.Virtual	2020-02-21 11:17:39 +09:00
John Estropia	12c5aeaaa4	safer casting	2020-02-21 10:36:28 +09:00
John Estropia	dd3fb17dd0	fix runtime issue with Fields on objects with base classes	2020-02-21 10:19:42 +09:00
John Estropia	627a5d4355	add OrderBy utilities for Field.Stored	2020-02-19 22:01:46 +09:00
John Estropia	58629bc1df	add missing predicate operator overloads	2020-02-19 13:58:14 +09:00
John Estropia	f925803b93	Create FUNDING.yml	2020-02-19 13:32:57 +09:00
John Estropia	843adf21f7	improved API for custom getters and setters in Field properties	2020-02-18 18:17:52 +09:00
John Estropia	2d1b1e0592	add Field.Coded dynamic lookups for ObjectPublisher and ObjectSnapshot	2020-02-17 18:30:18 +09:00
John Estropia	38e9878c04	Merge branch 'master' into prototype/propertyWrapperFields	2020-02-08 09:47:35 +09:00
John Estropia	8cb8b95c2e	fix build for watchOS	2020-02-08 08:49:11 +09:00
John Estropia	8e4e308ccc	Merge branch 'prototype/propertyWrapperFields' of github.com:JohnEstropia/CoreStore into prototype/propertyWrapperFields	2020-02-06 09:33:15 +09:00
John Estropia	f0f4049798	renamed Field.Computed to Field.Virtual to distinguish from Field.Derived	2020-02-06 09:33:08 +09:00
John Estropia	c20fe4ac17	add Field.Relationship dynamicMemberLookups	2020-02-05 11:03:57 +09:00
John Estropia	e9c3312612	Fix default encoders for top-level values	2020-01-21 17:03:12 +09:00
John Estropia	92ad895044	Field.Relationship propertyWrapper	2020-01-20 17:13:01 +09:00
John Estropia	bcc2d9def3	Field.Coded implementations for transformable attributes	2020-01-18 16:22:06 +09:00
John Estropia	43f61359da	prototype new Fields as propertyWrappers (Swift 5.2 above only)	2020-01-15 18:29:58 +09:00
John Estropia	5e37ee4566	Reorganize properties source files	2020-01-10 17:04:51 +09:00
John Estropia	c544e0cce8	lazily evaluate NSEntityDescription-required fields from CoreStoreObject attributes	2020-01-09 17:00:43 +09:00
John Estropia	f119a3adec	add SPM installation instructions to README	2020-01-08 11:21:41 +09:00
John Estropia	c951cb87a3	version bump	2020-01-08 11:03:43 +09:00
John Estropia	08147806a0	explicit exclusion of objc files in package.swift	2020-01-08 11:01:22 +09:00
John Estropia	4beb11519e	Deprecation of ObjectiveC shivs	2020-01-08 10:26:27 +09:00
John Estropia	b7ebda4487	Use generic collection types in ListSnapshot mutators	2020-01-05 02:37:42 +09:00
John Estropia	b4489301ac	fix SPM spec	2019-12-23 11:53:46 +09:00
John Estropia	c025e5acc6	version bump	2019-12-23 10:11:26 +09:00
John Estropia	57745f36a8	Allow purging of datasource	2019-12-17 21:10:01 +09:00
John Estropia	eef1c99f11	Allow custom views to consume ListSnapshot diffable data	2019-12-17 19:45:53 +09:00
John Estropia	9a19919392	add utility to create ObjectPublisher directly from a `DynamicObject` using its own context	2019-12-02 12:21:06 +09:00
John Estropia	3e2d62fe67	missed public modifier	2019-12-02 11:53:23 +09:00
John Estropia	6f275eb63a	add "updatedItemIdentifiers" utility to ListSnapshot	2019-12-02 10:52:36 +09:00
John Estropia	b12dba4d15	optimizations	2019-11-29 20:09:43 +09:00
John Estropia	4ee1b04523	Support for fetchOffset in ListPublisher, optimize slicing logic	2019-11-18 19:52:57 +09:00
John Estropia	b1decc9853	Force fetchLimit for ListPublisher and ListSnapshot	2019-11-14 20:34:48 +09:00
John Estropia	c2e4c033ef	Merge pull request #348 from ntnmrndn/fixWarning Fix warning	2019-11-05 19:11:51 +09:00
John Estropia	e12223df85	fix casting error	2019-10-29 20:37:08 +09:00
John Estropia	468922d5ed	fix casting issues	2019-10-29 20:30:03 +09:00
John Estropia	6b9a4b480b	minor	2019-10-29 20:18:14 +09:00
Antoine Marandon	81b482e28b	Fix warning	2019-10-29 17:27:25 +09:00
John Estropia	c112a84c0a	Add debugDescription implementation for new Publisher and Snapshot types	2019-10-28 19:31:02 +09:00
John Estropia	88ab0b5e15	provide direct conversion from DynamicObject to ObjectSnapshot	2019-10-28 12:03:17 +09:00
John Estropia	717cb75720	Add utility to fetch ObjectPublishers by ObjectID	2019-10-28 11:23:12 +09:00
John Estropia	998938490c	Make ObjectPublishers even lighter by lazy-loading observers	2019-10-25 19:16:38 +09:00
John Estropia	f3beca8769	fix compiler error in testcases	2019-10-25 16:17:25 +09:00
John Estropia	4baeb6d922	Fix weak linking of SwiftUI in podspec	2019-10-25 14:35:04 +09:00
John Estropia	98d860aff6	Add unit tests for List and Object Publishers	2019-10-25 14:34:22 +09:00
John Estropia	11a9e3991c	changed ListPublisher and ObjectPublisher factory method naming to match ListMonitor and ObjectMonitor naming	2019-10-25 12:43:39 +09:00
John Estropia	f380d9dc25	ObjectSnapshot: allow dynamicMember keyPaths from superclasses	2019-10-25 12:36:13 +09:00
John Estropia	d546ff154f	Merge pull request #344 from timfraedrich/patch-1 small correction to documentation	2019-10-23 19:27:33 +09:00
John Estropia	f21597d332	Merge pull request #341 from dmatushkin/develop Fix for build on iOS with Swift Package Manager	2019-10-23 19:27:01 +09:00
John Estropia	d971c3a2ac	README bug	2019-10-22 17:24:54 +09:00
John Estropia	80166a42bb	Unify generic labeling	2019-10-22 16:16:47 +09:00
John Estropia	3d8bdf1cf3	Remove references to OSAtomic to silence deprecation warnings	2019-10-22 11:48:09 +09:00
John Estropia	1ddce5aa8d	Package.swift update	2019-10-21 22:39:54 +09:00
John Estropia	7a1600fac4	README ok for now	2019-10-21 21:34:45 +09:00
John Estropia	e4e664d8ce	README update	2019-10-21 21:24:34 +09:00
John Estropia	145edd5a7d	README update	2019-10-21 21:15:46 +09:00
John Estropia	f5fed063ee	Docs update	2019-10-20 18:17:31 +09:00
John Estropia	a267395618	WIP: README	2019-10-19 22:17:25 +09:00
John Estropia	326b897b06	WIP: docs	2019-10-19 09:34:31 +09:00
John Estropia	0b18366ab1	Renamed LiveList to ListPublisher and LiveObject to ObjectPublisher. WIP: docs	2019-10-18 19:36:27 +09:00
John Estropia	ddf599ba85	WIP: documentation	2019-10-18 08:19:55 +09:00
John Estropia	6e3e540d0a	Improve handling in LiveObject and ObjectSnapshot when objects are deleted	2019-10-17 19:27:03 +09:00
John Estropia	bd066f0cef	delete unused files	2019-10-17 16:59:00 +09:00
John Estropia	9764f33086	update demo app	2019-10-17 12:32:47 +09:00
John Estropia	0c19c878c5	LiveList refetch	2019-10-17 11:39:29 +09:00
John Estropia	1b8e517b5a	WIP: update demo app	2019-10-17 07:40:15 +09:00
John Estropia	2818a778a4	Revert ObjectMonitor to previous implementation	2019-10-16 19:20:11 +09:00
John Estropia	64a0264354	DiffableDataSource.CollectionView implementation	2019-10-16 14:01:25 +09:00
John Estropia	7932625644	Merge branch 'develop' into datasources	2019-10-16 10:16:13 +09:00
John Estropia	4619fbbec3	WIP: ObjectRepresentable	2019-10-16 08:22:03 +09:00
John Estropia	6b64eb7650	WIP: ObjectRepresentable utilities	2019-10-14 21:36:03 +09:00
John Estropia	f5a165d47d	back-portable TableView DiffableDataSource	2019-10-13 11:45:30 +09:00
John Estropia	12c58e3955	improved caching in utility methods	2019-10-12 10:02:00 +09:00
John Estropia	5af0d17de4	remov stateIDs	2019-10-12 07:20:09 +09:00
John Estropia	81dfb8e3e5	WIP: editable datasources	2019-10-11 07:47:49 +09:00
John Estropia	d5114fc4bc	WIP	2019-10-08 21:09:34 +09:00
John Estropia	693fc7fbbb	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2019-10-07 10:16:11 +09:00
John Estropia	b073b7e795	swiftUI support done for now	2019-10-06 23:37:04 +09:00
Tim Fraedrich	56d9719984	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.	2019-10-04 14:19:14 +00:00
John Estropia	953c9723a8	(WIP) SwiftUI working demo for LiveList<D>	2019-10-04 19:12:32 +09:00
John Estropia	c5a996d5ed	WIP: do not use yet	2019-10-04 08:43:04 +09:00
John Estropia	53a83d823e	Merge branch 'develop' into datasources	2019-09-22 07:39:18 +09:00
dmatushkin	6d75dcbc32	Fix for build on iOS with Swift Package Manager	2019-09-15 14:57:20 +04:00
John Estropia	0345ee9c94	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2019-09-14 01:40:37 -04:00
John Estropia	4016b5dc83	Merge pull request #331 from jagbryrmiginte/develop Fixes #328 by specifying platform requirements in Package.swift	2019-09-14 01:34:35 -04:00
John Estropia	64b5e102aa	Merge pull request #340 from pushp1989/develop Added Support for Swift 5	2019-09-14 01:33:51 -04:00
Pushpendra	8e3c44c072	Added Support for Swift 5 Upgraded Xcode build version Added missing reference of for different targets	2019-09-13 15:27:46 +05:30
John Estropia	12dc32f7e6	Merge branch 'develop' into datasources # Conflicts: # CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift # CoreStoreTests/DynamicModelTests.swift # Sources/BaseDataTransaction+Importing.swift # Sources/CoreStoreObject.swift # Sources/CustomSchemaMappingProvider.swift # Sources/DynamicObject.swift # Sources/Functions.swift # Sources/ImportableUniqueObject.swift # Sources/NSManagedObjectContext+Querying.swift	2019-08-29 17:15:45 +09:00
John Estropia	b4c38caf1e	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2019-08-29 17:03:16 +09:00
John Estropia	266b1a9913	Deprecation of `enum CoreStore`, reorganize global symbols	2019-08-29 17:03:09 +09:00
John Estropia	1740d168c8	Merge branch 'develop'	2019-08-27 14:38:16 +09:00
John Estropia	d42b397090	version bump	2019-08-27 14:38:05 +09:00
John Estropia	058cc1915b	fix optimization issues in release build	2019-08-27 14:21:33 +09:00
John Estropia	02d5bf85ae	fix ListMonitor demo for iOS 13	2019-08-20 12:42:34 +09:00
jagbryrmiginte	f0dac2454c	Bump SPM package description to 5.0 to resolve compiler error	2019-07-21 12:12:30 +02:00
jagbryrmiginte	d4deed0cf7	Specify minimum deployment target for Swift Package Manager, fixes Issue #328	2019-07-21 12:09:53 +02:00
John Estropia	79655ffde5	added ObjectSnapshot as foundation for datasources API	2019-07-10 08:11:42 +09:00
John Estropia	cf46b45e8e	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2019-07-09 22:53:33 +09:00
John Estropia	ed3d21db77	WIP: reorganization of keypath utilities (in prep for @propertyWrappers)	2019-07-09 14:50:23 +09:00
John Estropia	f16e3593c0	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2019-07-06 23:00:20 +09:00
John Estropia	67bb9340c7	provide way to check if an object has updated properties	2019-07-05 19:07:25 +09:00
John Estropia	5d49bd79f2	Merge pull request #326 from cool8jay/patch-1 Update README code style.	2019-06-29 13:19:14 +09:00
John Estropia	9f397b4337	Prevent crashing when DataStack is deallocated ahead of ListMonitor and child objects	2019-06-10 18:34:15 +09:00
cool8jay	7508d150d6	Update code style. Update code style.	2019-06-05 08:43:06 +08:00
John Estropia	239db8168d	remove artifacts from Carthage	2019-05-19 01:51:46 +09:00
John Estropia	30ab4386bf	Merge branch 'develop'	2019-04-27 17:51:12 +09:00
John Estropia	08053ccb15	change protocol inheritance from class to AnyObject (as per recent Swift recommendation)	2019-04-27 17:50:55 +09:00
John Estropia	367cfea8a7	Merge branch 'develop'	2019-04-05 08:36:30 +09:00
John Estropia	5d3b7e3dab	version bump	2019-04-05 08:36:09 +09:00
John Estropia	fe7e6e7b84	Fix wrong VersionLock printing on Swift 5 (fixes #311 )	2019-04-05 08:29:14 +09:00
John Estropia	b2dba0d6fd	update pod version and jazzy docs	2019-03-31 00:29:43 +09:00
John Estropia	6f290213fa	update README	2019-03-31 00:05:13 +09:00
John Estropia	0ab52d2f43	converted *Result types to new Swift.Result	2019-03-30 23:58:26 +09:00
John Estropia	bf8a1062e0	deleted obsoleted and deprecated API	2019-03-30 23:56:39 +09:00
John Estropia	0e254867b6	update project for Swift 5 / Xcode 10.2	2019-03-30 23:36:56 +09:00
John Estropia	0376ac6908	bump	2019-02-28 18:57:28 +09:00
John Estropia	b3421888a6	version bump	2019-02-28 18:55:32 +09:00
John Estropia	7b3f4ae0a4	fix compile error	2019-02-28 17:58:17 +09:00
John Estropia	b4e12cc922	restore NSPersistentStore.affectedStores ARC bug workaround	2019-02-28 17:57:34 +09:00
John Estropia	6c282b18af	version bump	2019-02-28 13:14:27 +09:00
John Estropia	ebbde8b7b6	minor fix in demo app	2019-02-28 13:13:01 +09:00
John Estropia	a1407e4121	Revert workaround for iOS 10 NSFetchedResultsController (#100 )	2019-02-28 13:07:47 +09:00
John Estropia	99b871b97a	add missing documentations for Where.Expression, updated playgrounds	2019-02-20 18:47:29 +09:00
John Estropia	1cd3c4fcf4	fix compile error	2019-02-12 18:18:44 +09:00
John Estropia	e09ac9ee00	add macOS playground	2019-02-12 18:05:06 +09:00
John Estropia	4b0d134acb	remove swift 5 annotation	2019-02-12 18:03:59 +09:00
John Estropia	eeec3979ee	SwiftPM support	2019-02-12 15:48:50 +09:00
John Estropia	5b365c642d	add tests for expressio evaluations	2019-02-08 18:42:19 +09:00
John Estropia	635201868a	add comparison operators for Where.Expression	2019-02-08 17:16:56 +09:00
John Estropia	db4426e6b9	Swift 5 support. WIP: Support type-safe predicate expressions	2019-02-01 18:32:22 +09:00
John Estropia	41902fee2e	fix compiler errors	2019-01-31 16:50:43 +09:00
John Estropia	9239370793	Added reference comment explaining crashes on A12 devices #291	2019-01-29 14:15:01 +09:00
John Estropia	a4d2f326a5	Improve perfomance by bypassing bridging (similar to https://github.com/JohnEstropia/CoreStore/pull/288 )	2019-01-28 20:12:18 +09:00
John Estropia	9f54ec26e2	add Where initializer that can accept another Where clause	2019-01-28 20:10:15 +09:00
John Estropia	9425cb56d7	update documentation for -[CSListMonitor refetch:] to reflect actual behavior	2019-01-28 19:04:46 +09:00
John Estropia	1de56d2776	add missing From.orderBy(_:) overloads	2019-01-25 17:30:11 +09:00
John Estropia	b3261ea930	Update README.md	2019-01-24 16:12:12 +09:00
John Estropia	88dd7aef72	updated README	2019-01-24 15:32:54 +09:00
John Estropia	2863605d84	silence deprecation internal warnings	2019-01-23 12:25:52 +09:00
John Estropia	94d9116299	pod bump	2019-01-23 10:56:10 +09:00
John Estropia	57ddbbd515	make some test cases validate specific error codes from thrown errors	2019-01-23 10:55:58 +09:00
John Estropia	78954b9d78	version bump	2019-01-22 16:41:58 +09:00
John Estropia	4eb06c9858	Merge branch 'throwables' into develop	2019-01-22 16:38:57 +09:00
John Estropia	0d634c1dcc	add missing MARKs	2019-01-22 16:38:17 +09:00