bump

version bump
fix compile error
2026-01-12 12:20:30 +01:00 · 2019-02-28 18:57:28 +09:00 · 2019-02-28 18:55:32 +09:00 · 2019-02-28 17:58:17 +09:00 · 2019-02-28 17:57:34 +09:00 · 2019-02-28 13:14:27 +09:00
605 changed files with 428165 additions and 3254 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ CoreStore.xcworkspace/xcuserdata
 .DS_Store
 DerivedData
 *.orig
+build
+Playground_macOS.playground/playground.xcworkspace/xcuserdata
--- a/.jazzy.yaml
+++ b/.jazzy.yaml
@@ -0,0 +1,15 @@
+author: John Estropia
+author_url: https://github.com/JohnEstropia
+github_url: https://github.com/JohnEstropia/CoreStore
+module: CoreStore
+readme: README.md
+include: Sources/*
+output: docs
+theme: fullwidth
+clean: true
+skip_undocumented: true
+xcodebuild_arguments:
+- -sdk
+- iphonesimulator
+- -scheme
+- CoreStore iOS
--- a/.swift-version
+++ b/.swift-version
@@ -1 +0,0 @@
-4.0
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode10
 sudo: false
 git:
  submodules: false
@@ -10,21 +10,17 @@ env:
  - LC_CTYPE=en_US.UTF-8
  - LANG=en_US.UTF-8
  matrix:
-    - DESTINATION="OS=11.0,name=iPhone 8"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.3,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.1,name=iPhone 7"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator11.0  RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                    SCHEME="CoreStore OSX"     SDK=macosx10.13          RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=4.0,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=3.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator4.0    RUN_TESTS="NO"  POD_LINT="NO"
-    - DESTINATION="OS=11.0,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"    SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator11.0 RUN_TESTS="YES" POD_LINT="NO"
+    - 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
@@ -43,8 +39,8 @@ script:
      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
      xcodebuild -workspace CoreStore.xcworkspace -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
    fi
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator11.0" -destination "OS=11.0,name=iPhone 8" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStoreDemo" -sdk "iphonesimulator11.0" -destination "OS=11.0,name=iPhone 8" -configuration Release 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 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/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,16 +1,18 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "5.0.0"
+    s.version = "6.2.1"
+    s.swift_version = "4.2"
    s.license = "MIT"
-    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
    s.homepage = "https://github.com/JohnEstropia/CoreStore"
+    s.documentation_url = "https://JohnEstropia.github.io/CoreStore"
+    s.summary = "Unleashing the real power of Core Data with the elegance and safety of Swift"
    s.author = { "John Rommel Estropia" => "rommel.estropia@gmail.com" }
    s.source = { :git => "https://github.com/JohnEstropia/CoreStore.git", :tag => s.version.to_s }

-    s.ios.deployment_target = "8.0"
-    s.osx.deployment_target = "10.10"
-    s.watchos.deployment_target = "2.0"
-    s.tvos.deployment_target = "9.0"
+    s.ios.deployment_target = "10.0"
+    s.osx.deployment_target = "10.12"
+    s.watchos.deployment_target = "3.0"
+    s.tvos.deployment_target = "10.0"

    s.source_files = "Sources", "Sources/**/*.{swift,h,m}"
    s.public_header_files = "Sources/**/*.h"
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -165,10 +165,6 @@
 		B52557881D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
 		B52557891D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
 		B525578A1D02DE8100E51965 /* FetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52557871D02DE8100E51965 /* FetchTests.swift */; };
-		B52661401CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */; };
-		B52661421CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */; };
-		B52661431CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */; };
-		B52661441CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */; };
 		B529C2041CA4A2DB007E7EBD /* CSSaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B529C2031CA4A2DB007E7EBD /* CSSaveResult.swift */; };
 		B529C2061CA4A2DB007E7EBD /* CSSaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B529C2031CA4A2DB007E7EBD /* CSSaveResult.swift */; };
 		B529C2071CA4A2DC007E7EBD /* CSSaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B529C2031CA4A2DB007E7EBD /* CSSaveResult.swift */; };
@@ -297,6 +293,10 @@
 		B546F9741C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
 		B546F9751C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
 		B546F9761C9C553300D5AC55 /* SetupResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B546F9721C9C553300D5AC55 /* SetupResult.swift */; };
+		B5474D152227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D162227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D172227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
+		B5474D182227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */; };
 		B5489F3F1CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
 		B5489F401CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
 		B5489F411CF5EEBC008B4978 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */; };
@@ -477,6 +477,12 @@
 		B5831B7B1F34ACBA00A9F647 /* Transformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B791F34ACBA00A9F647 /* Transformable.swift */; };
 		B5831B7C1F34ACBA00A9F647 /* Transformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B791F34ACBA00A9F647 /* Transformable.swift */; };
 		B5831B7D1F34ACBA00A9F647 /* Transformable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5831B791F34ACBA00A9F647 /* Transformable.swift */; };
+		B5831F4022126FEC00D8604C /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
+		B5831F4122126FEC00D8604C /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
+		B5831F4222126FED00D8604C /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
+		B5831F432212700400D8604C /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
+		B5831F442212700500D8604C /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
+		B5831F452212700500D8604C /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
 		B58B22F51C93C1BA00521925 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A53019C5C6DA005002A5 /* CoreStore.framework */; };
 		B58D0C631EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58D0C621EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift */; };
 		B58D0C641EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B58D0C621EAA0C7E003EDD87 /* NSManagedObject+DynamicModel.swift */; };
@@ -578,6 +584,8 @@
 		B5D7A5B81CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5B91CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
 		B5D7A5BA1CA3BF8F005C752B /* CSInto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7A5B51CA3BF8F005C752B /* CSInto.swift */; };
+		B5DAFB482203D9F8003FCCD0 /* Where.Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */; };
+		B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */; };
 		B5DBE2CD1C9914A900B5CEFA /* CSCoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */; };
 		B5DBE2CE1C9914A900B5CEFA /* CSCoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */; };
 		B5DBE2CF1C9914A900B5CEFA /* CSCoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */; };
@@ -659,6 +667,10 @@
 		B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
 		B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; };
 		B5E84F411AFF8CCD0064E85B /* TypeErasedClauses.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* TypeErasedClauses.swift */; };
+		B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
+		B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */; };
 		B5ECDBDF1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
 		B5ECDBE11CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
 		B5ECDBE21CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */; };
@@ -783,6 +795,7 @@
 		B5220E071D0C5F8D009BC71E /* ObjectObserverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverTests.swift; sourceTree = "<group>"; };
 		B5220E0B1D0D0D19009BC71E /* ImportTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImportTests.swift; sourceTree = "<group>"; };
 		B5220E0F1D0DA6AB009BC71E /* ListObserverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverTests.swift; sourceTree = "<group>"; };
+		B524E78721CA20AC00BEB794 /* .jazzy.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .jazzy.yaml; sourceTree = SOURCE_ROOT; };
 		B525576B1CFAF18F00E51965 /* IntoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntoTests.swift; sourceTree = "<group>"; };
 		B525576F1D02561A00E51965 /* SelectTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectTests.swift; sourceTree = "<group>"; };
 		B52557731D02791400E51965 /* WhereTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhereTests.swift; sourceTree = "<group>"; };
@@ -791,7 +804,6 @@
 		B525577F1D029D2500E51965 /* TweakTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TweakTests.swift; sourceTree = "<group>"; };
 		B52557831D02A07400E51965 /* SectionByTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionByTests.swift; sourceTree = "<group>"; };
 		B52557871D02DE8100E51965 /* FetchTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchTests.swift; sourceTree = "<group>"; };
-		B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStoreFetchRequest+CoreStore.swift"; sourceTree = "<group>"; };
 		B529C2031CA4A2DB007E7EBD /* CSSaveResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSaveResult.swift; sourceTree = "<group>"; };
 		B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -815,6 +827,7 @@
 		B546F95C1C9A12B800D5AC55 /* CSSQliteStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSQliteStore.swift; sourceTree = "<group>"; };
 		B546F9681C9AF26D00D5AC55 /* CSInMemoryStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInMemoryStore.swift; sourceTree = "<group>"; };
 		B546F9721C9C553300D5AC55 /* SetupResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetupResult.swift; sourceTree = "<group>"; };
+		B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchRequest.swift; sourceTree = "<group>"; };
 		B5489F3D1CF5EEBC008B4978 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = "<group>"; };
 		B5489F3E1CF5EEBC008B4978 /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
 		B5489F451CF5F017008B4978 /* TransactionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionTests.swift; sourceTree = "<group>"; };
@@ -855,7 +868,7 @@
 		B56923F41EB828BF007C4DC9 /* CSDynamicSchema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSDynamicSchema.swift; sourceTree = "<group>"; };
 		B56923F91EB82956007C4DC9 /* CSXcodeDataModelSchema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSXcodeDataModelSchema.swift; sourceTree = "<group>"; };
 		B56923FE1EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSUnsafeDataModelSchema.swift; sourceTree = "<group>"; };
-		B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "DataStack+Migration.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "DataStack+Migration.swift"; sourceTree = "<group>"; };
 		B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = "<group>"; };
 		B57D27BD1D0BBE8200539C58 /* BaseTestDataTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTestDataTestCase.swift; sourceTree = "<group>"; };
 		B57D27C11D0BC20100539C58 /* QueryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = "<group>"; };
@@ -872,6 +885,8 @@
 		B5A1DAC71F111BFA003CF369 /* KeyPath+Querying.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyPath+Querying.swift"; sourceTree = "<group>"; };
 		B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = "<group>"; };
 		B5A5F2651CAEC50F004AB9AF /* CSSelect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSSelect.swift; sourceTree = "<group>"; };
+		B5A80DF42212C1AB006096AA /* Playground_macOS.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground_macOS.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		B5A80DF52212C1BC006096AA /* Playground_iOS.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground_iOS.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		B5A991EB1E9DC2CE0091A2E3 /* VersionLock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VersionLock.swift; sourceTree = "<group>"; };
 		B5A9921E1EA898710091A2E3 /* UserInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfo.swift; sourceTree = "<group>"; };
 		B5AD60CD1C90141E00F2B2E8 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = SOURCE_ROOT; };
@@ -897,6 +912,8 @@
 		B5D3F6441C887C0A00C7492A /* LegacySQLiteStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacySQLiteStore.swift; sourceTree = "<group>"; };
 		B5D7A5B51CA3BF8F005C752B /* CSInto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSInto.swift; sourceTree = "<group>"; };
 		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
+		B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Where.Expression.swift; sourceTree = "<group>"; };
+		B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPathGenericBindings.swift; sourceTree = "<group>"; };
 		B5DBE2CC1C9914A900B5CEFA /* CSCoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSCoreStore.swift; sourceTree = "<group>"; };
 		B5DBE2D11C991B3E00B5CEFA /* CSDataStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSDataStack.swift; sourceTree = "<group>"; };
 		B5DBE2DA1C9939E100B5CEFA /* CoreStoreTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreStoreTests-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -950,6 +967,7 @@
 		B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Transaction.swift"; sourceTree = "<group>"; };
 		B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Querying.swift"; sourceTree = "<group>"; };
 		B5E84F401AFF8CCD0064E85B /* TypeErasedClauses.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeErasedClauses.swift; sourceTree = "<group>"; };
+		B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreStoreObject+Observing.swift"; sourceTree = "<group>"; };
 		B5ECDBDE1CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CSBaseDataTransaction+Querying.swift"; sourceTree = "<group>"; };
 		B5ECDBE41CA6BEA300C7F112 /* CSClauseTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSClauseTypes.swift; sourceTree = "<group>"; };
 		B5ECDBEB1CA6BF2000C7F112 /* CSFrom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSFrom.swift; sourceTree = "<group>"; };
@@ -1040,6 +1058,8 @@
 		2F03A52619C5C6DA005002A5 = {
 			isa = PBXGroup;
 			children = (
+				B5A80DF52212C1BC006096AA /* Playground_iOS.playground */,
+				B5A80DF42212C1AB006096AA /* Playground_macOS.playground */,
 				2F291E3119C6D4D3007AF63F /* Frameworks */,
 				2F03A53219C5C6DA005002A5 /* Sources */,
 				2F03A53C19C5C6DA005002A5 /* CoreStoreTests */,
@@ -1082,6 +1102,7 @@
 				B5BDC91A1C202269008147CD /* Cartfile */,
 				B5D2D5A91F7558CB00A4DE67 /* .cocoapods.yml */,
 				B5BDC9271C2024F2008147CD /* .travis.yml */,
+				B524E78721CA20AC00BEB794 /* .jazzy.yaml */,
 				B5AD60CD1C90141E00F2B2E8 /* Package.swift */,
 			);
 			name = "Supporting Files";
@@ -1324,6 +1345,7 @@
 				B5A1DAC71F111BFA003CF369 /* KeyPath+Querying.swift */,
 				B5D339EB1E9495E500C880DE /* CoreStoreObject+Querying.swift */,
 				B5CA2B111F81DBFE004B1936 /* DynamicKeyPath.swift */,
+				B5DAFB492203E01D003FCCD0 /* KeyPathGenericBindings.swift */,
 			);
 			name = "KeyPath Utilities";
 			sourceTree = "<group>";
@@ -1471,6 +1493,7 @@
 				B5E84F011AFF847B0064E85B /* From.swift */,
 				B5E84F031AFF847B0064E85B /* Select.swift */,
 				B5E84F051AFF847B0064E85B /* Where.swift */,
+				B5DAFB472203D9F8003FCCD0 /* Where.Expression.swift */,
 				B5E84F041AFF847B0064E85B /* OrderBy.swift */,
 				B5E84F021AFF847B0064E85B /* GroupBy.swift */,
 				B5E84F001AFF847B0064E85B /* Tweak.swift */,
@@ -1493,6 +1516,7 @@
 				B56007131B3F6C2800A9A8F9 /* SectionBy.swift */,
 				B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */,
 				B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */,
+				B5E8A71F21C1015300EF006A /* CoreStoreObject+Observing.swift */,
 				B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */,
 				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
 				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
@@ -1520,8 +1544,8 @@
 			children = (
 				B5831B6F1F34AC3400A9F647 /* AttributeProtocol.swift */,
 				B5831B741F34AC7A00A9F647 /* RelationshipProtocol.swift */,
+				B5474D142227C08700B21FEC /* CoreStoreFetchRequest.swift */,
 				B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */,
-				B526613F1CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift */,
 				B53B275E1EE3B92E00E9B352 /* CoreStoreManagedObject.swift */,
 				B533C4DA1D7D4BFA001383CB /* DispatchQueue+CoreStore.swift */,
 				B51260921E9B28F100402229 /* EntityIdentifier.swift */,
@@ -1754,7 +1778,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					2F03A52F19C5C6DA005002A5 = {
@@ -1886,6 +1910,7 @@
 				B5ECDBFF1CA80CBA00C7F112 /* CSWhere.swift in Sources */,
 				B5ECDC051CA8138100C7F112 /* CSOrderBy.swift in Sources */,
 				B5E1B5981CAA0C23007FD580 /* CSObjectObserver.swift in Sources */,
+				B5DAFB4A2203E01D003FCCD0 /* KeyPathGenericBindings.swift in Sources */,
 				B5519A5F1CA21954002BEF78 /* CSAsynchronousDataTransaction.swift in Sources */,
 				B52FD3AA1E3B3EF10001D919 /* NSManagedObject+Logging.swift in Sources */,
 				B52F74411E9B8724005F3DAC /* UnsafeDataModelSchema.swift in Sources */,
@@ -1925,11 +1950,11 @@
 				B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */,
 				B5E84F111AFF847B0064E85B /* Select.swift in Sources */,
 				B51260931E9B28F100402229 /* EntityIdentifier.swift in Sources */,
+				B5DAFB482203D9F8003FCCD0 /* Where.Expression.swift in Sources */,
 				B5FE4DA21C8481E100FA6A91 /* StorageInterface.swift in Sources */,
 				B53FB9FE1CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D21C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
 				B50392F91C478FF3009900CA /* NSManagedObject+Transaction.swift in Sources */,
-				B52661401CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */,
 				B53FBA181CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B5519A591CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
@@ -2008,6 +2033,8 @@
 				B5A991EC1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5FE4DA71C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B52F743D1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72021C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D152227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56923FF1EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAE1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5ECDBEC1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
@@ -2117,9 +2144,11 @@
 				82BA18A31C4BBD2200A0916E /* DataStack.swift in Sources */,
 				82BA18C81C4BBD5900A0916E /* MigrationChain.swift in Sources */,
 				B546F9741C9C553300D5AC55 /* SetupResult.swift in Sources */,
+				B5831F4022126FEC00D8604C /* KeyPathGenericBindings.swift in Sources */,
 				B53CA9A31EF1EF1600E0F440 /* PartialObject.swift in Sources */,
 				82BA18B11C4BBD3100A0916E /* SaveResult.swift in Sources */,
 				82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */,
+				B5831F432212700400D8604C /* Where.Expression.swift in Sources */,
 				B51260941E9B28F100402229 /* EntityIdentifier.swift in Sources */,
 				B5FE4DA81C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
 				B53FBA001CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
@@ -2127,7 +2156,6 @@
 				82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */,
 				B53FBA1A1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */,
-				B52661421CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */,
 				B5519A5A1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
 				B5ECDBE11CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
 				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
@@ -2204,6 +2232,8 @@
 				B5A991ED1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEE1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743E1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72121C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D162227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924001EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CAF1FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2313,9 +2343,11 @@
 				B52DD1961BE1F92500949AFE /* DataStack.swift in Sources */,
 				B5ECDBFD1CA804FD00C7F112 /* NSManagedObjectContext+ObjectiveC.swift in Sources */,
 				B52DD1BD1BE1F94300949AFE /* NSManagedObject+Convenience.swift in Sources */,
+				B5831F4222126FED00D8604C /* KeyPathGenericBindings.swift in Sources */,
 				B53CA9A51EF1EF1600E0F440 /* PartialObject.swift in Sources */,
 				B52DD1AD1BE1F93900949AFE /* Where.swift in Sources */,
 				B53FBA1C1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
+				B5831F452212700500D8604C /* Where.Expression.swift in Sources */,
 				B51260961E9B28F100402229 /* EntityIdentifier.swift in Sources */,
 				B5ECDBE31CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
 				B5ECDC031CA80CBA00C7F112 /* CSWhere.swift in Sources */,
@@ -2324,7 +2356,6 @@
 				B52DD1C71BE1F94600949AFE /* NSManagedObjectContext+Querying.swift in Sources */,
 				B52DD1C81BE1F94600949AFE /* NSManagedObjectContext+Setup.swift in Sources */,
 				B52DD1C31BE1F94600949AFE /* NotificationObserver.swift in Sources */,
-				B52661441CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */,
 				B52DD1A81BE1F93200949AFE /* DataStack+Querying.swift in Sources */,
 				B5220E221D130818009BC71E /* CSSectionBy.swift in Sources */,
 				B52DD1BC1BE1F94000949AFE /* MigrationResult.swift in Sources */,
@@ -2400,6 +2431,8 @@
 				B5A991EF1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5220E201D130813009BC71E /* CSObjectMonitor.swift in Sources */,
 				B52F74401E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72321C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D182227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924021EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB11FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B5220E171D1306DF009BC71E /* UnsafeDataTransaction+Observing.swift in Sources */,
@@ -2509,14 +2542,15 @@
 				B56321A81BD65219006C9394 /* NSManagedObject+Convenience.swift in Sources */,
 				B546F9751C9C553300D5AC55 /* SetupResult.swift in Sources */,
 				B56321981BD65216006C9394 /* Where.swift in Sources */,
+				B5831F4122126FEC00D8604C /* KeyPathGenericBindings.swift in Sources */,
 				B53CA9A41EF1EF1600E0F440 /* PartialObject.swift in Sources */,
 				B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */,
 				B5FE4DA91C84FB4400FA6A91 /* InMemoryStore.swift in Sources */,
+				B5831F442212700500D8604C /* Where.Expression.swift in Sources */,
 				B51260951E9B28F100402229 /* EntityIdentifier.swift in Sources */,
 				B53FBA011CAB2D2F00F0D40A /* CSMigrationResult.swift in Sources */,
 				B5DBE2D41C991B3E00B5CEFA /* CSDataStack.swift in Sources */,
 				B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */,
-				B52661431CADD585007B85D9 /* CoreStoreFetchRequest+CoreStore.swift in Sources */,
 				B53FBA1B1CAB63E200F0D40A /* NSManagedObject+ObjectiveC.swift in Sources */,
 				B5519A5B1CA2008C002BEF78 /* CSBaseDataTransaction.swift in Sources */,
 				B5ECDBE21CA6BB2B00C7F112 /* CSBaseDataTransaction+Querying.swift in Sources */,
@@ -2596,6 +2630,8 @@
 				B5A991EE1E9DC2CE0091A2E3 /* VersionLock.swift in Sources */,
 				B5ECDBEF1CA6BF2000C7F112 /* CSFrom.swift in Sources */,
 				B52F743F1E9B8724005F3DAC /* DynamicSchema.swift in Sources */,
+				B5E8A72221C1015300EF006A /* CoreStoreObject+Observing.swift in Sources */,
+				B5474D172227C08700B21FEC /* CoreStoreFetchRequest.swift in Sources */,
 				B56924011EB82976007C4DC9 /* CSUnsafeDataModelSchema.swift in Sources */,
 				B5215CB01FA4812500139E3A /* SectionMonitorBuilder.swift in Sources */,
 				B56321B41BD6521C006C9394 /* NSManagedObjectContext+Transaction.swift in Sources */,
@@ -2648,6 +2684,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -2655,6 +2692,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2683,8 +2721,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
@@ -2693,12 +2731,12 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
 		};
@@ -2715,6 +2753,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -2722,6 +2761,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2745,21 +2785,21 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStore;
 				PRODUCT_NAME = CoreStore;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 2.0;
+				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
 		};
@@ -2778,7 +2818,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -2797,7 +2836,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -2818,7 +2856,6 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -2834,7 +2871,6 @@
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -2855,7 +2891,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
@@ -2877,7 +2912,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
@@ -2896,7 +2930,6 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Debug;
@@ -2915,7 +2948,6 @@
 				SDKROOT = appletvos;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
@@ -2940,7 +2972,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -2965,7 +2996,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -2986,7 +3016,6 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -3007,7 +3036,6 @@
 				SDKROOT = macosx;
 				SWIFT_OBJC_BRIDGING_HEADER = "CoreStoreTests/CoreStoreTests-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -3029,7 +3057,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Debug;
@@ -3053,7 +3080,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Release;
--- a/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/CoreStore.xcodeproj/project.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/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -56,7 +55,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- 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 = "0900"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -40,7 +40,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -75,7 +74,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -91,6 +89,12 @@
            ReferencedContainer = "container:CoreStore.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.SQLDebug 2"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
--- 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 = "0900"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@@ -56,7 +55,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- 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 = "0900"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -37,7 +36,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/CoreStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/CoreStore.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/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/CoreStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?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/>
+</plist>
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -265,7 +265,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
@@ -375,12 +375,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -408,7 +410,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -430,12 +432,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -456,7 +460,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Off;
@@ -470,7 +474,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -484,7 +487,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.corestore.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
--- 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 = "0900"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -46,7 +45,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
+++ b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -20,7 +20,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
        
-        application.statusBarStyle = .lightContent
        return true
    }
 }
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10112" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10083"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -12,10 +14,10 @@
            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright © 2018 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="440" height="21"/>
                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="CoreStoreIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q8C-V6-gXH">
@@ -24,11 +26,11 @@
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                    <rect key="frame" x="20" y="273" width="440" height="57.5"/>
                    <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
-                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="textColor" red="0.90744441747665405" green="0.9265514612197876" blue="0.93116652965545654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
            </subviews>
-            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
            <constraints>
                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Ni8-QF-XHB">
+<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>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <customFonts key="customFonts">
@@ -78,14 +75,14 @@
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8b8-lM-Krq">
-                                            <rect key="frame" x="15" y="13" width="28.5" height="19"/>
+                                            <rect key="frame" x="16" y="13" width="28.5" height="19"/>
                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
                                            <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="Subtitle" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hR1-Zb-BOk">
-                                            <rect key="frame" x="308" y="13" width="52" height="19"/>
+                                            <rect key="frame" x="307" y="13" width="52" height="19"/>
                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -136,7 +133,7 @@
                                            <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">
-                                                    <rect key="frame" x="295" y="8" width="72" height="27.5"/>
+                                                    <rect key="frame" x="288" y="11" width="72" height="22"/>
                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                                    <inset key="contentEdgeInsets" minX="7" minY="0.0" maxX="7" maxY="0.0"/>
                                                    <state key="normal" title="mutate!"/>
@@ -145,7 +142,7 @@
                                                    </connections>
                                                </button>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VZk-6K-4ut">
-                                                    <rect key="frame" x="15" y="8" width="270" height="27.5"/>
+                                                    <rect key="frame" x="22" y="11" width="256" height="22"/>
                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
                                                    <color key="textColor" red="0.15542715787887573" green="0.2203737199306488" blue="0.2959403395652771" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
@@ -275,18 +272,18 @@
                                        <rect key="frame" x="0.0" y="35" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="82" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="263.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -302,18 +299,18 @@
                                        <rect key="frame" x="0.0" y="85" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="56" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="260.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -329,18 +326,18 @@
                                        <rect key="frame" x="0.0" y="135" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="100.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="179" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -356,18 +353,18 @@
                                        <rect key="frame" x="0.0" y="185" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="101.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="168.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -383,18 +380,18 @@
                                        <rect key="frame" x="0.0" y="235" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="61" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="159" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -410,18 +407,18 @@
                                        <rect key="frame" x="0.0" y="285" 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="342" height="49.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="49.5"/>
                                            <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="15" y="6" width="78.5" height="24"/>
+                                                    <rect key="frame" x="16" y="6" 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="15" y="30" width="179.5" height="13.5"/>
+                                                    <rect key="frame" x="16" y="30" 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"/>
@@ -460,7 +457,7 @@
                        <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="89.5" width="343" height="50"/>
+                                <rect key="frame" x="16" y="69.5" width="343" height="70"/>
                                <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"/>
@@ -512,7 +509,7 @@
                                </connections>
                            </slider>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4O-tf-dgt">
-                                <rect key="frame" x="16" y="69" width="343" height="20.5"/>
+                                <rect key="frame" x="16" y="49" width="343" height="20.5"/>
                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <nil key="highlightedColor"/>
@@ -623,7 +620,7 @@
                    <tabBarItem key="tabBarItem" title="Demo" image="second" id="3iQ-I2-4LW"/>
                    <toolbarItems/>
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="00L-5k-Eno">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" 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"/>
@@ -653,18 +650,18 @@
                                <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="G3X-70-BCD" id="aT8-nz-i5l">
-                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uQX-PI-UWF">
-                                            <rect key="frame" x="8" y="8" width="27" height="27"/>
+                                            <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="uQX-PI-UWF" secondAttribute="height" multiplier="1:1" id="9qA-iN-Neb"/>
                                            </constraints>
                                        </view>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HJC-5w-lIN">
-                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <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"/>
@@ -713,18 +710,18 @@
                                <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="342" height="43.5"/>
+                                    <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="8" y="8" width="27" height="27"/>
+                                            <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="45" y="8" width="34.5" height="27"/>
+                                            <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"/>
@@ -767,7 +764,7 @@
                    <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="320" height="44"/>
+                        <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"/>
@@ -794,11 +791,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="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <mapView verifyAmbiguity="ignoreSizes" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="558"/>
+                            <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"/>
                                <connections>
                                    <outlet property="delegate" destination="jPl-fH-NlD" id="Sjn-YC-haS"/>
                                </connections>
@@ -888,7 +885,7 @@
                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
                    <toolbarItems/>
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="wJo-mp-1pS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <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"/>
@@ -1008,14 +1005,14 @@
                                    <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="15" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="11" 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="15" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="35" 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"/>
@@ -1054,14 +1051,14 @@
                                    <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="15" y="11" width="48.5" height="24"/>
+                                            <rect key="frame" x="16" y="11" 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="15" y="35" width="31" height="13.5"/>
+                                            <rect key="frame" x="16" y="35" 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"/>
--- a/Demo/FetchingAndQueryingDemoViewController.swift
+++ b/Demo/FetchingAndQueryingDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -25,7 +25,7 @@ private struct Static {
        _ = try? dataStack.perform(
            synchronous: { (transaction) in
                
-                transaction.deleteAll(From<TimeZone>())
+                try transaction.deleteAll(From<TimeZone>())
                
                for name in NSTimeZone.knownTimeZoneNames {
                    
@@ -164,17 +164,17 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
            title: "All Time Zones",
            fetch: { () -> [TimeZone] in
                
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                    From<TimeZone>()
                        .orderBy(.ascending(\.name))
-                )!
+                )
            }
        ),
        (
            title: "Time Zones in Asia",
            fetch: { () -> [TimeZone] in
                
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                    From<TimeZone>()
                        .where(
                            format: "%K BEGINSWITH[c] %@",
@@ -182,14 +182,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            "Asia"
                        )
                        .orderBy(.ascending(\.secondsFromGMT))
-                )!
+                )
            }
        ),
        (
            title: "Time Zones in America and Europe",
            fetch: { () -> [TimeZone] in
                
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                    From<TimeZone>()
                        .where(
                            format: "%K BEGINSWITH[c] %@ OR %K BEGINSWITH[c] %@",
@@ -199,14 +199,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            "Europe"
                        )
                        .orderBy(.ascending(\.secondsFromGMT))
-                )!
+                )
            }
        ),
        (
            title: "All Time Zones Except America",
            fetch: { () -> [TimeZone] in
                
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                    From<TimeZone>()
                        .where(
                            format: "%K BEGINSWITH[c] %@",
@@ -214,18 +214,18 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            "America"
                        )
                        .orderBy(.ascending(\.secondsFromGMT))
-                    )!
+                    )
            }
        ),
        (
            title: "Time Zones with Summer Time",
            fetch: { () -> [TimeZone] in
                
-                return Static.timeZonesStack.fetchAll(
+                return try! Static.timeZonesStack.fetchAll(
                    From<TimeZone>()
                        .where(\.hasDaylightSavingTime == true)
                        .orderBy(.ascending(\.name))
-                )!
+                )
            }
        )
    ]
@@ -235,28 +235,28 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
            title: "Number of Time Zones",
            query: { () -> Any in
                
-                return Static.timeZonesStack.queryValue(
+                return try! Static.timeZonesStack.queryValue(
                    From<TimeZone>()
                        .select(NSNumber.self, .count(\.name))
-                )! as Any
+                )!
            }
        ),
        (
            title: "Abbreviation For Tokyo's Time Zone",
            query: { () -> Any in
                
-                return Static.timeZonesStack.queryValue(
+                return try! Static.timeZonesStack.queryValue(
                    From<TimeZone>()
                        .select(String.self, .attribute(\.abbreviation))
                        .where(format: "%K ENDSWITH[c] %@", #keyPath(TimeZone.name), "Tokyo")
-                )! as Any
+                )!
            }
        ),
        (
            title: "All Abbreviations",
            query: { () -> Any in
                
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                    From<TimeZone>()
                        .select(
                            NSDictionary.self,
@@ -264,14 +264,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            .attribute(\.abbreviation)
                        )
                        .orderBy(.ascending(\.name))
-                )!
+                )
            }
        ),
        (
            title: "Number of Countries per Time Zone",
            query: { () -> Any in
                
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                    From<TimeZone>()
                        .select(
                            NSDictionary.self,
@@ -283,14 +283,14 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            .ascending(\.secondsFromGMT),
                            .ascending(\.name)
                        )
-                )!
+                )
            }
        ),
        (
            title: "Number of Countries with Summer Time",
            query: { () -> Any in
                
-                return Static.timeZonesStack.queryAttributes(
+                return try! Static.timeZonesStack.queryAttributes(
                    From<TimeZone>()
                        .select(
                            NSDictionary.self,
@@ -302,7 +302,7 @@ class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSo
                            .descending(\.hasDaylightSavingTime),
                            .ascending(\.name)
                        )
-                )!
+                )
            }
        )
    ]
--- a/Demo/FetchingResultsViewController.swift
+++ b/Demo/FetchingResultsViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/Demo/QueryingResultsViewController.swift
+++ b/Demo/QueryingResultsViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/CoreStoreDemo/CoreStoreDemo/Fetching
+++ b/CoreStoreDemo/CoreStoreDemo/Fetching
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/15.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/CoreStoreDemo/CoreStoreDemo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
    {
      "idiom" : "iphone",
      "size" : "29x29",
@@ -32,6 +42,36 @@
      "filename" : "Icon-60@3x-1.png",
      "scale" : "3x"
    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
    {
      "size" : "76x76",
      "idiom" : "ipad",
@@ -44,6 +84,21 @@
      "filename" : "Icon-76@2x.png",
      "scale" : "2x"
    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "car",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
    {
      "size" : "60x60",
      "idiom" : "car",
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/CoreStoreDemo/CoreStoreDemo/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.3</string>
+	<string>6.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/Demo/ListObserverDemoViewController.swift
+++ b/Demo/ListObserverDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -122,6 +122,11 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
                target: self,
                action: #selector(self.addBarButtonItemTouched(_:))
            ),
+            UIBarButtonItem(
+                barButtonSystemItem: .refresh,
+                target: self,
+                action: #selector(self.shuffleBarButtonItemTouched(_:))
+            ),
            filterBarButton
        ]
        self.filterBarButton = filterBarButton
@@ -155,7 +160,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver

    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
        
-        return ColorsDemo.palettes.numberOfObjectsInSection(section)
+        return ColorsDemo.palettes.numberOfObjects(in: section)
    }
    
    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -203,7 +208,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
    
    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
        
-        return ColorsDemo.palettes.sectionInfoAtIndex(section).name
+        return ColorsDemo.palettes.sectionInfo(at: section).name
    }
    
    
@@ -268,7 +273,6 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
        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)
@@ -284,7 +288,7 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
        ColorsDemo.stack.perform(
            asynchronous: { (transaction) in
                
-                transaction.deleteAll(From<Palette>())
+                try transaction.deleteAll(From<Palette>())
            },
            completion: { _ in }
        )
@@ -306,9 +310,29 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
            completion: { _ in }
        )
    }
+
+    @IBAction private dynamic func shuffleBarButtonItemTouched(_ sender: AnyObject?) {
+
+        self.setTable(enabled: false)
+        ColorsDemo.stack.perform(
+            asynchronous: { (transaction) in
+
+                for palette in try transaction.fetchAll(From<Palette>()) {
+
+                    palette.hue .= Palette.randomHue()
+                    palette.colorName .= nil
+                }
+            },
+            completion: { _ in
+
+                self.setTable(enabled: true)
+            }
+        )
+    }
    
    private func setTable(enabled: Bool) {
-        
+
+        tableView.isUserInteractionEnabled = enabled
        UIView.animate(
            withDuration: 0.2,
            delay: 0,
@@ -318,7 +342,6 @@ class ListObserverDemoViewController: UITableViewController, ListSectionObserver
                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
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -50,7 +50,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
    
    required init?(coder aDecoder: NSCoder) {
        
-        if let palette = 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)
        }
@@ -64,7 +64,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                }
            )
            
-            let palette = 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)
        }
        
@@ -184,15 +184,15 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
        
        self.hsbLabel?.text = palette.colorText
        
-        if changedKeys == nil || changedKeys?.contains(Palette.keyPath{ $0.hue }) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.hue)) == true {
            
            self.hueSlider?.value = Float(palette.hue.value)
        }
-        if changedKeys == nil || changedKeys?.contains(Palette.keyPath{ $0.saturation }) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.saturation)) == true {
            
            self.saturationSlider?.value = palette.saturation.value
        }
-        if changedKeys == nil || changedKeys?.contains(Palette.keyPath{ $0.brightness }) == true {
+        if changedKeys == nil || changedKeys?.contains(String(keyPath: \Palette.brightness)) == true {
            
            self.brightnessSlider?.value = palette.brightness.value
        }
--- a/Demo/ObserversViewController.swift
+++ b/Demo/ObserversViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
@@ -25,6 +25,11 @@ final class Palette: CoreStoreObject {
        isTransient: true,
        customGetter: Palette.getColorName
    )
+
+    static func randomHue() -> Int {
+
+        return Int(arc4random_uniform(360))
+    }
    
    private static func getColorName(_ partialObject: PartialObject<Palette>) -> String? {
        
@@ -71,7 +76,7 @@ extension Palette {
    
    func setInitialValues(in transaction: BaseDataTransaction) {
        
-        self.hue .= Int(arc4random_uniform(360))
+        self.hue .= Palette.randomHue()
        self.saturation .= Float(1.0)
        self.brightness .= Float(arc4random_uniform(70) + 30) / 100.0
    }
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/Demo/CustomLoggerViewController.swift
+++ b/Demo/CustomLoggerViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/05.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -16,11 +16,6 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
    
    // MARK: NSObject
    
-    deinit {
-        
-        CoreStore.logger = DefaultLogger()
-    }
-    
    let dataStack = DataStack()
    
    // MARK: UIViewController
@@ -30,13 +25,14 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
        super.viewDidLoad()
        
        try! self.dataStack.addStorageAndWait(SQLiteStore(fileName: "emptyStore.sqlite"))
-        CoreStore.logger = self
    }
    
    override func viewDidAppear(_ animated: Bool) {
        
        super.viewDidAppear(animated)
-        
+
+        CoreStore.logger = self
+
        let alert = UIAlertController(
            title: "Logger Demo",
            message: "This demo shows how to plug-in any logging framework to CoreStore.\n\nThe view controller implements CoreStoreLogger and appends all logs to the text view.",
@@ -46,6 +42,13 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
        self.present(alert, animated: true, completion: nil)
    }

+    override func viewDidDisappear(_ animated: Bool) {
+
+        super.viewDidDisappear(animated)
+
+        CoreStore.logger = DefaultLogger()
+    }
+
    
    // MARK: CoreStoreLogger
    
@@ -113,7 +116,7 @@ class CustomLoggerViewController: UIViewController, CoreStoreLogger {
        case 2?:
            DispatchQueue.global(qos: .background).async {
                
-                _ = self.dataStack.fetchOne(From<Place>())
+                _ = try! self.dataStack.fetchOne(From<Place>())
            }
            
        default:
--- a/Demo/MigrationsDemoViewController.swift
+++ b/Demo/MigrationsDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -79,7 +79,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
    func listMonitorDidChange(_ monitor: ListMonitor<NSManagedObject>) {
        
        if self.lastSelectedIndexPath == nil,
-            let numberOfObjectsInSection = self.listMonitor?.numberOfObjectsInSection(0),
+            let numberOfObjectsInSection = self.listMonitor?.numberOfObjects(in: 0),
            numberOfObjectsInSection > 0 {
            
            self.tableView?.reloadData()
@@ -100,7 +100,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
    
    @objc dynamic func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
        
-        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
+        return self.listMonitor?.numberOfObjects(in: 0) ?? 0
    }
    
    @objc dynamic func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -286,7 +286,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
                
                self.set(dataStack: dataStack, model: model, scrollToSelection: true)
                
-                let count = dataStack.queryValue(
+                let count = try! dataStack.queryValue(
                    From<NSManagedObject>(model.entityType)
                        .select(Int.self, .count(#keyPath(OrganismV1.dna))))!
                if count > 0 {
@@ -378,7 +378,7 @@ class MigrationsDemoViewController: UIViewController, ListObserver, UITableViewD
            
            if self.lastSelectedIndexPath == nil  {
                
-                if listMonitor.numberOfObjectsInSection(0) > 0 {
+                if listMonitor.numberOfObjects(in: 0) > 0 {
                    
                    self.setSelectedIndexPath(IndexPath(row: 0, section: 0), scrollToSelection: true)
                }
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/07/12.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/Demo/OrganismV2ToV3MigrationPolicy.swift
+++ b/Demo/OrganismV2ToV3MigrationPolicy.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import CoreData
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/06.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/Demo/StackSetupDemoViewController.swift
+++ b/Demo/StackSetupDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -36,7 +36,7 @@ private struct Static {
        _ = try? dataStack.perform(
            synchronous: { (transaction) in
                
-                transaction.deleteAll(From<UserAccount>())
+                try transaction.deleteAll(From<UserAccount>())
                
                let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
                account1.accountType = "Facebook"
@@ -74,7 +74,7 @@ private struct Static {
        _ = try? dataStack.perform(
            synchronous: { (transaction) in
                
-                transaction.deleteAll(From<UserAccount>())
+                try transaction.deleteAll(From<UserAccount>())
                
                let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
                account1.accountType = "Twitter"
@@ -99,8 +99,8 @@ private struct Static {
 class StackSetupDemoViewController: UITableViewController {
    
    let accounts = [
-        Static.facebookStack.fetchAll(From(UserAccount.self)) ?? [],
-        Static.twitterStack.fetchAll(From(UserAccount.self)) ?? []
+        try! Static.facebookStack.fetchAll(From<UserAccount>()),
+        try! Static.twitterStack.fetchAll(From<UserAccount>())
    ]
    
    
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/Transactions
+++ b/CoreStoreDemo/CoreStoreDemo/Transactions
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/Demo/TransactionsDemoViewController.swift
+++ b/Demo/TransactionsDemoViewController.swift
@@ -3,10 +3,11 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2018 John Rommel Estropia. All rights reserved.
 //

 import UIKit
+import Contacts
 import CoreLocation
 import MapKit
 import AddressBookUI
@@ -25,7 +26,7 @@ private struct Static {
            )
        )
        
-        var place = CoreStore.fetchOne(From<Place>())
+        var place = try! CoreStore.fetchOne(From<Place>())
        if place == nil {
            
            _ = try? CoreStore.perform(
@@ -35,7 +36,7 @@ private struct Static {
                    place.setInitialValues()
                }
            )
-            place = CoreStore.fetchOne(From<Place>())
+            place = try! CoreStore.fetchOne(From<Place>())
        }
        
        return CoreStore.monitorObject(place!)
@@ -203,11 +204,23 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
            CLLocation(latitude: place.latitude, longitude: place.longitude),
            completionHandler: { [weak self] (placemarks, error) -> Void in
                
-                if let placemark = placemarks?.first, let addressDictionary = placemark.addressDictionary {
+                if let placemark = placemarks?.first, let dictionary = placemark.addressDictionary {
                    
                    let place = transaction.edit(Static.placeController.object)
                    place?.title = placemark.name
-                    place?.subtitle = ABCreateStringWithAddressDictionary(addressDictionary, true)
+                    place?.subtitle = CNPostalAddressFormatter.string(
+                        from: autoreleasepool {
+                            
+                            let address = CNMutablePostalAddress()
+                            (dictionary["Street"] as? String).flatMap({ address.street = $0 })
+                            (dictionary["State"] as? String).flatMap({ address.state = $0 })
+                            (dictionary["City"] as? String).flatMap({ address.city = $0 })
+                            (dictionary["Country"] as? String).flatMap({ address.country = $0 })
+                            (dictionary["ZIP"] as? String).flatMap({ address.postalCode = $0 })
+                            return address
+                        },
+                        style: .mailingAddress
+                    )
                    transaction.commit { (_) -> Void in }
                }
                
--- a/CoreStoreTests/BaseTests/BaseTestCase.swift
+++ b/CoreStoreTests/BaseTests/BaseTestCase.swift
@@ -2,7 +2,7 @@
 //  BaseTestCase.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -36,8 +36,7 @@ class BaseTestCase: XCTestCase {
    // MARK: Internal
    
    @nonobjc
-    @discardableResult
-    func prepareStack<T>(configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) -> T) -> T {
+    func prepareStack(configurations: [ModelConfiguration] = [nil], _ closure: (_ dataStack: DataStack) throws -> Void) {
        
        let stack = DataStack(
            xcodeModelName: "Model",
@@ -57,16 +56,16 @@ class BaseTestCase: XCTestCase {
                    )
                )
            }
+            try closure(stack)
        }
        catch let error as NSError {
            
            XCTFail(error.coreStoreDumpString)
        }
-        return closure(stack)
    }
    
    @nonobjc
-    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () -> T) -> T {
+    func expectLogger<T>(_ expectations: [TestLogger.Expectation], closure: () throws -> T) rethrows -> T {
        
        CoreStore.logger = TestLogger(self.prepareLoggerExpectations(expectations))
        defer {
@@ -74,7 +73,7 @@ class BaseTestCase: XCTestCase {
            self.checkExpectationsImmediately()
            CoreStore.logger = TestLogger([:])
        }
-        return closure()
+        return try closure()
    }
    
    @nonobjc
@@ -82,6 +81,33 @@ class BaseTestCase: XCTestCase {
        
        CoreStore.logger = TestLogger(expectations)
    }
+
+    @nonobjc
+    func expectError<T>(code: CoreStoreErrorCode, closure: () throws -> T) {
+
+        CoreStore.logger = TestLogger(self.prepareLoggerExpectations([.logError]))
+        defer {
+
+            self.checkExpectationsImmediately()
+            CoreStore.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 \(cs_typeName(CoreStoreError.self)): \((error as NSError).coreStoreDumpString)")
+        }
+    }
    
    @nonobjc
    func prepareLoggerExpectations(_ expectations: [TestLogger.Expectation]) -> [TestLogger.Expectation: XCTestExpectation] {
--- a/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
+++ b/CoreStoreTests/BaseTests/BaseTestDataTestCase.swift
@@ -2,7 +2,7 @@
 //  BaseTestDataTestCase.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  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
--- a/CoreStoreTests/BridgingTests.h
+++ b/CoreStoreTests/BridgingTests.h
@@ -2,7 +2,7 @@
 //  BridgingTests.h
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/CoreStoreTests/BridgingTests.m
+++ b/CoreStoreTests/BridgingTests.m
@@ -2,7 +2,7 @@
 //  BridgingTests.m
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -193,7 +193,17 @@
    XCTAssertEqualObjects([[sqliteStorage class] storeType], [CSSQLiteStore storeType]);
    XCTAssertEqualObjects([[sqliteStorage class] storeType], NSSQLiteStoreType);
    XCTAssertNil(sqliteStorage.configuration);
-    XCTAssertEqualObjects(sqliteStorage.storeOptions, @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" } });
+    NSDictionary *storeOptions;
+    if (@available(iOS 11.0, macOS 10.13, tvOS 11.0, *)) {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" },
+                          NSBinaryStoreInsecureDecodingCompatibilityOption: @YES };
+    }
+    else {
+        
+        storeOptions = @{ NSSQLitePragmasOption: @{ @"journal_mode": @"WAL" }};
+    }
+    XCTAssertEqualObjects(sqliteStorage.storeOptions, storeOptions);
    XCTAssertNil(sqliteError);
 }

--- a/CoreStoreTests/ConvenienceTests.swift
+++ b/CoreStoreTests/ConvenienceTests.swift
@@ -2,7 +2,7 @@
 //  ConvenienceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreStore

 // MARK: - ConvenienceTests

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ConvenienceTests: BaseTestCase {
    
    @objc
--- a/CoreStoreTests/DynamicModelTests.swift
+++ b/CoreStoreTests/DynamicModelTests.swift
@@ -2,7 +2,7 @@
 //  DynamicModelTests.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  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
@@ -28,11 +28,12 @@ import XCTest
@testable
 import CoreStore

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

 class Animal: CoreStoreObject {
@@ -70,8 +71,13 @@ class Person: CoreStoreObject {
        customGetter: Person.getDisplayName(_:),
        affectedByKeyPaths: Person.keyPathsAffectingDisplayName()
    )
+
+    let spouse = Relationship.ToOne<Person>("spouse")
    
    let pets = Relationship.ToManyUnordered<Animal>("pets", inverse: { $0.master })
+
+    private let _spouse = Relationship.ToOne<Person>("_spouseInverse", inverse: { $0.spouse })
+
    
    private static func setTitle(_ partialObject: PartialObject<Person>, _ newValue: String) {
        
@@ -126,7 +132,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                versionLock: [
                    "Animal": [0x1b59d511019695cf, 0xdeb97e86c5eff179, 0x1cfd80745646cb3, 0x4ff99416175b5b9a],
                    "Dog": [0xe3f0afeb109b283a, 0x29998d292938eb61, 0x6aab788333cfc2a3, 0x492ff1d295910ea7],
-                    "Person": [0x66d8bbfd8b21561f, 0xcecec69ecae3570f, 0xc4b73d71256214ef, 0x89b99bfe3e013e8b]
+                    "Person": [0x2831cf046084d96d, 0xbe19b13ace54641, 0x635a082728b0f6f0, 0x3d4ef2dd4b74a87c]
                ]
            )
        )
@@ -134,7 +140,7 @@ class DynamicModelTests: BaseTestDataTestCase {
            
            let k1 = String(keyPath: \Animal.species)
            XCTAssertEqual(k1, "species")
-            
+
            let k2 = String(keyPath: \Dog.species)
            XCTAssertEqual(k2, "species")
            
@@ -143,6 +149,9 @@ class DynamicModelTests: BaseTestDataTestCase {
            
            let updateDone = self.expectation(description: "update-done")
            let fetchDone = self.expectation(description: "fetch-done")
+            let willSetPriorObserverDone = self.expectation(description: "willSet-observe-prior-done")
+            let willSetNotPriorObserverDone = self.expectation(description: "willSet-observe-notPrior-done")
+            let didSetObserverDone = self.expectation(description: "didSet-observe-done")
            stack.perform(
                asynchronous: { (transaction) in
                    
@@ -160,9 +169,42 @@ class DynamicModelTests: BaseTestDataTestCase {
                    XCTAssertEqual(dog.species.value, "Swift")
                    XCTAssertEqual(dog.nickname.value, nil)
                    XCTAssertEqual(dog.age.value, 1)
+
+                    let didSetObserver = dog.species.observe(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")
+                        didSetObserverDone.fulfill()
+                    }
+                    let willSetObserver = dog.species.observe(options: [.new, .old, .prior]) { (object, change) in
+
+                        XCTAssertEqual(object, dog)
+                        XCTAssertEqual(change.kind, .setting)
+                        XCTAssertEqual(change.oldValue, "Swift")
+
+                        if change.isPrior {
+
+                            XCTAssertNil(change.newValue)
+                            XCTAssertEqual(object.species.value, "Swift")
+                            willSetPriorObserverDone.fulfill()
+                        }
+                        else {
+
+                            XCTAssertEqual(change.newValue, "Dog")
+                            XCTAssertEqual(object.species.value, "Dog")
+                            willSetNotPriorObserverDone.fulfill()
+                        }
+                    }
                    
                    dog.species .= "Dog"
                    XCTAssertEqual(dog.species.value, "Dog")
+
+                    didSetObserver.invalidate()
+                    willSetObserver.invalidate()
                    
                    dog.nickname .= "Spot"
                    XCTAssertEqual(dog.nickname.value, "Spot")
@@ -171,7 +213,7 @@ class DynamicModelTests: BaseTestDataTestCase {
                    XCTAssertTrue(person.pets.value.isEmpty)
                    
                    XCTAssertEqual(
-                        type(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
+                        cs_dynamicType(of: person.rawObject!).keyPathsForValuesAffectingValue(forKey: "displayName"),
                        ["title", "name"]
                    )
                    
@@ -212,51 +254,54 @@ class DynamicModelTests: BaseTestDataTestCase {
                    let p1 = Where<Animal>({ $0.species == "Sparrow" })
                    XCTAssertEqual(p1.predicate, NSPredicate(format: "%K == %@", "species", "Sparrow"))
                    
-                    let bird = transaction.fetchOne(From<Animal>(), p1)
+                    let bird = try transaction.fetchOne(From<Animal>(), p1)
                    XCTAssertNotNil(bird)
                    XCTAssertEqual(bird!.species.value, "Sparrow")
                    
                    let p2 = Where<Dog>({ $0.nickname == "Spot" })
                    XCTAssertEqual(p2.predicate, NSPredicate(format: "%K == %@", "nickname", "Spot"))
                    
-                    let dog = 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")
                    
-                    let person = transaction.fetchOne(From<Person>())
+                    let person = try transaction.fetchOne(From<Person>())
                    XCTAssertNotNil(person)
                    XCTAssertEqual(person!.pets.value.first, dog)
                    
                    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)))
+                    XCTAssertEqual(totalAge, 1)
                    
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>()
-                            .where(\Animal.species == "Dog" && \.age == 10)
+                            .where(\Animal.species == "Dog" && \Dog.age == 10)
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>()
-                            .where(\.age == 10 && \Animal.species == "Dog")
+                            .where(\Dog.age == 10 && \Animal.species == "Dog")
                            .orderBy(.ascending({ $0.species }))
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>(),
                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>(),
                        Where<Dog>({ $0.species == "Dog" && $0.age == 10 })
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>(),
                        Where<Dog>({ $0.age == 10 && $0.species == "Dog" })
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>(),
                        Where<Dog>({ $0.age > 10 && $0.age <= 15 })
                    )
-                    _ = transaction.fetchAll(
+                    _ = try transaction.fetchAll(
                        From<Dog>(),
                        (\Dog.age > 10 && \Dog.age <= 15)
                    )
--- a/CoreStoreTests/ErrorTests.swift
+++ b/CoreStoreTests/ErrorTests.swift
@@ -2,7 +2,7 @@
 //  ErrorTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/CoreStoreTests/FetchTests.swift
+++ b/CoreStoreTests/FetchTests.swift
--- a/CoreStoreTests/FromTests.swift
+++ b/CoreStoreTests/FromTests.swift
@@ -2,7 +2,7 @@
 //  FromTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -74,33 +74,31 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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)
            }
        }
@@ -115,102 +113,98 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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)
            }
        }
@@ -225,99 +219,96 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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)
            }
        }
@@ -332,96 +323,94 @@ final class FromTests: BaseTestCase {
                
                let from = From<TestEntity1>()
                
-                let request = CoreStoreFetchRequest()
-                let storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 storesFound = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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 = self.expectLogger([.logWarning]) {
+                let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+                self.expectError(code: .persistentStoreNotFound) {
                    
-                    from.applyToFetchRequest(request, context: dataStack.mainContext)
+                    try from.applyToFetchRequest(request, context: dataStack.mainContext)
                }
-                XCTAssertFalse(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 = from.applyToFetchRequest(request, context: dataStack.mainContext)
-                XCTAssertTrue(storesFound)
+                let request = 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
@@ -2,7 +2,7 @@
 //  GroupByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -68,8 +68,8 @@ final class GroupByTests: BaseTestCase {
            
            let groupBy = GroupBy<NSManagedObject>(#keyPath(TestEntity1.testString))
            
-            let request = CoreStoreFetchRequest()
-            _ = From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
+            let request = CoreStoreFetchRequest<NSFetchRequestResult>()
+            try From<TestEntity1>().applyToFetchRequest(request, context: dataStack.mainContext)
            groupBy.applyToFetchRequest(request)
            
            XCTAssertNotNil(request.propertiesToGroupBy)
--- a/CoreStoreTests/ImportTests.swift
+++ b/CoreStoreTests/ImportTests.swift
@@ -2,7 +2,7 @@
 //  ImportTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -95,7 +95,7 @@ class ImportTests: BaseTestDataTestCase {
                            ]
                        )
                        XCTAssertNil(object)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
                    }
                )
            }
@@ -103,7 +103,7 @@ class ImportTests: BaseTestDataTestCase {
                
                XCTFail()
            }
-            XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
        }
    }
    
@@ -137,9 +137,9 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestInsertError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                            
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                            XCTAssertNotNil(object)
                            XCTAssertNil(object?.testEntityID)
                            XCTAssertNil(object?.testBoolean)
@@ -182,7 +182,7 @@ class ImportTests: BaseTestDataTestCase {
                            ]
                        )
                        XCTAssertNotNil(object)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                        XCTAssertNil(object?.testEntityID)
                        XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
                        XCTAssertEqual(object?.testNumber, NSNumber(value: 1))
@@ -202,7 +202,7 @@ class ImportTests: BaseTestDataTestCase {
                                #keyPath(TestEntity1.testDate): self.dateFormatter.date(from: "2000-01-02T00:00:00Z")!
                            ]
                        )
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                        XCTAssertNil(object?.testEntityID)
                        XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
                        XCTAssertEqual(object?.testNumber, NSNumber(value: 2))
@@ -254,7 +254,7 @@ class ImportTests: BaseTestDataTestCase {
                            sourceArray: sourceArray
                        )
                        XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                        
                        let object = objects[0]
                        let dictionary = sourceArray[1]
@@ -316,9 +316,9 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestInsertError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                            
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                            XCTAssertNotNil(object)
                            XCTAssertNil(object?.testEntityID)
                            XCTAssertNil(object?.testBoolean)
@@ -372,7 +372,7 @@ class ImportTests: BaseTestDataTestCase {
                            sourceArray: sourceArray
                        )
                        XCTAssertEqual(objects.count, sourceArray.count)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 2)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 2)
                        
                        for i in 0 ..< sourceArray.count {
                            
@@ -424,7 +424,7 @@ class ImportTests: BaseTestDataTestCase {
                                ]
                            )
                            XCTAssertNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                        }
                        do {
                            
@@ -442,20 +442,19 @@ class ImportTests: BaseTestDataTestCase {
                                ]
                            )
                            XCTAssertNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                            
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                            
-                            let existingObject = existingObjects?[0]
-                            XCTAssertEqual(existingObject?.testEntityID, NSNumber(value: 105))
-                            XCTAssertEqual(existingObject?.testBoolean, NSNumber(value: true))
-                            XCTAssertEqual(existingObject?.testNumber, NSNumber(value: 5))
-                            XCTAssertEqual(existingObject?.testDecimal, NSDecimalNumber(string: "5"))
-                            XCTAssertEqual(existingObject?.testString, "nil:TestEntity1:5")
-                            XCTAssertEqual(existingObject?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(existingObject?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
+                            let existingObject = existingObjects[0]
+                            XCTAssertEqual(existingObject.testEntityID, NSNumber(value: 105))
+                            XCTAssertEqual(existingObject.testBoolean, NSNumber(value: true))
+                            XCTAssertEqual(existingObject.testNumber, NSNumber(value: 5))
+                            XCTAssertEqual(existingObject.testDecimal, NSDecimalNumber(string: "5"))
+                            XCTAssertEqual(existingObject.testString, "nil:TestEntity1:5")
+                            XCTAssertEqual(existingObject.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(existingObject.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                        }
                    }
                )
@@ -504,7 +503,7 @@ class ImportTests: BaseTestDataTestCase {
                        )
                        
                        XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                        
                        let object = objects[0]
                        let dictionary = sourceArray[1]
@@ -618,9 +617,9 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestInsertError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                            
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
                            XCTAssertNotNil(object)
                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                            XCTAssertNil(object?.testBoolean)
@@ -657,21 +656,19 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestUpdateError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                            
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                            
-                            let existingObject = existingObjects?[0]
-                            XCTAssertNotNil(existingObject)
-                            XCTAssertEqual(existingObject?.testEntityID, NSNumber(value: 105))
-                            XCTAssertEqual(existingObject?.testBoolean, NSNumber(value: true))
-                            XCTAssertEqual(existingObject?.testNumber, NSNumber(value: 5))
-                            XCTAssertEqual(existingObject?.testDecimal, NSDecimalNumber(string: "5"))
-                            XCTAssertEqual(existingObject?.testString, "nil:TestEntity1:5")
-                            XCTAssertEqual(existingObject?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
-                            XCTAssertEqual(existingObject?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
+                            let existingObject = existingObjects[0]
+                            XCTAssertEqual(existingObject.testEntityID, NSNumber(value: 105))
+                            XCTAssertEqual(existingObject.testBoolean, NSNumber(value: true))
+                            XCTAssertEqual(existingObject.testNumber, NSNumber(value: 5))
+                            XCTAssertEqual(existingObject.testDecimal, NSDecimalNumber(string: "5"))
+                            XCTAssertEqual(existingObject.testString, "nil:TestEntity1:5")
+                            XCTAssertEqual(existingObject.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
+                            XCTAssertEqual(existingObject.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                        }
                        self.checkExpectationsImmediately()
                    }
@@ -710,7 +707,7 @@ class ImportTests: BaseTestDataTestCase {
                                ]
                            )
                            XCTAssertNotNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                            
                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                            XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -735,7 +732,7 @@ class ImportTests: BaseTestDataTestCase {
                                    ]
                            )
                            XCTAssertNotNil(object)
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                            
                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                            XCTAssertEqual(object?.testBoolean, NSNumber(value: false))
@@ -745,11 +742,10 @@ class ImportTests: BaseTestDataTestCase {
                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:7" as NSString).data(using: String.Encoding.utf8.rawValue)!)
                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-07T00:00:00Z")!)
                            
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            XCTAssertEqual(existingObjects.count, 1)
                            
-                            let existingObject = existingObjects?[0]
+                            let existingObject = existingObjects[0]
                            XCTAssertEqual(existingObject, object)
                        }
                    }
@@ -799,7 +795,7 @@ class ImportTests: BaseTestDataTestCase {
                            sourceArray: sourceArray
                        )
                        XCTAssertEqual(objects.count, 1)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                        
                        let object = objects[0]
                        let dictionary = sourceArray[1]
@@ -864,10 +860,10 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestIDError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                            
-                            XCTAssertNil(transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106)))
-                            XCTAssertNil(transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 107)))
+                            XCTAssertNil(try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106)))
+                            XCTAssertNil(try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 107)))
                        }
                        transaction.unsafeContext().reset()
                        self.checkExpectationsImmediately()
@@ -910,7 +906,7 @@ class ImportTests: BaseTestDataTestCase {
                            
                            errorExpectation.fulfill()
                            
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 106))
                            XCTAssertNotNil(object)
                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 106))
                            XCTAssertNil(object?.testBoolean)
@@ -951,9 +947,9 @@ class ImportTests: BaseTestDataTestCase {
                        catch _ as TestUpdateError {
                            
                            errorExpectation.fulfill()
-                            XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 5)
+                            XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 5)
                            
-                            let object = transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            let object = try transaction.fetchOne(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
                            XCTAssertNotNil(object)
                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 105))
                            XCTAssertEqual(object?.testBoolean, NSNumber(value: true))
@@ -963,11 +959,10 @@ class ImportTests: BaseTestDataTestCase {
                            XCTAssertEqual(object?.testData, ("nil:TestEntity1:5" as NSString).data(using: String.Encoding.utf8.rawValue)!)
                            XCTAssertEqual(object?.testDate, self.dateFormatter.date(from: "2000-01-05T00:00:00Z")!)
                            
-                            let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                            XCTAssertNotNil(existingObjects)
-                            XCTAssertEqual(existingObjects?.count, 1)
+                            let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                            XCTAssertEqual(existingObjects.count, 1)
                            
-                            let existingObject = existingObjects?[0]
+                            let existingObject = existingObjects[0]
                            XCTAssertEqual(existingObject, object)
                        }
                        transaction.context.reset()
@@ -1018,7 +1013,7 @@ class ImportTests: BaseTestDataTestCase {
                            sourceArray: sourceArray
                        )
                        XCTAssertEqual(objects.count, sourceArray.count)
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 6)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 6)
                        for i in 0 ..< sourceArray.count {
                            
                            let object = objects[i]
@@ -1032,11 +1027,10 @@ class ImportTests: BaseTestDataTestCase {
                            XCTAssertEqual(object.testData, dictionary[(#keyPath(TestEntity1.testData))] as? Data)
                            XCTAssertEqual(object.testDate, dictionary[(#keyPath(TestEntity1.testDate))] as? Date)
                        }
-                        let existingObjects = transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
-                        XCTAssertNotNil(existingObjects)
-                        XCTAssertEqual(existingObjects?.count, 1)
+                        let existingObjects = try transaction.fetchAll(From<TestEntity1>(), Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 105))
+                        XCTAssertEqual(existingObjects.count, 1)
                        
-                        let existingObject = existingObjects?[0]
+                        let existingObject = existingObjects[0]
                        XCTAssertEqual(existingObject, objects[0])
                    }
                )
--- a/CoreStoreTests/Info.plist
+++ b/CoreStoreTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>6.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStoreTests/IntoTests.swift
+++ b/CoreStoreTests/IntoTests.swift
@@ -2,7 +2,7 @@
 //  IntoTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/CoreStoreTests/ListObserverTests.swift
+++ b/CoreStoreTests/ListObserverTests.swift
@@ -2,7 +2,7 @@
 //  ListObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -31,7 +31,7 @@ import CoreStore

 // MARK: - ListObserverTests

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ListObserverTests: BaseTestDataTestCase {
    
    @objc
@@ -76,7 +76,7 @@ class ListObserverTests: BaseTestDataTestCase {
                    XCTAssertEqual(
                        ((note.userInfo as NSDictionary?) ?? [:]),
                        [
-                            "sectionInfo": monitor.sectionInfoAtIndex(0),
+                            "sectionInfo": monitor.sectionInfo(at: 0),
                            "sectionIndex": 0
                        ] as NSDictionary
                    )
@@ -178,9 +178,9 @@ class ListObserverTests: BaseTestDataTestCase {
            XCTAssertTrue(monitor.hasSections())
            XCTAssertEqual(monitor.numberOfSections(), 2)
            XCTAssertTrue(monitor.hasObjects())
-            XCTAssertTrue(monitor.hasObjectsInSection(0))
-            XCTAssertEqual(monitor.numberOfObjectsInSection(0), 2)
-            XCTAssertEqual(monitor.numberOfObjectsInSection(1), 3)
+            XCTAssertTrue(monitor.hasObjects(in: 0))
+            XCTAssertEqual(monitor.numberOfObjects(in: 0), 2)
+            XCTAssertEqual(monitor.numberOfObjects(in: 1), 3)
            
            var events = 0
            
@@ -268,7 +268,7 @@ class ListObserverTests: BaseTestDataTestCase {
            stack.perform(
                asynchronous: { (transaction) -> Bool in
                    
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                        From<TestEntity1>(),
                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) {
                        
@@ -282,7 +282,7 @@ class ListObserverTests: BaseTestDataTestCase {
                        
                        XCTFail()
                    }
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                        From<TestEntity1>(),
                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
                        
@@ -394,7 +394,7 @@ class ListObserverTests: BaseTestDataTestCase {
            stack.perform(
                asynchronous: { (transaction) -> Bool in
                    
-                    if let object = transaction.fetchOne(
+                    if let object = try transaction.fetchOne(
                        From<TestEntity1>(),
                        Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 102)) {
                        
@@ -526,7 +526,7 @@ class ListObserverTests: BaseTestDataTestCase {
            stack.perform(
                asynchronous: { (transaction) -> Bool in
                    
-                    let count = transaction.deleteAll(
+                    let count = try transaction.deleteAll(
                        From<TestEntity1>(),
                        Where<TestEntity1>(#keyPath(TestEntity1.testBoolean), isEqualTo: false)
                    )
@@ -551,7 +551,7 @@ class ListObserverTests: BaseTestDataTestCase {

 // MARK: TestListObserver

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class TestListObserver: ListSectionObserver {
    
    // MARK: ListObserver
--- a/CoreStoreTests/MigrationChainTests.swift
+++ b/CoreStoreTests/MigrationChainTests.swift
@@ -2,7 +2,7 @@
 //  MigrationChainTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- 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
@@ -2,7 +2,7 @@
 //  ObjectObserverTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -31,7 +31,7 @@ import CoreStore

 // MARK: - ObjectObserverTests

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class ObjectObserverTests: BaseTestDataTestCase {
    
    @objc
@@ -41,7 +41,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
            
            self.prepareTestDataForStack(stack)
            
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                From<TestEntity1>(),
                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                    
@@ -138,7 +138,7 @@ class ObjectObserverTests: BaseTestDataTestCase {
            
            self.prepareTestDataForStack(stack)
            
-            guard let object = stack.fetchOne(
+            guard let object = try stack.fetchOne(
                From<TestEntity1>(),
                Where<TestEntity1>(#keyPath(TestEntity1.testEntityID), isEqualTo: 101)) else {
                    
@@ -203,7 +203,7 @@ class ObjectObserverTests: BaseTestDataTestCase {

 // MARK: TestObjectObserver

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 class TestObjectObserver: ObjectObserver {
    
    typealias ObjectEntityType = TestEntity1
--- a/CoreStoreTests/OrderByTests.swift
+++ b/CoreStoreTests/OrderByTests.swift
@@ -2,7 +2,7 @@
 //  OrderByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -179,7 +179,7 @@ final class OrderByTests: XCTestCase {
    dynamic func test_ThatOrderByClauses_ApplyToFetchRequestsCorrectly() {
        
        let orderBy = OrderBy<NSManagedObject>(.ascending("key"))
-        let request = CoreStoreFetchRequest()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
        orderBy.applyToFetchRequest(request)
        XCTAssertNotNil(request.sortDescriptors)
        XCTAssertEqual(request.sortDescriptors ?? [], orderBy.sortDescriptors)
--- a/CoreStoreTests/QueryTests.swift
+++ b/CoreStoreTests/QueryTests.swift
@@ -2,7 +2,7 @@
 //  QueryTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -47,7 +47,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(#keyPath(TestEntity1.testBoolean)),
                    queryClauses
@@ -57,7 +57,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -67,7 +67,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -77,7 +77,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -87,7 +87,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -97,7 +97,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -107,7 +107,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -117,7 +117,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -127,7 +127,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(#keyPath(TestEntity1.testNumber)),
                    queryClauses
@@ -137,7 +137,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(#keyPath(TestEntity1.testDecimal)),
                    queryClauses
@@ -147,7 +147,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(#keyPath(TestEntity1.testString)),
                    queryClauses
@@ -157,7 +157,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(#keyPath(TestEntity1.testString)),
                    queryClauses
@@ -167,7 +167,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(#keyPath(TestEntity1.testData)),
                    queryClauses
@@ -177,7 +177,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(#keyPath(TestEntity1.testData)),
                    queryClauses
@@ -187,7 +187,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(#keyPath(TestEntity1.testDate)),
                    queryClauses
@@ -197,7 +197,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(#keyPath(TestEntity1.testDate)),
                    queryClauses
@@ -207,7 +207,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(#keyPath(TestEntity1.testDate)),
                    queryClauses
@@ -232,7 +232,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.average(#keyPath(TestEntity1.testBoolean))),
                    queryClauses
@@ -242,7 +242,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -252,7 +252,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -262,7 +262,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -272,7 +272,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -282,7 +282,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -292,7 +292,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -302,7 +302,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -312,7 +312,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.average(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -322,7 +322,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.average(#keyPath(TestEntity1.testDecimal))),
                    queryClauses
@@ -332,7 +332,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.average(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -341,7 +341,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.average(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -350,7 +350,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.average(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -359,7 +359,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.average(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -368,7 +368,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.average(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -377,7 +377,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.average(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -386,7 +386,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(#keyPath(TestEntity1.testEntityID)),
                    queryClauses
@@ -410,7 +410,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.count(#keyPath(TestEntity1.testBoolean))),
                    queryClauses
@@ -420,7 +420,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -430,7 +430,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -440,7 +440,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -450,7 +450,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -460,7 +460,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -470,7 +470,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -480,7 +480,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -490,7 +490,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.count(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -500,7 +500,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.count(#keyPath(TestEntity1.testDecimal))),
                    queryClauses
@@ -509,7 +509,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.count(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -518,7 +518,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.count(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -527,7 +527,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.count(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -536,7 +536,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.count(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -545,7 +545,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.count(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -554,7 +554,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.count(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -563,7 +563,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(.count(#keyPath(TestEntity1.testEntityID))),
                    queryClauses
@@ -587,7 +587,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.maximum(#keyPath(TestEntity1.testBoolean))),
                    queryClauses
@@ -597,7 +597,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -607,7 +607,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -617,7 +617,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -627,7 +627,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -637,7 +637,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -647,7 +647,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -657,7 +657,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -667,7 +667,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.maximum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -677,7 +677,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.maximum(#keyPath(TestEntity1.testDecimal))),
                    queryClauses
@@ -687,7 +687,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.maximum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -697,7 +697,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.maximum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -707,7 +707,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.maximum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -717,7 +717,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.maximum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -727,7 +727,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.maximum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -737,7 +737,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.maximum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -747,7 +747,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(.maximum(#keyPath(TestEntity1.testEntityID))),
                    queryClauses
@@ -771,7 +771,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.minimum(#keyPath(TestEntity1.testBoolean))),
                    queryClauses
@@ -781,7 +781,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -791,7 +791,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -801,7 +801,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -811,7 +811,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -821,7 +821,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -831,7 +831,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -841,7 +841,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -851,7 +851,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.minimum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -861,7 +861,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.minimum(#keyPath(TestEntity1.testDecimal))),
                    queryClauses
@@ -871,7 +871,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.minimum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -881,7 +881,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.minimum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -891,7 +891,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.minimum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -901,7 +901,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.minimum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -911,7 +911,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.minimum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -921,7 +921,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.minimum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -931,7 +931,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(.minimum(#keyPath(TestEntity1.testEntityID))),
                    queryClauses
@@ -955,7 +955,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.sum(#keyPath(TestEntity1.testBoolean))),
                    queryClauses
@@ -965,7 +965,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -975,7 +975,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -985,7 +985,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -995,7 +995,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -1005,7 +1005,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -1015,7 +1015,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -1025,7 +1025,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -1035,7 +1035,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.sum(#keyPath(TestEntity1.testNumber))),
                    queryClauses
@@ -1045,7 +1045,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.sum(#keyPath(TestEntity1.testDecimal))),
                    queryClauses
@@ -1055,7 +1055,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.sum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -1064,7 +1064,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.sum(#keyPath(TestEntity1.testString))),
                    queryClauses
@@ -1073,7 +1073,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.sum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -1082,7 +1082,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.sum(#keyPath(TestEntity1.testData))),
                    queryClauses
@@ -1091,7 +1091,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.sum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -1100,7 +1100,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.sum(#keyPath(TestEntity1.testDate))),
                    queryClauses
@@ -1109,7 +1109,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(.sum(#keyPath(TestEntity1.testEntityID))),
                    queryClauses
@@ -1133,7 +1133,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Bool>(.objectID()),
                    queryClauses
@@ -1142,7 +1142,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int8>(.objectID()),
                    queryClauses
@@ -1151,7 +1151,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int16>(.objectID()),
                    queryClauses
@@ -1160,7 +1160,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int32>(.objectID()),
                    queryClauses
@@ -1169,7 +1169,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int64>(.objectID()),
                    queryClauses
@@ -1178,7 +1178,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Int>(.objectID()),
                    queryClauses
@@ -1187,7 +1187,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Double>(.objectID()),
                    queryClauses
@@ -1196,7 +1196,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Float>(.objectID()),
                    queryClauses
@@ -1205,7 +1205,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSNumber>(.objectID()),
                    queryClauses
@@ -1214,7 +1214,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDecimalNumber>(.objectID()),
                    queryClauses
@@ -1223,7 +1223,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, String>(.objectID()),
                    queryClauses
@@ -1232,7 +1232,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSString>(.objectID()),
                    queryClauses
@@ -1241,7 +1241,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Data>(.objectID()),
                    queryClauses
@@ -1250,7 +1250,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSData>(.objectID()),
                    queryClauses
@@ -1259,7 +1259,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, Date>(.objectID()),
                    queryClauses
@@ -1268,7 +1268,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSDate>(.objectID()),
                    queryClauses
@@ -1277,7 +1277,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let value = stack.queryValue(
+                let value = try stack.queryValue(
                    from,
                    Select<TestEntity1, NSManagedObjectID>(.objectID()),
                    queryClauses
@@ -1302,7 +1302,7 @@ class QueryTests: BaseTestDataTestCase {
            ]
            do {
                
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                    from,
                    Select<TestEntity1, NSDictionary>(
                        #keyPath(TestEntity1.testBoolean),
@@ -1353,7 +1353,7 @@ class QueryTests: BaseTestDataTestCase {
            let queryClauses: [QueryClause] = []
            do {
                
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                    from,
                    Select<TestEntity1, NSDictionary>(
                        .sum(#keyPath(TestEntity1.testBoolean)),
@@ -1380,7 +1380,7 @@ class QueryTests: BaseTestDataTestCase {
            }
            do {
                
-                let values = stack.queryAttributes(
+                let values = try stack.queryAttributes(
                    from,
                    Select(
                        .sum(#keyPath(TestEntity1.testBoolean), as: "testSum"),
--- a/CoreStoreTests/SectionByTests.swift
+++ b/CoreStoreTests/SectionByTests.swift
@@ -2,7 +2,7 @@
 //  SectionByTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -31,7 +31,7 @@ import CoreStore

 //MARK: - SectionByTests

-@available(OSX 10.12, *)
+@available(macOS 10.12, *)
 final class SectionByTests: XCTestCase {
    
    @objc
--- a/CoreStoreTests/SelectTests.swift
+++ b/CoreStoreTests/SelectTests.swift
@@ -2,7 +2,7 @@
 //  SelectTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/CoreStoreTests/SetupTests.swift
+++ b/CoreStoreTests/SetupTests.swift
@@ -2,7 +2,7 @@
 //  SetupTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -330,7 +330,14 @@ class SetupTests: BaseTestDataTestCase {
                    xcodeModelName: "Model",
                    bundle: Bundle(for: type(of: self))
                )
-                try! stack.addStorageAndWait(sqliteStore)
+                try! stack.addStorageAndWait(
+                    SQLiteStore.legacy(
+                        fileName: sqliteStore.fileURL.lastPathComponent,
+                        configuration: sqliteStore.configuration,
+                        migrationMappingProviders: sqliteStore.migrationMappingProviders,
+                        localStorageOptions: .recreateStoreOnModelMismatch
+                    )
+                )
                self.prepareTestDataForStack(stack)
            }
            XCTAssertTrue(fileManager.fileExists(atPath: sqliteStore.fileURL.path))
--- a/CoreStoreTests/StorageInterfaceTests.swift
+++ b/CoreStoreTests/StorageInterfaceTests.swift
@@ -2,7 +2,7 @@
 //  StorageInterfaceTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -83,7 +83,21 @@ final class StorageInterfaceTests: XCTestCase {
        let store = SQLiteStore()
        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
        XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
        
        XCTAssertEqual(store.fileURL, SQLiteStore.defaultFileURL)
        XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -93,8 +107,8 @@ final class StorageInterfaceTests: XCTestCase {
    @objc
    dynamic func test_ThatFileURLSQLiteStores_ConfigureCorrectly() {
        
-        let fileURL = NSURL(fileURLWithPath: NSTemporaryDirectory())
-            .appendingPathComponent(NSUUID().uuidString, isDirectory: false)!
+        let fileURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent(UUID().uuidString, isDirectory: false)
            .appendingPathExtension("db")
        let mappingProvider = XcodeSchemaMappingProvider(
            from: "V1", to: "V2",
@@ -109,7 +123,21 @@ final class StorageInterfaceTests: XCTestCase {
        )
        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
        XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
        
        XCTAssertEqual(store.fileURL, fileURL)
        XCTAssertEqual(store.migrationMappingProviders as! [XcodeSchemaMappingProvider], [mappingProvider])
@@ -132,7 +160,21 @@ final class StorageInterfaceTests: XCTestCase {
        )
        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
        XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
        
        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.defaultRootDirectory)
        XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
@@ -167,7 +209,21 @@ final class StorageInterfaceTests: XCTestCase {
        let store = SQLiteStore.legacy()
        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
        XCTAssertNil(store.configuration)
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
        
        XCTAssertEqual(store.fileURL, SQLiteStore.legacyDefaultFileURL)
        XCTAssertTrue(store.migrationMappingProviders.isEmpty)
@@ -190,7 +246,21 @@ final class StorageInterfaceTests: XCTestCase {
        )
        XCTAssertEqual(type(of: store).storeType, NSSQLiteStoreType)
        XCTAssertEqual(store.configuration, "config1")
-        XCTAssertEqual(store.storeOptions as NSDictionary?, [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary)
+        if #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"],
+                 NSBinaryStoreInsecureDecodingCompatibilityOption: true] as NSDictionary
+            )
+        }
+        else {
+            
+            XCTAssertEqual(
+                store.storeOptions as NSDictionary?,
+                [NSSQLitePragmasOption: ["journal_mode": "WAL"]] as NSDictionary
+            )
+        }
        
        XCTAssertEqual(store.fileURL.deletingLastPathComponent(), SQLiteStore.legacyDefaultRootDirectory)
        XCTAssertEqual(store.fileURL.lastPathComponent, fileName)
--- a/CoreStoreTests/TestEntities/TestEntity1.swift
+++ b/CoreStoreTests/TestEntities/TestEntity1.swift
@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  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
@@ -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
@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  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
@@ -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
@@ -2,7 +2,7 @@
 //  TransactionTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -69,9 +69,9 @@ final class TransactionTests: BaseTestCase {
                self.checkExpectationsImmediately()
                XCTAssertTrue(hasChanges)
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
                XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
@@ -84,14 +84,14 @@ final class TransactionTests: BaseTestCase {
            do {
                
                let updateExpectation = self.expectation(description: "update")
-                let hasChanges: Bool = try! stack.perform(
+                let hasChanges: Bool = try stack.perform(
                    synchronous: { (transaction) in
                        
                        defer {
                            
                            updateExpectation.fulfill()
                        }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            // TODO: convert fetch methods to throwing methods
                            XCTFail() 
                            try transaction.cancel()
@@ -107,9 +107,9 @@ final class TransactionTests: BaseTestCase {
                self.checkExpectationsImmediately()
                XCTAssertTrue(hasChanges)
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                XCTAssertEqual(object?.testString, "string1_edit")
@@ -128,7 +128,7 @@ final class TransactionTests: BaseTestCase {
                                
                                deleteExpectation.fulfill()
                            }
-                            let object = transaction.fetchOne(From<TestEntity1>())
+                            let object = try transaction.fetchOne(From<TestEntity1>())
                            transaction.delete(object)
                            return transaction.hasChanges
                        }
@@ -141,9 +141,9 @@ final class TransactionTests: BaseTestCase {
                }
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNil(object)
            }
        }
@@ -184,10 +184,10 @@ final class TransactionTests: BaseTestCase {
                }
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                
-                let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                XCTAssertEqual(object?.testString, "string1")
@@ -206,7 +206,7 @@ final class TransactionTests: BaseTestCase {
                                
                                updateExpectation.fulfill()
                            }
-                            guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                            guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                                
                                XCTFail()
                                try transaction.cancel()
@@ -226,10 +226,10 @@ final class TransactionTests: BaseTestCase {
                }
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                
-                let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                XCTAssertEqual(object?.testString, "string1_edit")
@@ -248,7 +248,7 @@ final class TransactionTests: BaseTestCase {
                                
                                deleteExpectation.fulfill()
                            }
-                            let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                            let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                            transaction.delete(object)
                            
                            return transaction.hasChanges
@@ -262,8 +262,8 @@ final class TransactionTests: BaseTestCase {
                }
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
            }
        }
    }
@@ -294,17 +294,17 @@ final class TransactionTests: BaseTestCase {
                )
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNil(object)
            }
            let testDate = Date()
            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 {
@@ -329,7 +326,7 @@ final class TransactionTests: BaseTestCase {
                            
                            updateDiscardExpectation.fulfill()
                        }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            
                            XCTFail()
                            try transaction.cancel()
@@ -343,9 +340,9 @@ final class TransactionTests: BaseTestCase {
                )
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                XCTAssertEqual(object?.testString, "string1")
@@ -362,7 +359,7 @@ final class TransactionTests: BaseTestCase {
                            
                            deleteDiscardExpectation.fulfill()
                        }
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            
                            XCTFail()
                            try transaction.cancel()
@@ -374,9 +371,9 @@ final class TransactionTests: BaseTestCase {
                )
                self.checkExpectationsImmediately()
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                
-                let object = stack.fetchOne(From<TestEntity1>())
+                let object = try stack.fetchOne(From<TestEntity1>())
                XCTAssertNotNil(object)
                XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                XCTAssertEqual(object?.testString, "string1")
@@ -387,7 +384,7 @@ final class TransactionTests: BaseTestCase {
    }
    
    
-    @available(OSX 10.12, *)
+    @available(macOS 10.12, *)
    @objc
    dynamic func test_ThatSynchronousTransactions_CanCommitWithoutWaitingForMerges() {
        
@@ -520,19 +517,26 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
-                        XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
-                        
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        createExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
+                            XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
+
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            createExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -546,7 +550,7 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Bool in
                        
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            
                            XCTFail()
                            try transaction.cancel()
@@ -560,16 +564,23 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1_edit")
-                        XCTAssertEqual(object?.testNumber, 200)
-                        XCTAssertEqual(object?.testDate, Date.distantFuture)
-                        updateExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1_edit")
+                            XCTAssertEqual(object?.testNumber, 200)
+                            XCTAssertEqual(object?.testDate, Date.distantFuture)
+                            updateExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -583,7 +594,7 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Bool in
                        
-                        let object = transaction.fetchOne(From<TestEntity1>())
+                        let object = try transaction.fetchOne(From<TestEntity1>())
                        transaction.delete(object)
                        
                        return transaction.hasChanges
@@ -591,12 +602,19 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNil(object)
-                        deleteExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNil(object)
+                            deleteExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -631,17 +649,24 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>("Config1"))
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        createExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>("Config1"))
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            createExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -655,7 +680,7 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Bool in
                        
-                        guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                            
                            XCTFail()
                            try transaction.cancel()
@@ -669,17 +694,24 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>("Config1"))
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1_edit")
-                        XCTAssertEqual(object?.testNumber, 200)
-                        XCTAssertEqual(object?.testDate, Date.distantFuture)
-                        updateExpectation.fulfill()
+
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
+
+                            let object = try stack.fetchOne(From<TestEntity1>("Config1"))
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1_edit")
+                            XCTAssertEqual(object?.testNumber, 200)
+                            XCTAssertEqual(object?.testDate, Date.distantFuture)
+                            updateExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -693,7 +725,7 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Bool in
                        
-                        let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                        let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                        transaction.delete(object)
                        
                        return transaction.hasChanges
@@ -701,11 +733,21 @@ final class TransactionTests: BaseTestCase {
                    success: { (hasChanges) in
                        
                        XCTAssertTrue(hasChanges)
-                        
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
-                        
-                        deleteExpectation.fulfill()
+
+                        do {
+
+                            let configCount = try stack.fetchCount(From<TestEntity1>("Config1"))
+                            XCTAssertEqual(configCount, 0)
+
+                            let defaultCount = try stack.fetchCount(From<TestEntity1>(nil))
+                            XCTAssertEqual(defaultCount, 0)
+
+                            deleteExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    },
                    failure: { _ in
                        
@@ -754,8 +796,8 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Bool in
                        
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
-                        XCTAssertNil(transaction.fetchOne(From<TestEntity1>()))
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
+                        XCTAssertNil(try transaction.fetchOne(From<TestEntity1>()))
                        
                        let object = transaction.create(Into<TestEntity1>())
                        object.testEntityID = NSNumber(value: 1)
@@ -782,7 +824,7 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Void in
                        
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            
                            XCTFail()
                            return
@@ -811,9 +853,9 @@ final class TransactionTests: BaseTestCase {
                stack.perform(
                    asynchronous: { (transaction) -> Void in
                        
-                        XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
+                        XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
                        
-                        guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                        guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                            
                            XCTFail()
                            try transaction.cancel()
@@ -835,15 +877,22 @@ final class TransactionTests: BaseTestCase {
                    failure: { (error) in
                        
                        XCTAssertEqual(error, CoreStoreError.userCancelled)
-                        XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                        
-                        let object = stack.fetchOne(From<TestEntity1>())
-                        XCTAssertNotNil(object)
-                        XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
-                        XCTAssertEqual(object?.testString, "string1")
-                        XCTAssertEqual(object?.testNumber, 100)
-                        XCTAssertEqual(object?.testDate, testDate)
-                        deleteDiscardExpectation.fulfill()
+                        do {
+
+                            XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+
+                            let object = try stack.fetchOne(From<TestEntity1>())
+                            XCTAssertNotNil(object)
+                            XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
+                            XCTAssertEqual(object?.testString, "string1")
+                            XCTAssertEqual(object?.testNumber, 100)
+                            XCTAssertEqual(object?.testDate, testDate)
+                            deleteDiscardExpectation.fulfill()
+                        }
+                        catch {
+
+                            XCTFail()
+                        }
                    }
                )
            }
@@ -878,9 +927,9 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                    
-                    let object = stack.fetchOne(From<TestEntity1>())
+                    let object = try stack.fetchOne(From<TestEntity1>())
                    XCTAssertNotNil(object)
                    XCTAssertEqual(object?.fetchSource()?.unsafeContext(), stack.mainContext)
                    XCTAssertEqual(object?.querySource()?.unsafeContext(), stack.mainContext)
@@ -897,7 +946,7 @@ final class TransactionTests: BaseTestCase {
            }
            do {
                
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                    
                    XCTFail()
                    return
@@ -911,9 +960,9 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
                    
-                    let object = stack.fetchOne(From<TestEntity1>())
+                    let object = try stack.fetchOne(From<TestEntity1>())
                    XCTAssertNotNil(object)
                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object?.testString, "string1_edit")
@@ -927,7 +976,7 @@ final class TransactionTests: BaseTestCase {
            }
            do {
                
-                let object = transaction.fetchOne(From<TestEntity1>())
+                let object = try transaction.fetchOne(From<TestEntity1>())
                transaction.delete(object)
                
                do {
@@ -935,8 +984,8 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                    XCTAssertNil(stack.fetchOne(From<TestEntity1>()))
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+                    XCTAssertNil(try stack.fetchOne(From<TestEntity1>()))
                }
                catch {
                    
@@ -967,10 +1016,10 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                    
-                    let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                    let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                    XCTAssertNotNil(object)
                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object?.testString, "string1")
@@ -984,7 +1033,7 @@ final class TransactionTests: BaseTestCase {
            }
            do {
                
-                guard let object = transaction.fetchOne(From<TestEntity1>("Config1")) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>("Config1")) else {
                    
                    XCTFail()
                    return
@@ -998,10 +1047,10 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 1)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 1)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                    
-                    let object = stack.fetchOne(From<TestEntity1>("Config1"))
+                    let object = try stack.fetchOne(From<TestEntity1>("Config1"))
                    XCTAssertNotNil(object)
                    XCTAssertEqual(object?.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object?.testString, "string1_edit")
@@ -1015,7 +1064,7 @@ final class TransactionTests: BaseTestCase {
            }
            do {
                
-                let object = transaction.fetchOne(From<TestEntity1>("Config1"))
+                let object = try transaction.fetchOne(From<TestEntity1>("Config1"))
                transaction.delete(object)
                
                do {
@@ -1023,8 +1072,8 @@ final class TransactionTests: BaseTestCase {
                    XCTAssertTrue(transaction.hasChanges)
                    try transaction.commitAndWait()
                    
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>("Config1")), 0)
-                    XCTAssertEqual(stack.fetchCount(From<TestEntity1>(nil)), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>("Config1")), 0)
+                    XCTAssertEqual(try stack.fetchCount(From<TestEntity1>(nil)), 0)
                }
                catch {
                    
@@ -1050,11 +1099,11 @@ final class TransactionTests: BaseTestCase {
                
                transaction.rollback()
                
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 0)
-                XCTAssertNil(transaction.fetchOne(From<TestEntity1>()))
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertNil(try transaction.fetchOne(From<TestEntity1>()))
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 0)
-                XCTAssertNil(stack.fetchOne(From<TestEntity1>()))
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 0)
+                XCTAssertNil(try stack.fetchOne(From<TestEntity1>()))
            }
            
            let testDate = Date()
@@ -1079,7 +1128,7 @@ final class TransactionTests: BaseTestCase {
            
            do {
                
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                    
                    XCTFail()
                    return
@@ -1090,8 +1139,8 @@ final class TransactionTests: BaseTestCase {
                
                transaction.rollback()
                
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
-                if let object = transaction.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
+                if let object = try transaction.fetchOne(From<TestEntity1>()) {
                    
                    XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object.testString, "string1")
@@ -1103,8 +1152,8 @@ final class TransactionTests: BaseTestCase {
                    XCTFail()
                }
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                if let object = stack.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+                if let object = try stack.fetchOne(From<TestEntity1>()) {
                    
                    XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object.testString, "string1")
@@ -1119,7 +1168,7 @@ final class TransactionTests: BaseTestCase {
            
            do {
                
-                guard let object = transaction.fetchOne(From<TestEntity1>()) else {
+                guard let object = try transaction.fetchOne(From<TestEntity1>()) else {
                    
                    XCTFail()
                    return
@@ -1128,8 +1177,8 @@ final class TransactionTests: BaseTestCase {
                
                transaction.rollback()
                
-                XCTAssertEqual(transaction.fetchCount(From<TestEntity1>()), 1)
-                if let object = transaction.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try transaction.fetchCount(From<TestEntity1>()), 1)
+                if let object = try transaction.fetchOne(From<TestEntity1>()) {
                    
                    XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object.testString, "string1")
@@ -1141,8 +1190,8 @@ final class TransactionTests: BaseTestCase {
                    XCTFail()
                }
                
-                XCTAssertEqual(stack.fetchCount(From<TestEntity1>()), 1)
-                if let object = stack.fetchOne(From<TestEntity1>()) {
+                XCTAssertEqual(try stack.fetchCount(From<TestEntity1>()), 1)
+                if let object = try stack.fetchOne(From<TestEntity1>()) {
                    
                    XCTAssertEqual(object.testEntityID, NSNumber(value: 1))
                    XCTAssertEqual(object.testString, "string1")
--- a/CoreStoreTests/TweakTests.swift
+++ b/CoreStoreTests/TweakTests.swift
@@ -2,7 +2,7 @@
 //  TweakTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -43,7 +43,7 @@ final class TweakTests: XCTestCase {
            $0.fetchLimit = 200
            $0.predicate = predicate
        }
-        let request = CoreStoreFetchRequest()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
        tweak.applyToFetchRequest(request)
        XCTAssertEqual(request.fetchOffset, 100)
        XCTAssertEqual(request.fetchLimit, 200)
--- a/CoreStoreTests/WhereTests.swift
+++ b/CoreStoreTests/WhereTests.swift
@@ -2,7 +2,7 @@
 //  WhereTests.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -56,6 +56,275 @@ final class WhereTests: XCTestCase {
    dynamic func test_ThatDynamicModelKeyPaths_CanBeCreated() {
        
        XCTAssertEqual(String(keyPath: \TestEntity1.testEntityID), "testEntityID")
+        XCTAssertEqual(String(keyPath: \Animal.color), "color")
+    }
+
+    @objc
+    dynamic func test_ThatExpressions_HaveCorrectKeyPaths() {
+
+        do {
+
+            do {
+
+                XCTAssertEqual(
+                    #keyPath(TestEntity1.testToOne.testEntityID),
+                    (\TestEntity1.testToOne ~ \.testEntityID).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testEntityID)
+                )
+                XCTAssertEqual(
+                    #keyPath(TestEntity1.testToOne.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered).description,
+                    String(keyPath: \TestEntity1.testToOne ~ \.testToOne ~ \.testToManyUnordered)
+                )
+                XCTAssertEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).description,
+                    String(keyPath: \TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered)
+                )
+            }
+            do {
+
+                XCTAssertEqual(
+                    "master.pets",
+                    (\Animal.master ~ \.pets).description,
+                    String(keyPath: \Animal.master ~ \.pets)
+                )
+                XCTAssertEqual(
+                    "master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).description,
+                    String(keyPath: \Animal.master ~ \.pets ~ \.species)
+                )
+                XCTAssertEqual(
+                    "master.pets.master",
+                    (\Animal.master ~ \.pets ~ \.master).description,
+                    String(keyPath: \Animal.master ~ \.pets ~ \.master)
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertEqual(
+                    #keyPath(TestEntity1.testToOne.testToManyUnordered) + ".@count",
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).count().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).count())
+                )
+                XCTAssertEqual(
+                    #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered) + ".@count",
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).count())
+                )
+            }
+            do {
+
+                XCTAssertEqual(
+                    "master.pets.@count",
+                    (\Animal.master ~ \.pets).count().description,
+                    String(keyPath: (\Animal.master ~ \.pets).count())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertEqual(
+                    "ANY " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).any().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).any())
+                )
+                XCTAssertEqual(
+                    "ANY " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).any())
+                )
+            }
+            do {
+
+                XCTAssertEqual(
+                    "ANY master.pets",
+                    (\Animal.master ~ \.pets).any().description,
+                    String(keyPath: (\Animal.master ~ \.pets).any())
+                )
+                XCTAssertEqual(
+                    "ANY master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).any().description,
+                    String(keyPath: (\Animal.master ~ \.pets ~ \.species).any())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertEqual(
+                    "ALL " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).all().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).all())
+                )
+                XCTAssertEqual(
+                    "ALL " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).all())
+                )
+            }
+            do {
+
+                XCTAssertEqual(
+                    "ALL master.pets",
+                    (\Animal.master ~ \.pets).all().description,
+                    String(keyPath: (\Animal.master ~ \.pets).all())
+                )
+                XCTAssertEqual(
+                    "ALL master.pets.species",
+                    (\Animal.master ~ \.pets ~ \.species).all().description,
+                    String(keyPath: (\Animal.master ~ \.pets ~ \.species).all())
+                )
+            }
+        }
+        do {
+
+            do {
+
+                XCTAssertEqual(
+                    "NONE " + #keyPath(TestEntity1.testToOne.testToManyUnordered),
+                    (\TestEntity1.testToOne ~ \.testToManyUnordered).none().description,
+                    String(keyPath: (\TestEntity1.testToOne ~ \.testToManyUnordered).none())
+                )
+                XCTAssertEqual(
+                    "NONE " + #keyPath(TestEntity2.testToOne.testToOne.testToManyOrdered),
+                    (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none().description,
+                    String(keyPath: (\TestEntity2.testToOne ~ \.testToOne ~ \.testToManyOrdered).none())
+                )
+            }
+            do {
+
+                XCTAssertEqual(
+                    "NONE master.pets",
+                    (\Animal.master ~ \.pets).none().description,
+                    String(keyPath: (\Animal.master ~ \.pets).none())
+                )
+                XCTAssertEqual(
+                    "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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.name == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.spouse ~ \.name) == dummy
+                let predicate = NSPredicate(format: "master.spouse.name == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets).count() == count
+                let predicate = NSPredicate(format: "master.pets.@count == %d", count)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).any() == dummy
+                let predicate = NSPredicate(format: "ANY master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).all() == dummy
+                let predicate = NSPredicate(format: "ALL master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(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)
+                XCTAssertEqual(whereClause, Where<TestEntity1>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+            do {
+
+                let whereClause: Where<Animal> = (\.master ~ \.pets ~ \.species).none() == dummy
+                let predicate = NSPredicate(format: "NONE master.pets.species == %@", dummy)
+                XCTAssertEqual(whereClause, Where<Animal>(predicate))
+                XCTAssertEqual(whereClause.predicate, predicate)
+            }
+        }
    }
    
    @objc
@@ -314,7 +583,7 @@ final class WhereTests: XCTestCase {
    dynamic func test_ThatWhereClauses_ApplyToFetchRequestsCorrectly() {
        
        let whereClause = Where<NSManagedObject>("key", isEqualTo: "value")
-        let request = CoreStoreFetchRequest()
+        let request = CoreStoreFetchRequest<NSFetchRequestResult>()
        whereClause.applyToFetchRequest(request)
        XCTAssertNotNil(request.predicate)
        XCTAssertEqual(request.predicate, whereClause.predicate)
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright © 2014 John Rommel Estropia
+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
--- a/Package.swift
+++ b/Package.swift
@@ -1,8 +1,9 @@
+// swift-tools-version:4.2
 //
 //  Package.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -25,21 +26,18 @@

 import PackageDescription

-let targets: [Target]
-#if os(iOS)
-targets = [Target(name: "CoreStore iOS")]
-#elseif os(OSX)
-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"]
+    products: [
+        .library(name: "CoreStore", type: .static, targets: ["CoreStore"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "CoreStore",
+            dependencies: [],
+            path: "Sources",
+            exclude: ["CoreStoreBridge.h", "CoreStoreBridge.m"]
+        )
+    ]
 )
--- 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
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios' executeOnSourceChanges='false'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>
--- a/Playground_iOS.playground/playground.xcworkspace/contents.xcworkspacedata
+++ b/Playground_iOS.playground/playground.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+</Workspace>
--- 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
@@ -6,22 +6,23 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 <br />
 <br />
 <a href="https://travis-ci.org/JohnEstropia/CoreStore"><img alt="Build Status" src="https://img.shields.io/travis/JohnEstropia/CoreStore/master.svg?style=flat" /></a>
+<a href="https://github.com/JohnEstropia/CoreStore/commits"><img alt="Last Commit" src="https://img.shields.io/github/last-commit/johnestropia/corestore.svg?style=flat" /></a>
 <a href="http://cocoadocs.org/docsets/CoreStore"><img alt="Platform" src="https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat" /></a>
 <a href="https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE"><img alt="License" src="https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat" /></a>
 <br /><br />Dependency managers<br />
 <a href="https://cocoapods.org/pods/CoreStore"><img alt="Cocoapods compatible" src="https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat&label=Cocoapods" /></a>
 <a href="https://github.com/Carthage/Carthage"><img alt="Carthage compatible" src="https://img.shields.io/badge/Carthage-compatible-16a085.svg?style=flat" /></a>
-<a href="https://swiftpkgs.ng.bluemix.net/package/JohnEstropia/CoreStore"><img alt="Swift Package Manager compatible" src="https://img.shields.io/badge/Swift_Package_Manager-compatible-orange.svg?style=flat" /></a>
+<a href="https://swift.org/source-compatibility/#current-list-of-projects"><img alt="Swift Package Manager compatible" src="https://img.shields.io/badge/Swift_Package_Manager-compatible-orange.svg?style=flat" /></a>
 <br /><br />Contact<br />
 <a href="http://swift-corestore-slack.herokuapp.com/"><img alt="Join us on Slack!" src="http://swift-corestore-slack.herokuapp.com/badge.svg" /></a>
 <a href="https://twitter.com/JohnEstropia"><img alt="Reach me on Twitter!" src="https://img.shields.io/badge/twitter-%40JohnEstropia-3498db.svg" /></a>
 <br />
 </p>

-* **Swift 4.0:** iOS 8+ / macOS 10.10+ / watchOS 2.0+ / tvOS 9.0+
+* **Swift 4.2:** iOS 10+ / macOS 10.12+ / watchOS 3.0+ / tvOS 10.0+
 * Other Swift versions: [Swift 3.2(version 4.2.3)](https://github.com/JohnEstropia/CoreStore/tree/4.2.3)

-Upgrading from CoreStore 4.2 (Swift 3.2) to 5.0 (Swift 4.0)? Check out the [new features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).
+Upgrading from CoreStore 5.x (min iOS 9) to 6.x (min iOS 10)? Check out the [new features](#features) and make sure to read the [Change logs](https://github.com/JohnEstropia/CoreStore/releases).

 CoreStore is now part of the [Swift Source Compatibility projects](https://swift.org/source-compatibility/#current-list-of-projects).

@@ -64,7 +65,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
        - [Starting migrations](#starting-migrations)
        - [Progressive migrations](#progressive-migrations)
        - [Forecasting migrations](#forecasting-migrations)
-        - [Custom migratoins](#custom-migrations)
+        - [Custom migrations](#custom-migrations)
    - [Saving and processing transactions](#saving-and-processing-transactions)
        - [Transaction types](#transaction-types)
            - [Asynchronous transactions](#asynchronous-transactions)
@@ -86,6 +87,7 @@ CoreStore was (and is) heavily shaped by real-world needs of developing data-dep
            - [`GroupBy` clause](#groupby-clause)
    - [Logging and error reporting](#logging-and-error-reporting)
    - [Observing changes and notifications](#observing-changes-and-notifications)
+        - [Observe a single property](#observe-a-single-property)
        - [Observe a single object](#observe-a-single-object)
        - [Observe a list of objects](#observe-a-list-of-objects)
    - [Objective-C support](#objective-c-support)
@@ -139,12 +141,12 @@ CoreStore.perform(

 Fetching objects (simple):
 ```swift
-let people = CoreStore.fetchAll(From<MyPersonEntity>())
+let people = try CoreStore.fetchAll(From<MyPersonEntity>())
 ```

 Fetching objects (complex):
 ```swift
-let people = CoreStore.fetchAll(
+let people = try CoreStore.fetchAll(
    From<MyPersonEntity>()
        .where(\.age > 30),
        .orderBy(.ascending(\.name), .descending(.\age)),
@@ -154,7 +156,7 @@ let people = CoreStore.fetchAll(

 Querying values:
 ```swift
-let maxAge = CoreStore.queryValue(
+let maxAge = try CoreStore.queryValue(
    From<MyPersonEntity>()
        .select(Int.self, .maximum(\.age))
 )
@@ -215,9 +217,9 @@ let migrationProgress = dataStack.addStorage(
    completion: { (result) -> Void in
        switch result {
        case .success(let storage):
-            print("Successfully added sqlite store: \(storage)"
+            print("Successfully added sqlite store: \(storage)")
        case .failure(let error):
-            print("Failed adding sqlite store with error: \(error)"
+            print("Failed adding sqlite store with error: \(error)")
        }
    }
 )
@@ -851,7 +853,7 @@ To update an existing object, fetch the object's instance from the transaction:
 ```swift
 CoreStore.perform(
    asynchronous: { (transaction) -> Void in
-        let person = transaction.fetchOne(
+        let person = try transaction.fetchOne(
            From<MyPersonEntity>()
                .where(\.name == "Jane Smith")
        )
@@ -913,8 +915,8 @@ let jane: MyPersonEntity = // ...

 CoreStore.perform(
    asynchronous: { (transaction) -> Void in
-        transaction.delete(john, jane)
-        // transaction.delete([john, jane]) is also allowed
+        try transaction.delete(john, jane)
+        // try transaction.delete([john, jane]) is also allowed
    },
    completion: { _ in }
 )
@@ -923,7 +925,7 @@ If you do not have references yet to the objects to be deleted, transactions hav
 ```swift
 CoreStore.perform(
    asynchronous: { (transaction) -> Void in
-        transaction.deleteAll(
+        try transaction.deleteAll(
            From<MyPersonEntity>()
                .where(\.age > 30)
        )
@@ -971,7 +973,7 @@ var peopleIDs: [NSManagedObjectID] = // ...

 CoreStore.perform(
    asynchronous: { (transaction) -> Void in
-        let jane = transaction.fetchOne(
+        let jane = try transaction.fetchOne(
            From<MyPersonEntity>()
                .where(\.name == "Jane Smith")
        )
@@ -1184,17 +1186,17 @@ Before we dive in, be aware that CoreStore distinguishes between *fetching* and
 #### `From` clause
 The search conditions for fetches and queries are specified using *clauses*. All fetches and queries require a `From` clause that indicates the target entity type:
 ```swift
-let people = CoreStore.fetchAll(From<MyPersonEntity>())
+let people = try CoreStore.fetchAll(From<MyPersonEntity>())
 ```
 `people` in the example above will be of type `[MyPersonEntity]`. The `From<MyPersonEntity>()` clause indicates a fetch to all persistent stores that `MyPersonEntity` belong to.

 If the entity exists in multiple configurations and you need to only search from a particular configuration, indicate in the `From` clause the configuration name for the destination persistent store:
 ```swift
-let people = CoreStore.fetchAll(From<MyPersonEntity>("Config1")) // ignore objects in persistent stores other than the "Config1" configuration
+let people = try CoreStore.fetchAll(From<MyPersonEntity>("Config1")) // ignore objects in persistent stores other than the "Config1" configuration
 ```
 or if the persistent store is the auto-generated "Default" configuration, specify `nil`:
 ```swift
-let person = CoreStore.fetchAll(From<MyPersonEntity>(nil))
+let person = try CoreStore.fetchAll(From<MyPersonEntity>(nil))
 ```
 Now we know how to use a `From` clause, let's move on to fetching and querying.

@@ -1214,11 +1216,11 @@ Each method's purpose is straightforward, but we need to understand how to set t

 The `Where` clause is CoreStore's `NSPredicate` wrapper. It specifies the search filter to use when fetching (or querying). It implements all initializers that `NSPredicate` does (except for `-predicateWithBlock:`, which Core Data does not support):
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
    Where<MyPersonEntity>("%K > %d", "age", 30) // string format initializer
 )
-people = CoreStore.fetchAll(
+people = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
    Where<MyPersonEntity>(true) // boolean initializer
 )
@@ -1233,14 +1235,14 @@ var people = CoreStore.fetchAll(
 ```
 ⭐️Starting CoreStore 5.0, `Where` clauses became more type-safe and are now generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `Where` clause expression:
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>()
        .where(\.age > 30) // Type-safe!
 )
 ```
 `Where` clauses also implement the `&&`, `||`, and `!` logic operators, so you can provide logical conditions without writing too much `AND`, `OR`, and `NOT` strings:
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>()
        .where(\.age > 30 && \.gender == "M")
 )
@@ -1251,7 +1253,7 @@ If you do not provide a `Where` clause, all objects that belong to the specified

 The `OrderBy` clause is CoreStore's `NSSortDescriptor` wrapper. Use it to specify attribute keys in which to sort the fetch (or query) results with.
 ```swift
-var mostValuablePeople = CoreStore.fetchAll(
+var mostValuablePeople = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
    OrderBy<MyPersonEntity>(.descending("rating"), .ascending("surname"))
 )
@@ -1259,7 +1261,7 @@ var mostValuablePeople = CoreStore.fetchAll(
 As seen above, `OrderBy` accepts a list of `SortKey` enumeration values, which can be either `.ascending` or `.descending`.
 ⭐️As with `Where` clauses, CoreStore 5.0 turned `OrderBy` clauses into generic types. To avoid verbose repetition of the generic object type, fetch methods now support **Fetch Chain builders**. We can also use Swift's Smart KeyPaths as the `OrderBy` clause expression:
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>()
        .orderBy(.descending(\.rating), .ascending(\.surname)) // Type-safe!
 )
@@ -1271,7 +1273,7 @@ var orderBy = OrderBy<MyPersonEntity>(.descending(\.rating))
 if sortFromYoungest {
    orderBy += OrderBy(.ascending(\.age))
 }
-var mostValuablePeople = CoreStore.fetchAll(
+var mostValuablePeople = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
    orderBy
 )
@@ -1281,7 +1283,7 @@ var mostValuablePeople = CoreStore.fetchAll(

 The `Tweak` clause lets you, uh, *tweak* the fetch (or query). `Tweak` exposes the `NSFetchRequest` in a closure where you can make changes to its properties:
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
    Where<MyPersonEntity>("age > %d", 30),
    OrderBy<MyPersonEntity>(.ascending("surname")),
@@ -1294,7 +1296,7 @@ var people = CoreStore.fetchAll(
 ```
 `Tweak` also supports **Fetch Chain builders**:
 ```swift
-var people = CoreStore.fetchAll(
+var people = try CoreStore.fetchAll(
    From<MyPersonEntity>(),
        .where(\.age > 30)
        .orderBy(.ascending(\.surname))
@@ -1325,7 +1327,7 @@ Setting up the `From`, `Where`, `OrderBy`, and `Tweak` clauses is similar to how

 The `Select<T>` clause specifies the target attribute/aggregate key, as well as the expected return type: 
 ```swift
-let johnsAge = CoreStore.queryValue(
+let johnsAge = try CoreStore.queryValue(
    From<MyPersonEntity>(),
    Select<Int>("age"),
    Where("name == %@", "John Smith")
@@ -1335,14 +1337,14 @@ The example above queries the "age" property for the first object that matches t

 For `queryAttributes(...)`, only `NSDictionary` is valid for `Select`, thus you are allowed to omit the generic type:
 ```swift
-let allAges = CoreStore.queryAttributes(
+let allAges = try CoreStore.queryAttributes(
    From<MyPersonEntity>(),
    Select("age")
 )
 ```
 ⭐️Starting CoreStore 5.0, query methods now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
-let johnsAge = CoreStore.queryValue(
+let johnsAge = try CoreStore.queryValue(
    From<MyPersonEntity>()
        .select(\.age) // binds the result to Int
        .where(\.name == "John Smith")
@@ -1357,7 +1359,7 @@ If you only need a value for a particular attribute, you can just specify the ke
 - `.sum(...)`

 ```swift
-let oldestAge = CoreStore.queryValue(
+let oldestAge = try CoreStore.queryValue(
    From<MyPersonEntity>(),
    Select<Int>(.maximum("age"))
 )
@@ -1365,7 +1367,7 @@ let oldestAge = CoreStore.queryValue(

 For `queryAttributes(...)` which returns an array of dictionaries, you can specify multiple attributes/aggregates to `Select`:
 ```swift
-let personJSON = CoreStore.queryAttributes(
+let personJSON = try CoreStore.queryAttributes(
    From<MyPersonEntity>(),
    Select("name", "age")
 )
@@ -1385,7 +1387,7 @@ let personJSON = CoreStore.queryAttributes(
 ```
 You can also include an aggregate as well:
 ```swift
-let personJSON = CoreStore.queryAttributes(
+let personJSON = try CoreStore.queryAttributes(
    From<MyPersonEntity>(),
    Select("name", .count("friends"))
 )
@@ -1405,7 +1407,7 @@ which returns:
 ```
 The `"count(friends)"` key name was automatically used by CoreStore, but you can specify your own key alias if you need:
 ```swift
-let personJSON = CoreStore.queryAttributes(
+let personJSON = try CoreStore.queryAttributes(
    From<MyPersonEntity>(),
    Select("name", .count("friends", as: "friendsCount"))
 )
@@ -1428,7 +1430,7 @@ which now returns:

 The `GroupBy` clause lets you group results by a specified attribute/aggregate. This is useful only for `queryAttributes(...)` since `queryValue(...)` just returns the first value.
 ```swift
-let personJSON = CoreStore.queryAttributes(
+let personJSON = try CoreStore.queryAttributes(
    From<MyPersonEntity>(),
    Select("age", .count("age", as: "count")),
    GroupBy("age")
@@ -1436,7 +1438,7 @@ let personJSON = CoreStore.queryAttributes(
 ```
 ⭐️Starting CoreStore 5.0, `GroupBy` clauses are now also generic types and now support **Query Chain builders**. We can also use Swift's Smart KeyPaths to use in the expressions:
 ```swift
-let personJSON = CoreStore.queryAttributes(
+let personJSON = try CoreStore.queryAttributes(
    From<MyPersonEntity>()
        .select(.attribute(\.age), .count(\.age, as: "count"))
        .groupBy(\.age)
@@ -1491,16 +1493,35 @@ A couple of examples, `ListMonitor`:
 These are all implemented with `CustomDebugStringConvertible.debugDescription`, so they work with lldb's `po` command as well.

 ## Observing changes and notifications
-> (unavailable on macOS versions below 10.12)

 CoreStore provides type-safe wrappers for observing managed objects:

 - `ObjectMonitor`: use to monitor changes to a single `NSManagedObject` or `CoreStoreObject` instance (instead of Key-Value Observing)
 - `ListMonitor`: use to monitor changes to a list of `NSManagedObject` or `CoreStoreObject` instances (instead of `NSFetchedResultsController`)

+### Observe a single property
+To get notifications for single property changes in an object, there are two methods depending on the object's base class.
+
+- For `NSManagedObject` subclasses: Use the standard KVO method:
+```swift
+let observer = person.observe(\.age, options: [.new]) { (person, change)
+    print("Happy \(change.newValue)th birthday!")
+}
+```
+
+- For `CoreStoreObject` subclasses: Call the `observe(...)` method directly on the property. You'll notice that the API itself is a bit similar to the KVO method:
+```swift
+let observer = person.age.observe(options: [.new]) { (person, change)
+    print("Happy \(change.newValue)th birthday!")
+}
+```
+
+For both methods, you will need to keep a reference to the returned `observer` for the duration of the observation.  
+
+
 ### Observe a single object

-To observe an object, implement the `ObjectObserver` protocol and specify the `EntityType`:
+To observe an object itself as a whole, implement the `ObjectObserver` protocol and specify the `EntityType`:
 ```swift
 class MyViewController: UIViewController, ObjectObserver {
    func objectMonitor(monitor: ObjectMonitor<MyPersonEntity>, willUpdateObject object: MyPersonEntity) {
@@ -1796,7 +1817,7 @@ let keyPath: String = Dog.keyPath { $0.nickname }
 ```
 as well as `Where` and `OrderBy` clauses
 ```swift
-let puppies = CoreStore.fetchAll(
+let puppies = try CoreStore.fetchAll(
    From<Dog>()
        .where(\.age < 1)
        .orderBy(.ascending(\.age))
@@ -1841,8 +1862,8 @@ Once the version lock is set, any changes in the properties or to the model will

 # Installation
 - Requires:
-    - iOS 8 SDK and above
-    - Swift 4 (Xcode 9+)
+    - iOS 10 SDK and above
+    - Swift 4.2 (Xcode 10+)
 - Dependencies:
    - *None*
 - Other notes:
@@ -1851,7 +1872,7 @@ Once the version lock is set, any changes in the properties or to the model will
 ### Install with CocoaPods
 In your `Podfile`, add
 ```
-pod 'CoreStore', '~> 5.0'
+pod 'CoreStore', '~> 6.1'
 ```
 and run 
 ```
@@ -1862,7 +1883,7 @@ This installs CoreStore as a framework. Declare `import CoreStore` in your swift
 ### Install with Carthage
 In your `Cartfile`, add
 ```
-github "JohnEstropia/CoreStore" >= 5.0.0
+github "JohnEstropia/CoreStore" >= 6.2.1
 ```
 and run 
 ```
@@ -1870,18 +1891,20 @@ carthage update
 ```
 This installs CoreStore as a framework. Declare `import CoreStore` in your swift file to use the library.

+#### Install with Swift Package Manager:
+```swift
+dependencies: [
+    .package(url: "https://github.com/JohnEstropia/CoreStore.git", from: "6.2.1"))
+]
+```
+Declare `import CoreStore` in your swift file to use the library.
+
 ### Install as Git Submodule
 ```
 git submodule add https://github.com/JohnEstropia/CoreStore.git <destination directory>
 ```
 Drag and drop **CoreStore.xcodeproj** to your project.

-#### To install as a framework:
-Drag and drop **CoreStore.xcodeproj** to your project.
-
-#### To include directly in your app module:
-Add all *.swift* files to your project.
-

 ### Objective-C support

--- a/Sources/AsynchronousDataTransaction.swift
+++ b/Sources/AsynchronousDataTransaction.swift
@@ -2,7 +2,7 @@
 //  AsynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  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
@@ -172,7 +172,7 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
            "Attempted to delete an entities from an already committed \(cs_typeName(self))."
        )
        
-        super.delete(([object1, object2] + objects).flatMap { $0 })
+        super.delete(([object1, object2] + objects).compactMap { $0 })
    }
    
    /**
--- a/Sources/AttributeProtocol.swift
+++ b/Sources/AttributeProtocol.swift
@@ -2,7 +2,7 @@
 //  AttributeProtocol.swift
 //  CoreStore
 //
-//  Copyright © 2017 John Rommel Estropia
+//  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
@@ -35,13 +35,13 @@ internal protocol AttributeProtocol: class {
    
    var keyPath: KeyPathString { get }
    var isOptional: Bool { get }
-    var isIndexed: 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 }
-    weak var parentObject: CoreStoreObject? { get set }
+    var rawObject: CoreStoreManagedObject? { get set }
    var getter: CoreStoreManagedObject.CustomGetter? { get }
    var setter: CoreStoreManagedObject.CustomSetter? { get }
 }
--- a/Sources/BaseDataTransaction+Importing.swift
+++ b/Sources/BaseDataTransaction+Importing.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Importing.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - BaseDataTransaction

-public extension BaseDataTransaction {
+extension BaseDataTransaction {
    
    /**
     Creates an `ImportableObject` by importing from the specified import source.
@@ -80,7 +80,7 @@ public extension BaseDataTransaction {
            
            try autoreleasepool {
              
-                let entityType = type(of: object)
+                let entityType = cs_dynamicType(of: object)
                guard entityType.shouldInsert(from: source, in: self) else {
                    
                    return
@@ -108,7 +108,7 @@ public extension BaseDataTransaction {
            
            return try autoreleasepool {
                
-                return try sourceArray.flatMap { (source) -> D? in
+                return try sourceArray.compactMap { (source) -> D? in
                  
                    let entityType = into.entityClass 
                    guard entityType.shouldInsert(from: source, in: self) else {
@@ -151,7 +151,7 @@ public extension BaseDataTransaction {
                    return nil
                }
                
-                if let object = self.fetchOne(From(entityType), Where<D>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
+                if let object = try self.fetchOne(From(entityType), Where<D>(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                    
                    guard entityType.shouldUpdate(from: source, in: self) else {
                        
@@ -201,7 +201,7 @@ public extension BaseDataTransaction {
                var importSourceByID = Dictionary<D.UniqueIDType, D.ImportSource>()
                let sortedIDs = try autoreleasepool {
                  
-                    return try sourceArray.flatMap { (source) -> D.UniqueIDType? in
+                    return try sourceArray.compactMap { (source) -> D.UniqueIDType? in
                        
                        guard let uniqueIDValue = try entityType.uniqueID(from: source, in: self) else {
                            
@@ -215,7 +215,8 @@ public extension BaseDataTransaction {
                importSourceByID = try autoreleasepool { try preProcess(importSourceByID) }

                var existingObjectsByID = Dictionary<D.UniqueIDType, D>()
-                self.fetchAll(From(entityType), Where<D>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))?
+                try self
+                    .fetchAll(From(entityType), Where<D>(entityType.uniqueIDKeyPath, isMemberOf: sortedIDs))
                    .forEach { existingObjectsByID[$0.uniqueIDValue] = $0 }
              
                var processedObjectIDs = Set<D.UniqueIDType>()
--- a/Sources/BaseDataTransaction+Querying.swift
+++ b/Sources/BaseDataTransaction+Querying.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  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
@@ -39,13 +39,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: DeleteClause...) -> Int? {
+    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: DeleteClause...) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.deleteAll(from, deleteClauses)
+        return try self.context.deleteAll(from, deleteClauses)
    }
    
    /**
@@ -56,13 +56,13 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: [DeleteClause]) -> Int? {
+    public func deleteAll<D>(_ from: From<D>, _ deleteClauses: [DeleteClause]) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.deleteAll(from, deleteClauses)
+        return try self.context.deleteAll(from, deleteClauses)
    }
    
    /**
@@ -74,14 +74,14 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - returns: the number of `DynamicObject`s deleted
     */
    @discardableResult
-    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) -> Int? {
+    public func deleteAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to delete from a \(cs_typeName(self)) outside its designated queue."
        )
        
-        return self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
+        return try self.context.deleteAll(clauseChain.from, clauseChain.fetchClauses)
    }
    
    
@@ -136,15 +136,16 @@ 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
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> D? {
+    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> D? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchOne(from, fetchClauses)
+        return try self.context.fetchOne(from, fetchClauses)
    }
    
    /**
@@ -152,15 +153,16 @@ 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
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> D? {
+    public func fetchOne<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> D? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchOne(from, fetchClauses)
+        return try self.context.fetchOne(from, fetchClauses)
    }
    
    /**
@@ -173,15 +175,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     )
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`
+     - returns: the first `DynamicObject` instance that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) -> B.ObjectType? {
+    public func fetchOne<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> B.ObjectType? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchOne(clauseChain)
+        return try self.context.fetchOne(clauseChain)
    }
    
    /**
@@ -189,15 +192,16 @@ 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
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> [D]? {
+    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [D] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchAll(from, fetchClauses)
+        return try self.context.fetchAll(from, fetchClauses)
    }
    
    /**
@@ -205,15 +209,16 @@ 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
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> [D]? {
+    public func fetchAll<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [D] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchAll(from, fetchClauses)
+        return try self.context.fetchAll(from, fetchClauses)
    }
    
    /**
@@ -226,15 +231,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     )
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`
+     - returns: all `DynamicObject` instances that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) -> [B.ObjectType]? {
+    public func fetchAll<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [B.ObjectType] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchAll(clauseChain)
+        return try self.context.fetchAll(clauseChain)
    }
    
    /**
@@ -242,15 +248,16 @@ 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 `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> Int? {
+    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchCount(from, fetchClauses)
+        return try self.context.fetchCount(from, fetchClauses)
    }
    
    /**
@@ -258,15 +265,16 @@ 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 `DynamicObject`s that satisfy the specified `FetchClause`s
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchClause`s
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> Int? {
+    public func fetchCount<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchCount(from, fetchClauses)
+        return try self.context.fetchCount(from, fetchClauses)
    }
    
    /**
@@ -279,15 +287,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     )
     ```
     - parameter clauseChain: a `FetchChainableBuilderType` built from a chain of clauses
-     - returns: the number `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
+     - returns: the number of `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) -> Int? {
+    public func fetchCount<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> Int {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchCount(clauseChain)
+        return try self.context.fetchCount(clauseChain)
    }
    
    /**
@@ -295,15 +304,16 @@ 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
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
+    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> NSManagedObjectID? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectID(from, fetchClauses)
+        return try self.context.fetchObjectID(from, fetchClauses)
    }
    
    /**
@@ -311,15 +321,16 @@ 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
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchClause`s, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
+    public func fetchObjectID<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> NSManagedObjectID? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectID(from, fetchClauses)
+        return try self.context.fetchObjectID(from, fetchClauses)
    }
    
    /**
@@ -332,15 +343,16 @@ 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`
+     - returns: the `NSManagedObjectID` for the first `DynamicObject` that satisfies the specified `FetchChainableBuilderType`, or `nil` if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) -> NSManagedObjectID? {
+    public func fetchObjectID<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> NSManagedObjectID? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectID(clauseChain)
+        return try self.context.fetchObjectID(clauseChain)
    }
    
    /**
@@ -348,15 +360,16 @@ 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
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: FetchClause...) throws -> [NSManagedObjectID] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectIDs(from, fetchClauses)
+        return try self.context.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
@@ -364,15 +377,16 @@ 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
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchClause`s, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<D>(_ from: From<D>, _ fetchClauses: [FetchClause]) throws -> [NSManagedObjectID] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectIDs(from, fetchClauses)
+        return try self.context.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
@@ -385,15 +399,16 @@ 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`
+     - returns: the `NSManagedObjectID` for all `DynamicObject`s that satisfy the specified `FetchChainableBuilderType`, or an empty array if no match was found
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) -> [NSManagedObjectID]? {
+    public func fetchObjectIDs<B: FetchChainableBuilderType>(_ clauseChain: B) throws -> [NSManagedObjectID] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.fetchObjectIDs(clauseChain)
+        return try self.context.fetchObjectIDs(clauseChain)
    }
    
    
@@ -407,15 +422,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter from: a `From` clause indicating the entity type
     - 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.
+     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) -> U? {
+    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: QueryClause...) throws -> U? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryValue(from, selectClause, queryClauses)
+        return try self.context.queryValue(from, selectClause, queryClauses)
    }
    
    /**
@@ -426,15 +442,16 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
     - parameter from: a `From` clause indicating the entity type
     - 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.
+     - returns: the result of the the query, or `nil` if no match was found. The type of the return value is specified by the generic type of the `Select<U>` parameter.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) -> U? {
+    public func queryValue<D, U: QueryableAttributeType>(_ from: From<D>, _ selectClause: Select<D, U>, _ queryClauses: [QueryClause]) throws -> U? {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryValue(from, selectClause, queryClauses)
+        return try self.context.queryValue(from, selectClause, queryClauses)
    }
    
    /**
@@ -449,15 +466,16 @@ 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`
+     - returns: the result of the the query as specified by the `QueryChainableBuilderType`, or `nil` if no match was found.
+     - throws: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) -> B.ResultType? where B.ResultType: QueryableAttributeType {
+    public func queryValue<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> B.ResultType? where B.ResultType: QueryableAttributeType {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryValue(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
    }
    
    /**
@@ -469,14 +487,15 @@ 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: `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...) -> [[String: Any]]? {
+    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: QueryClause...) throws -> [[String: Any]] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryAttributes(from, selectClause, queryClauses)
+        return try self.context.queryAttributes(from, selectClause, queryClauses)
    }
    
    /**
@@ -488,14 +507,15 @@ 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: `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]) -> [[String: Any]]? {
+    public func queryAttributes<D>(_ from: From<D>, _ selectClause: Select<D, NSDictionary>, _ queryClauses: [QueryClause]) throws -> [[String: Any]] {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryAttributes(from, selectClause, queryClauses)
+        return try self.context.queryAttributes(from, selectClause, queryClauses)
    }
    
    /**
@@ -520,14 +540,15 @@ 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: `CoreStoreError.persistentStoreNotFound` if the specified entity could not be found in any store's schema.
     */
-    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) -> [[String: Any]]? where B.ResultType == NSDictionary {
+    public func queryAttributes<B: QueryChainableBuilderType>(_ clauseChain: B) throws -> [[String: Any]] where B.ResultType == NSDictionary {
        
        CoreStore.assert(
            self.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
+        return try self.context.queryAttributes(clauseChain.from, clauseChain.select, clauseChain.queryClauses)
    }
    
    
@@ -544,7 +565,7 @@ extension BaseDataTransaction: FetchableSource, QueryableSource {
    
    // MARK: Obsoleted
    
-    @available(*, obsoleted: 3.1, renamed: "unsafeContext()")
+    @available(swift, obsoleted: 3.1, renamed: "unsafeContext()")
    public func internalContext() -> NSManagedObjectContext {
        
        fatalError()
--- a/Sources/BaseDataTransaction.swift
+++ b/Sources/BaseDataTransaction.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2014 John Rommel Estropia
+//  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
@@ -181,7 +181,7 @@ public /*abstract*/ class BaseDataTransaction {
     */
    public func delete<D: DynamicObject>(_ object1: D?, _ object2: D?, _ objects: D?...) {
        
-        self.delete(([object1, object2] + objects).flatMap { $0 })
+        self.delete(([object1, object2] + objects).compactMap { $0 })
    }
    
    /**
@@ -223,14 +223,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func insertedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "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 Set(self.context.insertedObjects.flatMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
+        return Set(self.context.insertedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
    
    /**
@@ -241,7 +241,7 @@ public /*abstract*/ class BaseDataTransaction {
    public func insertedObjectIDs() -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
@@ -260,14 +260,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func insertedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access inserted object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
            !self.isCommitted,
            "Attempted to access inserted objects IDs from an already committed \(cs_typeName(self))."
        )
-        return Set(self.context.insertedObjects.flatMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
+        return Set(self.context.insertedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
    
    /**
@@ -279,14 +279,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func updatedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "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 Set(self.context.updatedObjects.flatMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
+        return Set(self.context.updatedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
    
    /**
@@ -297,7 +297,7 @@ public /*abstract*/ class BaseDataTransaction {
    public func updatedObjectIDs() -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
@@ -316,14 +316,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func updatedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access updated object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
            !self.isCommitted,
            "Attempted to access updated object IDs from an already committed \(cs_typeName(self))."
        )
-        return Set(self.context.updatedObjects.flatMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
+        return Set(self.context.updatedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
    
    /**
@@ -335,14 +335,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func deletedObjects<D: DynamicObject>(_ entity: D.Type) -> Set<D> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "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 Set(self.context.deletedObjects.flatMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
+        return Set(self.context.deletedObjects.compactMap({ entity.cs_matches(object: $0) ? entity.cs_fromRaw(object: $0) : nil }))
    }
    
    /**
@@ -354,7 +354,7 @@ public /*abstract*/ class BaseDataTransaction {
    public func deletedObjectIDs() -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
@@ -373,14 +373,14 @@ public /*abstract*/ class BaseDataTransaction {
    public func deletedObjectIDs<D: DynamicObject>(_ entity: D.Type) -> Set<NSManagedObjectID> {
        
        CoreStore.assert(
-            self.transactionQueue.cs_isCurrentExecutionContext(),
+            self.isRunningInAllowedQueue(),
            "Attempted to access deleted object IDs from a \(cs_typeName(self)) outside its designated queue."
        )
        CoreStore.assert(
            !self.isCommitted,
            "Attempted to access deleted object IDs from an already committed \(cs_typeName(self))."
        )
-        return Set(self.context.deletedObjects.flatMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
+        return Set(self.context.deletedObjects.compactMap({ entity.cs_matches(object: $0) ? $0.objectID : nil }))
    }
    
    
--- a/Sources/CSAsynchronousDataTransaction.swift
+++ b/Sources/CSAsynchronousDataTransaction.swift
@@ -2,7 +2,7 @@
 //  CSAsynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/Sources/CSBaseDataTransaction+Querying.swift
+++ b/Sources/CSBaseDataTransaction+Querying.swift
@@ -2,7 +2,7 @@
 //  CSBaseDataTransaction+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -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.
@@ -93,7 +93,8 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context.fetchOne(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchOne(from, fetchClauses))?
+            .flatMap({ $0 })
    }
    
    /**
@@ -110,7 +111,8 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context.fetchAll(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchAll(from, fetchClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -127,9 +129,8 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context
-            .fetchCount(from, fetchClauses)
-            .flatMap { NSNumber(value: $0) }
+        return (try? self.swiftTransaction.context.fetchCount(from, fetchClauses))
+            .flatMap({ NSNumber(value: $0) })
    }
    
    /**
@@ -146,7 +147,8 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to fetch from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context.fetchObjectID(from, fetchClauses)
+        return (try? self.swiftTransaction.context.fetchObjectID(from, fetchClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -166,7 +168,8 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context.queryValue(from, selectClause, queryClauses)
+        return (try? self.swiftTransaction.context.queryValue(from, selectClause, queryClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -186,6 +189,7 @@ public extension CSBaseDataTransaction {
            self.swiftTransaction.isRunningInAllowedQueue(),
            "Attempted to query from a \(cs_typeName(self)) outside its designated queue."
        )
-        return self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses)
+        return (try? self.swiftTransaction.context.queryAttributes(from, selectClause, queryClauses))
+            .flatMap({ $0 })
    }
 }
--- a/Sources/CSBaseDataTransaction.swift
+++ b/Sources/CSBaseDataTransaction.swift
@@ -2,7 +2,7 @@
 //  CSBaseDataTransaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/Sources/CSClauseTypes.swift
+++ b/Sources/CSClauseTypes.swift
@@ -2,7 +2,7 @@
 //  CSClauseTypes.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/Sources/CSCoreStore+Migrating.swift
+++ b/Sources/CSCoreStore+Migrating.swift
@@ -2,7 +2,7 @@
 //  CSCoreStore+Migrating.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+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
@@ -2,7 +2,7 @@
 //  CSCoreStore+Observing.swift
 //  CoreStore
 //
-//  Copyright © 2015 John Rommel Estropia
+//  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
@@ -29,8 +29,8 @@ import CoreData

 // MARK: - CSCoreStore

-@available(OSX 10.12, *)
-public extension CSCoreStore {
+@available(macOS 10.12, *)
+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
@@ -2,7 +2,7 @@
 //  CSCoreStore+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+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
@@ -2,7 +2,7 @@
 //  CSCoreStore+Setup.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+extension CSCoreStore {
    
    /**
     Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
--- a/Sources/CSCoreStore+Transaction.swift
+++ b/Sources/CSCoreStore+Transaction.swift
@@ -2,7 +2,7 @@
 //  CSCoreStore+Transaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -28,7 +28,7 @@ import Foundation

 // MARK: - CSCoreStore

-public extension CSCoreStore {
+extension CSCoreStore {
    
    /**
     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
--- a/Sources/CSCoreStore.swift
+++ b/Sources/CSCoreStore.swift
@@ -2,7 +2,7 @@
 //  CSCoreStore.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
--- a/Sources/CSDataStack+Migrating.swift
+++ b/Sources/CSDataStack+Migrating.swift
@@ -2,7 +2,7 @@
 //  CSDataStack+Migrating.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSDataStack

-public extension CSDataStack {
+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
@@ -2,7 +2,7 @@
 //  CSDataStack+Observing.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,8 +29,8 @@ import CoreData

 // MARK: - CSDataStack

-@available(OSX 10.12, *)
-public extension CSDataStack {
+@available(macOS 10.12, *)
+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`.
@@ -68,7 +68,7 @@ public extension CSDataStack {
            sectionBy: nil,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            }
        ).bridgeToObjectiveC
    }
@@ -97,7 +97,7 @@ public extension CSDataStack {
            sectionBy: nil,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            },
            createAsynchronously: {
                
@@ -131,7 +131,7 @@ public extension CSDataStack {
            sectionBy: sectionBy.bridgeToSwift,
            applyFetchClauses: { (fetchRequest) in
                
-                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest as! NSFetchRequest<NSFetchRequestResult>) }
+                fetchClauses.forEach { $0.applyToFetchRequest(fetchRequest) }
            }
        ).bridgeToObjectiveC
    }
@@ -160,7 +160,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
@@ -2,7 +2,7 @@
 //  CSDataStack+Querying.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -29,7 +29,7 @@ import CoreData

 // MARK: - CSDataStack

-public extension CSDataStack {
+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.
@@ -93,7 +93,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchOne(from, fetchClauses))?
+            .flatMap({ $0 })
    }
    
    /**
@@ -110,7 +111,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchAll(from, fetchClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -127,9 +129,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext
-            .fetchCount(from, fetchClauses)
-            .flatMap { NSNumber(value: $0) }
+        return (try? self.bridgeToSwift.mainContext.fetchCount(from, fetchClauses))
+            .flatMap({ NSNumber(value: $0) })
    }
    
    /**
@@ -146,7 +147,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchObjectID(from, fetchClauses))?
+            .flatMap({ $0 })
    }
    
    /**
@@ -163,7 +165,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to fetch from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses)
+        return (try? self.bridgeToSwift.mainContext.fetchObjectIDs(from, fetchClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -183,7 +186,8 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to query from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses)
+        return (try? self.bridgeToSwift.mainContext.queryValue(from, selectClause, queryClauses))
+            .flatMap({ $0 })
    }
    
    /**
@@ -203,6 +207,7 @@ public extension CSDataStack {
            Thread.isMainThread,
            "Attempted to query from a \(cs_typeName(self)) outside the main thread."
        )
-        return self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses)
+        return (try? self.bridgeToSwift.mainContext.queryAttributes(from, selectClause, queryClauses))
+            .flatMap({ $0 })
    }
 }
--- a/Sources/CSDataStack+Transaction.swift
+++ b/Sources/CSDataStack+Transaction.swift
@@ -2,7 +2,7 @@
 //  CSDataStack+Transaction.swift
 //  CoreStore
 //
-//  Copyright © 2016 John Rommel Estropia
+//  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
@@ -28,7 +28,7 @@ import Foundation

 // MARK: - CSDataStack

-public extension CSDataStack {
+extension CSDataStack {
    
    /**
     Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
John Estropia	84f3740ea1	fix unit test warnings	2019-01-18 17:30:54 +09:00
John Estropia	6dc48b6af7	Add docs for new throwing methods	2019-01-17 18:43:10 +09:00
John Estropia	09ce2816bf	Merge branch 'develop' into throwables	2019-01-16 17:03:49 +09:00
John Estropia	62e962eebe	Merge pull request #301 from ianbytchek/develop Resolve source entity and managed object attributes by name	2019-01-16 17:01:48 +09:00
John Estropia	682472c1bd	fetches, queries, and deletes are now throwable methods	2019-01-15 20:40:15 +09:00
Ian Bytchek	46ab70b839	Update TravisCI base image to Xcode 10 Replace deprecated build matrix configurations with newer alternatives.	2019-01-13 06:24:04 +00:00
Ian Bytchek	ac8304f977	Resolve source entity and managed object attributes by name Addresses #300 – see it for details. Also improves the use of whitespace consistency across the `CustomSchemaMappingProvider.swift` and uses method names for `cs_resolve…` over `cs_resolved…` for better alignment with [Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines).	2019-01-13 05:41:34 +00:00
John Estropia	5777831565	WIP: make fetching methods throwable	2019-01-11 19:52:12 +09:00
John Estropia	42d1f41939	Provide more context when failing to search for mapping models #299	2019-01-11 19:48:35 +09:00
John Estropia	8c30ec3a3d	minor fixes on Playgrounds and Demo app	2019-01-09 11:59:06 +09:00
John Estropia	237a1b648e	Assert on reserved property names	2019-01-09 11:58:37 +09:00
John Estropia	614f1572c2	print PartialObjects	2018-12-26 22:35:28 +08:00
John Estropia	a48f16aa8c	add Jazzy docs	2018-12-19 16:27:05 +09:00
John Estropia	cdbadae002	added comments to playground	2018-12-18 18:44:47 +09:00
John Estropia	4a28a39df6	removed long-standing workaround for NSFetchedResultsController bugs since they seem to be fixed	2018-12-18 18:43:36 +09:00
John Estropia	5febf2542d	added playgrounds just to show off	2018-12-14 19:28:55 +09:00
John Estropia	c21ab11a41	format header comment	2018-12-14 18:21:41 +09:00
John Estropia	10cd18dbf0	prototype for CoreStoreObject property observers (a.k.a. KVO)	2018-12-14 18:20:42 +09:00
John Estropia	8409a13289	Merge pull request #288 from ruslanskorb/list-monitor-number-of-objects-performance [ListMonitor] Fix performance of `numberOfObjects()`.	2018-12-06 18:53:06 +09:00
Ruslan Skorb	a9a73fa5c4	[ListMonitor] [numberOfObjects()] Return `count` of `fetchedObjects`. Casting `fetchedObjects` to `NSArray?` has better performance. https://github.com/JohnEstropia/CoreStore/pull/288	2018-12-06 10:56:30 +02:00
John Estropia	82cae2e11e	Merge pull request #292 from eliseo-juan/patch-1 Fix documentation	2018-12-06 10:54:50 +09:00
John Estropia	42caee2418	Merge pull request #287 from ruslanskorb/list-monitor-subscript-performance [ListMonitor] Fix performance of `subscript(safeSectionIndex:safeItemIndex:)`.	2018-12-06 10:54:12 +09:00
Eliseo Juan Quintanilla	1dea1d0d06	Fix documentation Changed attribtue to attribute	2018-12-05 10:09:05 +01:00
John Estropia	d344b9d878	minimum deployment version bumped to iOS 10, macOS 10.12, tvOS 10, watchOS 3. Deprecated iCloud Storage	2018-12-05 17:31:16 +09:00
John Estropia	95c1ce52cc	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2018-12-05 16:17:03 +09:00
John Estropia	cc346816d6	Added new error for cases when addStorageAndWait() is used with .allowSynchronousLightweightMigration but migrations are only allowed asynchronously (related to #277 )	2018-12-05 16:15:20 +09:00
John Estropia	f14b561c33	Merge pull request #275 from DmitrijMaz/fix_queueing Fix queue validation for UnsafeDataTransaction	2018-12-05 11:02:47 +09:00
Ruslan Skorb	6f655951aa	[ListMonitor] [numberOfObjects()] Calculate the number of objects in all sections by summing the number of objects stored in `NSFetchedResultsSectionInfo`. There is a performance problem in Swift when calling `count` method on an array with a large number of fetched objects. It requires casting the array between Objective-C and Swift, that is pretty slow.	2018-11-24 16:24:14 +02:00
Ruslan Skorb	ff8fbae568	[ListMonitor] [subscript(safeSectionIndex:safeItemIndex:)] Use `subscript(indexPath:)` after the validation of `sectionIndex` and `itemIndex` to get an object. There is a performance problem in Swift when getting an object from the Objective-C array with a large number of objects using subscript. It requires casting the array between Objective-C and Swift, that is pretty slow.	2018-11-24 16:23:36 +02:00
Dmitry Mazurenko	4d4b02d076	Fix queue validation for UnsafeDataTransaction	2018-10-10 16:48:04 +03:00
John Estropia	06c0981ded	debug string for CoreStoreObject	2018-09-24 00:49:53 +09:00
John Estropia	20d581d536	version bump	2018-09-19 18:48:45 +09:00
John Estropia	45e110755d	deleted unnecessary Equatable and Hashable custom implementations	2018-09-19 11:06:19 +09:00
John Estropia	ab40532801	fix issue with early-deallocated CoreStoreObjects	2018-09-18 23:50:14 +09:00
John Estropia	40f458a09c	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2018-09-15 12:56:21 +09:00
John Estropia	1ad233ca9d	Swift 4.2 support	2018-09-15 12:56:08 +09:00
John Estropia	3a8e394272	Merge pull request #269 from congbach/develop Fixed bug where ListObjectObserver didUpdateObject was not called on …	2018-09-10 19:30:06 +09:00
Ken Bach	1f54daa528	Fixed bug where ListObjectObserver.didUpdateObject was not called on watchos.	2018-08-21 22:47:54 +01:00
John Estropia	f25879b6fe	fix compile error on tvOS and watchOS	2018-08-09 21:04:09 +09:00
John Estropia	8fa3109e91	version bump	2018-08-09 20:45:46 +09:00
John Estropia	808e8ff97a	stabilize NSProgress when lightweight migration falls back to InferredMappingModel	2018-08-09 18:18:21 +09:00
John Estropia	30685d4355	Use InferredMappingModel in case lightweight migration fails for some reason	2018-08-09 02:09:54 +09:00
John Estropia	7152962026	revert	2018-08-09 01:39:16 +09:00
John Estropia	91735e38d1	Fix issue where CoreStoreObjects nested in a type is mismatching classnames before migration	2018-08-08 23:52:47 +09:00
John Estropia	333a50ad9e	Merge pull request #256 from vGubriienko/demo-fix Fixed issue with brightness observing in the Demo	2018-08-03 17:44:40 +09:00
John Rommel Estropia	b7a602fc67	iOS 11 Core Data changes	2018-07-29 23:33:51 +09:00
Viktor Gubriienko	2ff7ecef96	Fixed issue with brightness observing in the Demo	2018-06-12 17:53:00 +03:00
John Rommel Estropia	e3f9139304	version bump	2018-06-10 11:52:47 +09:00
John Rommel Estropia	4aa461872f	specify swift version in podspec	2018-06-10 11:47:03 +09:00
John Rommel Estropia	3d43314076	update readme	2018-04-14 09:05:13 +09:00
John Rommel Estropia	7b1075b759	support compound indexes and unique constraints on CoreStore properties	2018-03-17 23:56:42 +09:00
John Rommel Estropia	0c29e07ddb	support allowsExternalBinaryDataStorage option on Transformable CoreStoreObject properties	2018-03-17 23:56:01 +09:00
John Rommel Estropia	ce91cf22f9	Swift 4.1 support	2018-03-17 23:53:24 +09:00
John Rommel Estropia	2dd033c002	Merge branch 'develop' into prototype/Swift_4_1	2018-03-10 21:09:29 +09:00
John Rommel Estropia	c7fcba112e	Fix bug where ListMonitor sectionIndexTitles are not updated on refetch (fixes #218 )	2018-03-10 21:09:18 +09:00
John Rommel Estropia	c8b1c4358f	Fix bug where ListMonitor sectionIndexTitles are not updated on refetch (fixes #218 )	2018-03-10 21:08:40 +09:00
John Rommel Estropia	5431e2e974	Swift 4.1 support	2018-03-10 21:07:53 +09:00
John Rommel Estropia	83e6082c56	Merge branch 'develop' of github.com:JohnEstropia/CoreStore into develop	2018-01-07 23:25:11 +09:00
John Rommel Estropia	c7bdbbde57	convert value to native type before formatting predicates	2018-01-07 21:06:35 +09:00
John Estropia	abf15c8aa8	Merge pull request #232 from kf99916/external-storage-migration External storage migration	2018-01-06 17:48:38 +09:00
Zheng-Xiang Ke	d9db7e4a82	Typo	2018-01-06 15:00:53 +08:00
John Estropia	65dbc22ddd	Merge pull request #231 from doodzik/patch-1 Fix syntax error in readme	2018-01-06 15:11:48 +09:00
Zheng-Xiang Ke	51961dd737	Migrate external storage	2018-01-06 10:22:44 +08:00
Frederik Dudzik	18a7055cdf	Fix syntax error	2018-01-05 21:16:04 +01:00