XCode 7.3 full support

updated travis XCode version
XCode 7.3 fixes
2026-01-12 04:10:36 +01:00 · 2016-03-23 12:39:11 +09:00 · 2016-03-23 12:14:34 +09:00 · 2016-03-23 12:07:31 +09:00 · 2016-03-12 09:27:59 +09:00 · 2016-03-11 20:59:52 +09:00
99 changed files with 3452 additions and 2011 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata
 Carthage/Build
 CoreStore.xcworkspace/xcuserdata
 .DS_Store
+DerivedData
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.3
 sudo: false
 git:
  submodules: false
@@ -10,19 +10,21 @@ env:
  - LC_CTYPE=en_US.UTF-8
  - LANG=en_US.UTF-8
  matrix:
-    - DESTINATION="OS=9.1,name=iPhone 6s" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6 Plus" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
-    - DESTINATION="OS=8.4,name=iPhone 6" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
-    - DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"	
-    - DESTINATION="OS=8.2,name=iPhone 5" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="CoreStore iOS" SDK=iphonesimulator9.1 RUN_TESTS="YES" POD_LINT="YES"
-    - DESTINATION="arch=x86_64" SCHEME="CoreStore OSX" SDK=macosx10.11 RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=2.0,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.0 RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=9.3,name=iPhone 6s"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus"      SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.2,name=iPhone 5"           SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="CoreStore iOS"     SDK=iphonesimulator9.3  RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="arch=x86_64"                    SCHEME="CoreStore OSX"     SDK=macosx10.11         RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="CoreStore watchOS" SDK=watchsimulator2.2   RUN_TESTS="NO"  POD_LINT="NO"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="CoreStore tvOS"    SDK=appletvsimulator9.2 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
-  - brew update
-  - brew install carthage
+  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
+  - sudo installer -pkg "Carthage.pkg" -target /
+  - rm "Carthage.pkg"
 before_script:
  - carthage update --use-submodules
 script:
@@ -33,8 +35,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 "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
-  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.1" -destination "OS=9.1,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.3" -destination "OS=9.3,name=iPhone 6s" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
+  - xcodebuild -workspace "CoreStore.xcworkspace" -scheme "CoreStore iOS" -sdk "iphonesimulator9.3" -destination "OS=9.3,name=iPhone 6s" -configuration Release ONLY_ACTIVE_ARCH=NO clean test | xcpretty -c;
  - if [ $POD_LINT == "YES" ]; then
      pod lib lint --quick;
    fi
--- a/2
+++ b/2
@@ -1 +1 @@
-github "JohnEstropia/GCDKit" == 1.1.5
+github "JohnEstropia/GCDKit" == 1.1.7
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1 +1 @@
-github "JohnEstropia/GCDKit" "1.1.5"
+github "JohnEstropia/GCDKit" "1.1.7"
--- a/Carthage/Checkouts/GCDKit
+++ b/Carthage/Checkouts/GCDKit
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "1.4.3"
+    s.version = "1.5.4"
    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"
@@ -10,12 +10,13 @@ Pod::Spec.new do |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.source_files = "CoreStore", "CoreStore/**/*.{swift}"
-    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
+    s.osx.exclude_files = "CoreStore/Observing/*.{swift}", "CoreStore/Internal/FetchedResultsControllerDelegate.swift", "CoreStore/Internal/CoreStoreFetchedResultsController.swift", "CoreStore/Convenience Helpers/NSFetchedResultsController+Convenience.swift"
    s.frameworks = "Foundation", "CoreData"
    s.requires_arc = true
    s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-D USE_FRAMEWORKS' }
    
-    s.dependency "GCDKit", "1.1.5"
+    s.dependency "GCDKit", "1.2.1"
 end
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -11,10 +11,79 @@
 		2F03A54019C5C6DA005002A5 /* CoreStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */; };
 		2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A54C19C5C872005002A5 /* CoreData.framework */; };
 		2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
+		82BA18931C4BBCBA00A0916E /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82BA18891C4BBCBA00A0916E /* CoreStore.framework */; };
+		82BA18A01C4BBD1400A0916E /* CoreStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F03A53519C5C6DA005002A5 /* CoreStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		82BA18A11C4BBD1D00A0916E /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
+		82BA18A21C4BBD1D00A0916E /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; };
+		82BA18A31C4BBD2200A0916E /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; };
+		82BA18A41C4BBD2200A0916E /* PersistentStoreResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */; };
+		82BA18A51C4BBD2200A0916E /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; };
+		82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; };
+		82BA18A71C4BBD2900A0916E /* CoreStore+Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE41AFF84610064E85B /* CoreStore+Logging.swift */; };
+		82BA18A81C4BBD2900A0916E /* CoreStoreLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE51AFF84610064E85B /* CoreStoreLogger.swift */; };
+		82BA18A91C4BBD3100A0916E /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; };
+		82BA18AA1C4BBD3100A0916E /* BaseDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */; };
+		82BA18AB1C4BBD3100A0916E /* AsynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */; };
+		82BA18AC1C4BBD3100A0916E /* SynchronousDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */; };
+		82BA18AD1C4BBD3100A0916E /* UnsafeDataTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EED1AFF846E0064E85B /* UnsafeDataTransaction.swift */; };
+		82BA18AE1C4BBD3100A0916E /* DataStack+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */; };
+		82BA18AF1C4BBD3100A0916E /* CoreStore+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */; };
+		82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
+		82BA18B11C4BBD3100A0916E /* SaveResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EF21AFF846E0064E85B /* SaveResult.swift */; };
+		82BA18B21C4BBD3900A0916E /* ImportableObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8C1B9AA97D007C5CBB /* ImportableObject.swift */; };
+		82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F1DA8F1B9AA991007C5CBB /* ImportableUniqueObject.swift */; };
+		82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; };
+		82BA18B51C4BBD3F00A0916E /* BaseDataTransaction+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EFE1AFF847B0064E85B /* BaseDataTransaction+Querying.swift */; };
+		82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F061AFF847B0064E85B /* DataStack+Querying.swift */; };
+		82BA18B71C4BBD3F00A0916E /* CoreStore+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */; };
+		82BA18B81C4BBD4200A0916E /* ClauseTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */; };
+		82BA18B91C4BBD4A00A0916E /* From.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F011AFF847B0064E85B /* From.swift */; };
+		82BA18BA1C4BBD4A00A0916E /* Select.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F031AFF847B0064E85B /* Select.swift */; };
+		82BA18BB1C4BBD4A00A0916E /* Where.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F051AFF847B0064E85B /* Where.swift */; };
+		82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F041AFF847B0064E85B /* OrderBy.swift */; };
+		82BA18BD1C4BBD4A00A0916E /* GroupBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F021AFF847B0064E85B /* GroupBy.swift */; };
+		82BA18BE1C4BBD4A00A0916E /* Tweak.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F001AFF847B0064E85B /* Tweak.swift */; };
+		82BA18BF1C4BBD5300A0916E /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; };
+		82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */; };
+		82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */; };
+		82BA18C21C4BBD5300A0916E /* ObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */; };
+		82BA18C31C4BBD5300A0916E /* ObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */; };
+		82BA18C41C4BBD5300A0916E /* ListMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ListMonitor.swift */; };
+		82BA18C51C4BBD5300A0916E /* ListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ListObserver.swift */; };
+		82BA18C61C4BBD5900A0916E /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; };
+		82BA18C71C4BBD5900A0916E /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; };
+		82BA18C81C4BBD5900A0916E /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; };
+		82BA18C91C4BBD5900A0916E /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; };
+		82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; };
+		82BA18CB1C4BBD6400A0916E /* NSManagedObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */; };
+		82BA18CC1C4BBD6400A0916E /* NSProgress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */; };
+		82BA18CD1C4BBD7100A0916E /* AssociatedObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */; };
+		82BA18CE1C4BBD7100A0916E /* FetchedResultsControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54A6A541BA15F2A007870FD /* FetchedResultsControllerDelegate.swift */; };
+		82BA18CF1C4BBD7100A0916E /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; };
+		82BA18D01C4BBD7100A0916E /* MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* MigrationManager.swift */; };
+		82BA18D11C4BBD7100A0916E /* NotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */; };
+		82BA18D21C4BBD7100A0916E /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; };
+		82BA18D31C4BBD7100A0916E /* NSManagedObjectContext+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */; };
+		82BA18D41C4BBD7100A0916E /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; };
+		82BA18D51C4BBD7100A0916E /* NSManagedObjectContext+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */; };
+		82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */; };
+		82BA18D71C4BBD7100A0916E /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; };
+		82BA18D81C4BBD7100A0916E /* WeakObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2D1AFF849C0064E85B /* WeakObject.swift */; };
+		82BA18D91C4BBD9700A0916E /* CoreStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */; };
+		82BA18DA1C4BBD9700A0916E /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; };
+		82BA18DB1C4BBD9700A0916E /* TestEntity2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */; };
+		82BA18DC1C4BBD9C00A0916E /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
+		82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
+		82BA18DF1C4BBE2600A0916E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82BA18DE1C4BBE2600A0916E /* Foundation.framework */; };
+		82BA18E11C4BBE2C00A0916E /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82BA18E01C4BBE2C00A0916E /* CoreData.framework */; };
 		B50392F91C478FF3009900CA /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
 		B50392FA1C47963F009900CA /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
 		B50392FB1C479640009900CA /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */; };
 		B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; };
+		B519E4581C4CD2CA00E7B469 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B519E4571C4CD2CA00E7B469 /* GCDKit.framework */; };
+		B519E4591C4CD2D100E7B469 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B519E4571C4CD2CA00E7B469 /* GCDKit.framework */; };
+		B519E45A1C4CD2DA00E7B469 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B519E4571C4CD2CA00E7B469 /* GCDKit.framework */; };
+		B519E45B1C4CD2ED00E7B469 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B519E4571C4CD2CA00E7B469 /* GCDKit.framework */; };
 		B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; };
 		B5202CFA1C04688100DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
 		B5202CFD1C046E8400DED140 /* NSFetchedResultsController+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */; };
@@ -139,8 +208,12 @@
 		B56965241B356B820075EE4A /* MigrationResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965231B356B820075EE4A /* MigrationResult.swift */; };
 		B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */; };
 		B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A261201B64BFDB006EB6D3 /* MigrationType.swift */; };
-		B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; };
-		B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC91C1C2023CF008147CD /* GCDKit.framework */; };
+		B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
+		B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
+		B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */; };
+		B5C976E71C6E3A5A00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */; };
+		B5C976E81C6E3A5D00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */; };
+		B5C976E91C6E3A5E00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */; };
 		B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */; };
 		B5D372841A39CD6900F583D9 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B5D372821A39CD6900F583D9 /* Model.xcdatamodeld */; };
 		B5D372861A39CDDB00F583D9 /* TestEntity1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D372851A39CDDB00F583D9 /* TestEntity1.swift */; };
@@ -192,6 +265,13 @@
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
+		82BA18941C4BBCBA00A0916E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 82BA18881C4BBCBA00A0916E;
+			remoteInfo = "CoreStore tvOS";
+		};
 		B52DD17F1BE1F8CD00949AFE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 2F03A52719C5C6DA005002A5 /* Project object */;
@@ -217,8 +297,13 @@
 		2F03A53F19C5C6DA005002A5 /* CoreStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStoreTests.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		2F03A54C19C5C872005002A5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		2F291E2619C6D3CF007AF63F /* CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = CoreStore.swift; sourceTree = "<group>"; };
+		82BA18891C4BBCBA00A0916E /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		82BA18921C4BBCBA00A0916E /* CoreStoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreStoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		82BA18DE1C4BBE2600A0916E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
+		82BA18E01C4BBE2C00A0916E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
 		B50392F81C478FF3009900CA /* NSManagedObject+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Transaction.swift"; sourceTree = "<group>"; };
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
+		B519E4571C4CD2CA00E7B469 /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<group>"; };
 		B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = "<group>"; };
 		B5202CF91C04688100DED140 /* NSFetchedResultsController+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFetchedResultsController+Convenience.swift"; sourceTree = "<group>"; };
 		B52DD1741BE1F8CC00949AFE /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -237,8 +322,9 @@
 		B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFileManager+Setup.swift"; sourceTree = "<group>"; };
 		B5A261201B64BFDB006EB6D3 /* MigrationType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationType.swift; sourceTree = "<group>"; };
 		B5BDC91A1C202269008147CD /* CartFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CartFile; sourceTree = "<group>"; };
-		B5BDC91C1C2023CF008147CD /* GCDKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDKit.framework; path = "../../../Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<group>"; };
 		B5BDC9271C2024F2008147CD /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
+		B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UnsafeDataTransaction+Observing.swift"; sourceTree = "<group>"; };
+		B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreStoreFetchedResultsController.swift; sourceTree = "<group>"; };
 		B5D1E22B19FA9FBC003B2874 /* NSError+CoreStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSError+CoreStore.swift"; sourceTree = "<group>"; };
 		B5D372831A39CD6900F583D9 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		B5D372851A39CDDB00F583D9 /* TestEntity1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity1.swift; sourceTree = "<group>"; };
@@ -297,7 +383,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5BDC91D1C2023CF008147CD /* GCDKit.framework in Frameworks */,
+				B519E4581C4CD2CA00E7B469 /* GCDKit.framework in Frameworks */,
 				B5D39A0219FD00C9000E91BB /* Foundation.framework in Frameworks */,
 				2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */,
 			);
@@ -310,11 +396,29 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		82BA18851C4BBCBA00A0916E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B519E4591C4CD2D100E7B469 /* GCDKit.framework in Frameworks */,
+				82BA18E11C4BBE2C00A0916E /* CoreData.framework in Frameworks */,
+				82BA18DF1C4BBE2600A0916E /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		82BA188F1C4BBCBA00A0916E /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				82BA18931C4BBCBA00A0916E /* CoreStore.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B52DD1701BE1F8CC00949AFE /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5BDC91E1C2023E8008147CD /* GCDKit.framework in Frameworks */,
+				B519E45A1C4CD2DA00E7B469 /* GCDKit.framework in Frameworks */,
 				B52DD1921BE1F8F000949AFE /* CoreData.framework in Frameworks */,
 				B52DD1911BE1F8EB00949AFE /* Foundation.framework in Frameworks */,
 			);
@@ -332,6 +436,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B519E45B1C4CD2ED00E7B469 /* GCDKit.framework in Frameworks */,
 				B563217C1BD650E3006C9394 /* Foundation.framework in Frameworks */,
 				B563217A1BD650DE006C9394 /* CoreData.framework in Frameworks */,
 			);
@@ -358,6 +463,8 @@
 				B563216F1BD65082006C9394 /* CoreStore.framework */,
 				B52DD1741BE1F8CC00949AFE /* CoreStore.framework */,
 				B52DD17D1BE1F8CC00949AFE /* CoreStoreTests.xctest */,
+				82BA18891C4BBCBA00A0916E /* CoreStore.framework */,
+				82BA18921C4BBCBA00A0916E /* CoreStoreTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -418,12 +525,14 @@
 		2F291E3119C6D4D3007AF63F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				B5BDC91C1C2023CF008147CD /* GCDKit.framework */,
+				B519E4571C4CD2CA00E7B469 /* GCDKit.framework */,
 				B5548CD71BD65AE50077652A /* CoreData.framework */,
 				B56321791BD650DE006C9394 /* CoreData.framework */,
+				82BA18E01C4BBE2C00A0916E /* CoreData.framework */,
 				2F03A54C19C5C872005002A5 /* CoreData.framework */,
 				B5548CD51BD65AE00077652A /* Foundation.framework */,
 				B563217B1BD650E3006C9394 /* Foundation.framework */,
+				82BA18DE1C4BBE2600A0916E /* Foundation.framework */,
 				B5D39A0119FD00C9000E91BB /* Foundation.framework */,
 			);
 			name = Frameworks;
@@ -526,6 +635,7 @@
 				B56007131B3F6C2800A9A8F9 /* SectionBy.swift */,
 				B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */,
 				B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */,
+				B5C976E21C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift */,
 				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
 				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
 				B5E84F1D1AFF84860064E85B /* ListMonitor.swift */,
@@ -553,6 +663,7 @@
 				B5FAD6AB1B51285300714891 /* MigrationManager.swift */,
 				B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */,
 				B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */,
+				B5C976E61C6E3A5900B1AF90 /* CoreStoreFetchedResultsController.swift */,
 				B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */,
 				B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */,
 				B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */,
@@ -574,6 +685,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		82BA18861C4BBCBA00A0916E /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				82BA18A01C4BBD1400A0916E /* CoreStore.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B52DD1711BE1F8CC00949AFE /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -629,6 +748,42 @@
 			productReference = 2F03A53B19C5C6DA005002A5 /* CoreStoreTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		82BA18881C4BBCBA00A0916E /* CoreStore tvOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 82BA189E1C4BBCBA00A0916E /* Build configuration list for PBXNativeTarget "CoreStore tvOS" */;
+			buildPhases = (
+				82BA18841C4BBCBA00A0916E /* Sources */,
+				82BA18851C4BBCBA00A0916E /* Frameworks */,
+				82BA18861C4BBCBA00A0916E /* Headers */,
+				82BA18871C4BBCBA00A0916E /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "CoreStore tvOS";
+			productName = "CoreStore tvOS";
+			productReference = 82BA18891C4BBCBA00A0916E /* CoreStore.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		82BA18911C4BBCBA00A0916E /* CoreStoreTests tvOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 82BA189F1C4BBCBA00A0916E /* Build configuration list for PBXNativeTarget "CoreStoreTests tvOS" */;
+			buildPhases = (
+				82BA188E1C4BBCBA00A0916E /* Sources */,
+				82BA188F1C4BBCBA00A0916E /* Frameworks */,
+				82BA18901C4BBCBA00A0916E /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				82BA18951C4BBCBA00A0916E /* PBXTargetDependency */,
+			);
+			name = "CoreStoreTests tvOS";
+			productName = "CoreStore tvOSTests";
+			productReference = 82BA18921C4BBCBA00A0916E /* CoreStoreTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		B52DD1731BE1F8CC00949AFE /* CoreStore OSX */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = B52DD18C1BE1F8CD00949AFE /* Build configuration list for PBXNativeTarget "CoreStore OSX" */;
@@ -689,7 +844,7 @@
 		2F03A52719C5C6DA005002A5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0710;
+				LastSwiftUpdateCheck = 0720;
 				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
@@ -699,6 +854,12 @@
 					2F03A53A19C5C6DA005002A5 = {
 						CreatedOnToolsVersion = 6.0;
 					};
+					82BA18881C4BBCBA00A0916E = {
+						CreatedOnToolsVersion = 7.2;
+					};
+					82BA18911C4BBCBA00A0916E = {
+						CreatedOnToolsVersion = 7.2;
+					};
 					B52DD1731BE1F8CC00949AFE = {
 						CreatedOnToolsVersion = 7.1;
 					};
@@ -725,6 +886,8 @@
 			targets = (
 				2F03A52F19C5C6DA005002A5 /* CoreStore iOS */,
 				2F03A53A19C5C6DA005002A5 /* CoreStoreTests iOS */,
+				82BA18881C4BBCBA00A0916E /* CoreStore tvOS */,
+				82BA18911C4BBCBA00A0916E /* CoreStoreTests tvOS */,
 				B563216E1BD65082006C9394 /* CoreStore watchOS */,
 				B52DD1731BE1F8CC00949AFE /* CoreStore OSX */,
 				B52DD17C1BE1F8CC00949AFE /* CoreStoreTests OSX */,
@@ -747,6 +910,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		82BA18871C4BBCBA00A0916E /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		82BA18901C4BBCBA00A0916E /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B52DD1721BE1F8CC00949AFE /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -776,6 +953,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
+				B5C976E71C6E3A5A00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */,
 				B5F1DA901B9AA991007C5CBB /* ImportableUniqueObject.swift in Sources */,
 				B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */,
 				B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */,
@@ -785,6 +963,7 @@
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
 				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */,
+				B5C976E31C6C9F6A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
 				B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
@@ -846,6 +1025,83 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		82BA18841C4BBCBA00A0916E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				82BA18B61C4BBD3F00A0916E /* DataStack+Querying.swift in Sources */,
+				B5C976E81C6E3A5D00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */,
+				82BA18A21C4BBD1D00A0916E /* NSError+CoreStore.swift in Sources */,
+				82BA18B21C4BBD3900A0916E /* ImportableObject.swift in Sources */,
+				82BA18AE1C4BBD3100A0916E /* DataStack+Transaction.swift in Sources */,
+				82BA18AB1C4BBD3100A0916E /* AsynchronousDataTransaction.swift in Sources */,
+				82BA18CE1C4BBD7100A0916E /* FetchedResultsControllerDelegate.swift in Sources */,
+				82BA18C51C4BBD5300A0916E /* ListObserver.swift in Sources */,
+				82BA18C21C4BBD5300A0916E /* ObjectMonitor.swift in Sources */,
+				82BA18A51C4BBD2200A0916E /* CoreStore+Setup.swift in Sources */,
+				82BA18BD1C4BBD4A00A0916E /* GroupBy.swift in Sources */,
+				B5C976E41C6C9F9A00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
+				82BA18B31C4BBD3900A0916E /* ImportableUniqueObject.swift in Sources */,
+				82BA18A11C4BBD1D00A0916E /* CoreStore.swift in Sources */,
+				82BA18CF1C4BBD7100A0916E /* Functions.swift in Sources */,
+				82BA18A31C4BBD2200A0916E /* DataStack.swift in Sources */,
+				82BA18C81C4BBD5900A0916E /* MigrationChain.swift in Sources */,
+				82BA18B11C4BBD3100A0916E /* SaveResult.swift in Sources */,
+				82BA18DD1C4BBE1400A0916E /* NSFetchedResultsController+Convenience.swift in Sources */,
+				82BA18B41C4BBD3900A0916E /* BaseDataTransaction+Importing.swift in Sources */,
+				82BA18CA1C4BBD5900A0916E /* MigrationResult.swift in Sources */,
+				82BA18C11C4BBD5300A0916E /* CoreStore+Observing.swift in Sources */,
+				82BA18BC1C4BBD4A00A0916E /* OrderBy.swift in Sources */,
+				82BA18B01C4BBD3100A0916E /* NSManagedObject+Transaction.swift in Sources */,
+				82BA18D41C4BBD7100A0916E /* NSManagedObjectContext+Querying.swift in Sources */,
+				82BA18D51C4BBD7100A0916E /* NSManagedObjectContext+Setup.swift in Sources */,
+				82BA18C91C4BBD5900A0916E /* MigrationType.swift in Sources */,
+				82BA18D01C4BBD7100A0916E /* MigrationManager.swift in Sources */,
+				82BA18C61C4BBD5900A0916E /* DataStack+Migration.swift in Sources */,
+				82BA18CD1C4BBD7100A0916E /* AssociatedObjects.swift in Sources */,
+				82BA18B71C4BBD3F00A0916E /* CoreStore+Querying.swift in Sources */,
+				82BA18A41C4BBD2200A0916E /* PersistentStoreResult.swift in Sources */,
+				82BA18AA1C4BBD3100A0916E /* BaseDataTransaction.swift in Sources */,
+				82BA18A91C4BBD3100A0916E /* Into.swift in Sources */,
+				82BA18D11C4BBD7100A0916E /* NotificationObserver.swift in Sources */,
+				82BA18BB1C4BBD4A00A0916E /* Where.swift in Sources */,
+				82BA18D71C4BBD7100A0916E /* NSManagedObjectModel+Setup.swift in Sources */,
+				82BA18C31C4BBD5300A0916E /* ObjectObserver.swift in Sources */,
+				82BA18D21C4BBD7100A0916E /* NSFileManager+Setup.swift in Sources */,
+				82BA18BF1C4BBD5300A0916E /* SectionBy.swift in Sources */,
+				82BA18AC1C4BBD3100A0916E /* SynchronousDataTransaction.swift in Sources */,
+				82BA18C71C4BBD5900A0916E /* CoreStore+Migration.swift in Sources */,
+				82BA18C41C4BBD5300A0916E /* ListMonitor.swift in Sources */,
+				82BA18BA1C4BBD4A00A0916E /* Select.swift in Sources */,
+				82BA18A71C4BBD2900A0916E /* CoreStore+Logging.swift in Sources */,
+				82BA18D81C4BBD7100A0916E /* WeakObject.swift in Sources */,
+				82BA18AF1C4BBD3100A0916E /* CoreStore+Transaction.swift in Sources */,
+				82BA18CB1C4BBD6400A0916E /* NSManagedObject+Convenience.swift in Sources */,
+				82BA18B51C4BBD3F00A0916E /* BaseDataTransaction+Querying.swift in Sources */,
+				82BA18D31C4BBD7100A0916E /* NSManagedObjectContext+CoreStore.swift in Sources */,
+				82BA18AD1C4BBD3100A0916E /* UnsafeDataTransaction.swift in Sources */,
+				82BA18A81C4BBD2900A0916E /* CoreStoreLogger.swift in Sources */,
+				82BA18B81C4BBD4200A0916E /* ClauseTypes.swift in Sources */,
+				82BA18D61C4BBD7100A0916E /* NSManagedObjectContext+Transaction.swift in Sources */,
+				82BA18B91C4BBD4A00A0916E /* From.swift in Sources */,
+				82BA18BE1C4BBD4A00A0916E /* Tweak.swift in Sources */,
+				82BA18CC1C4BBD6400A0916E /* NSProgress+Convenience.swift in Sources */,
+				82BA18C01C4BBD5300A0916E /* DataStack+Observing.swift in Sources */,
+				82BA18A61C4BBD2900A0916E /* DefaultLogger.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		82BA188E1C4BBCBA00A0916E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				82BA18DA1C4BBD9700A0916E /* TestEntity1.swift in Sources */,
+				82BA18DB1C4BBD9700A0916E /* TestEntity2.swift in Sources */,
+				82BA18D91C4BBD9700A0916E /* CoreStoreTests.swift in Sources */,
+				82BA18DC1C4BBD9C00A0916E /* Model.xcdatamodeld in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		B52DD16F1BE1F8CC00949AFE /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -917,6 +1173,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				B56321A91BD65219006C9394 /* NSProgress+Convenience.swift in Sources */,
+				B5C976E91C6E3A5E00B1AF90 /* CoreStoreFetchedResultsController.swift in Sources */,
 				B56321801BD65216006C9394 /* NSError+CoreStore.swift in Sources */,
 				B56321AD1BD6521C006C9394 /* MigrationManager.swift in Sources */,
 				B563219D1BD65216006C9394 /* DataStack+Observing.swift in Sources */,
@@ -926,6 +1183,7 @@
 				B563219E1BD65216006C9394 /* CoreStore+Observing.swift in Sources */,
 				B56321891BD65216006C9394 /* AsynchronousDataTransaction.swift in Sources */,
 				B56321831BD65216006C9394 /* CoreStore+Setup.swift in Sources */,
+				B5C976E51C6C9F9B00B1AF90 /* UnsafeDataTransaction+Observing.swift in Sources */,
 				B563217F1BD65216006C9394 /* CoreStore.swift in Sources */,
 				B56321911BD65216006C9394 /* BaseDataTransaction+Importing.swift in Sources */,
 				B56321941BD65216006C9394 /* CoreStore+Querying.swift in Sources */,
@@ -979,6 +1237,11 @@
 /* End PBXSourcesBuildPhase section */

 /* Begin PBXTargetDependency section */
+		82BA18951C4BBCBA00A0916E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 82BA18881C4BBCBA00A0916E /* CoreStore tvOS */;
+			targetProxy = 82BA18941C4BBCBA00A0916E /* PBXContainerItemProxy */;
+		};
 		B52DD1801BE1F8CD00949AFE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = B52DD1731BE1F8CC00949AFE /* CoreStore OSX */;
@@ -1036,6 +1299,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1079,6 +1343,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1099,6 +1364,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStore;
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -1116,6 +1382,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStore;
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 			};
 			name = Release;
@@ -1124,7 +1391,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -1133,6 +1399,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
+				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -1141,11 +1408,76 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				INFOPLIST_FILE = CoreStoreTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = CoreStoreTests;
+				SDKROOT = iphoneos;
+			};
+			name = Release;
+		};
+		82BA189A1C4BBCBA00A0916E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStore/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = CoreStore;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = 3;
+			};
+			name = Debug;
+		};
+		82BA189B1C4BBCBA00A0916E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStore/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = CoreStore;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = 3;
+			};
+			name = Release;
+		};
+		82BA189C1C4BBCBA00A0916E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStoreTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = CoreStoreTests;
+				SDKROOT = appletvos;
+				TARGETED_DEVICE_FAMILY = 3;
+			};
+			name = Debug;
+		};
+		82BA189D1C4BBCBA00A0916E /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				INFOPLIST_FILE = CoreStoreTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = CoreStoreTests;
+				SDKROOT = appletvos;
+				TARGETED_DEVICE_FAMILY = 3;
 			};
 			name = Release;
 		};
@@ -1301,6 +1633,24 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		82BA189E1C4BBCBA00A0916E /* Build configuration list for PBXNativeTarget "CoreStore tvOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				82BA189A1C4BBCBA00A0916E /* Debug */,
+				82BA189B1C4BBCBA00A0916E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		82BA189F1C4BBCBA00A0916E /* Build configuration list for PBXNativeTarget "CoreStoreTests tvOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				82BA189C1C4BBCBA00A0916E /* Debug */,
+				82BA189D1C4BBCBA00A0916E /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		B52DD18C1BE1F8CD00949AFE /* Build configuration list for PBXNativeTarget "CoreStore OSX" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
--- a/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
+++ b/CoreStore.xcodeproj/xcshareddata/xcschemes/CoreStore
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+               BuildableName = "CoreStore.framework"
+               BlueprintName = "CoreStore tvOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "82BA18911C4BBCBA00A0916E"
+               BuildableName = "CoreStoreTests.xctest"
+               BlueprintName = "CoreStoreTests tvOS"
+               ReferencedContainer = "container:CoreStore.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "82BA18881C4BBCBA00A0916E"
+            BuildableName = "CoreStore.framework"
+            BlueprintName = "CoreStore tvOS"
+            ReferencedContainer = "container:CoreStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/CoreStore/CartFile
+++ b/CoreStore/CartFile
@@ -1 +1 @@
-github "JohnEstropia/GCDKit" == 1.1.5
+github "JohnEstropia/GCDKit" == 1.2.1
--- a/Helpers/NSFetchedResultsController+Convenience.swift
+++ b/Helpers/NSFetchedResultsController+Convenience.swift
@@ -2,7 +2,7 @@
 //  NSManagedObject+Convenience.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,15 +31,43 @@ import CoreData

 public extension NSFetchedResultsController {
    
+    /**
+     Utility for creating an `NSFetchedResultsController` from a `DataStack`. This is useful to partially support Objective-C classes by passing an `NSFetchedResultsController` instance instead of a `ListMonitor`.
+     */
+    public static func createForStack<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController {
+        
+        return CoreStoreFetchedResultsController<T>(
+            context: dataStack.mainContext,
+            fetchRequest: fetchRequest,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    @available(*, deprecated=1.5.2, message="Use NSFetchedResultsController.createForStack(_:fetchRequest:from:sectionBy:fetchClauses:) to create NSFetchedResultsControllers directly")
    public convenience init<T: NSManagedObject>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) {
        
        let context = dataStack.mainContext
-        from?.applyToFetchRequest(fetchRequest, context: context)
+        from?.applyToFetchRequest(fetchRequest, context: context, applyAffectedStores: false)
        for clause in fetchClauses {
            
            clause.applyToFetchRequest(fetchRequest)
        }
        
+        if let from = from {
+            
+            from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+        }
+        else {
+            
+            guard let from = (fetchRequest.entity.flatMap { $0.managedObjectClassName }).flatMap(NSClassFromString).flatMap(From.init) else {
+                
+                fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a  From clause or an NSEntityDescription.")
+            }
+            from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+        }
+        
        self.init(
            fetchRequest: fetchRequest,
            managedObjectContext: context,
@@ -47,4 +75,18 @@ public extension NSFetchedResultsController {
            cacheName: nil
        )
    }
+    
+    
+    // MARK: Internal
+    
+    internal static func createFromContext<T: NSManagedObject>(context: NSManagedObjectContext, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) -> NSFetchedResultsController {
+        
+        return CoreStoreFetchedResultsController<T>(
+            context: context,
+            fetchRequest: fetchRequest,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
 }
--- a/Helpers/NSManagedObject+Convenience.swift
+++ b/Helpers/NSManagedObject+Convenience.swift
@@ -2,7 +2,7 @@
 //  NSManagedObject+Convenience.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -32,11 +32,11 @@ import CoreData
 public extension NSManagedObject {
    
    /**
-    Provides a convenience wrapper for accessing `primitiveValueForKey(...)` with proper calls to `willAccessValueForKey(...)` and `didAccessValueForKey(...)`. This is useful when implementing accessor methods for transient attributes.
-    
-    - parameter KVCKey: the KVC key
-    - returns: the primitive value for the KVC key
-    */
+     Provides a convenience wrapper for accessing `primitiveValueForKey(...)` with proper calls to `willAccessValueForKey(...)` and `didAccessValueForKey(...)`. This is useful when implementing accessor methods for transient attributes.
+     
+     - parameter KVCKey: the KVC key
+     - returns: the primitive value for the KVC key
+     */
    @warn_unused_result
    public func accessValueForKVCKey(KVCKey: KeyPath) -> AnyObject? {
        
@@ -48,11 +48,11 @@ public extension NSManagedObject {
    }
    
    /**
-    Provides a convenience wrapper for setting `setPrimitiveValue(...)` with proper calls to `willChangeValueForKey(...)` and `didChangeValueForKey(...)`. This is useful when implementing mutator methods for transient attributes.
-    
-    - parameter value: the value to set the KVC key with
-    - parameter KVCKey: the KVC key
-    */
+     Provides a convenience wrapper for setting `setPrimitiveValue(...)` with proper calls to `willChangeValueForKey(...)` and `didChangeValueForKey(...)`. This is useful when implementing mutator methods for transient attributes.
+     
+     - parameter value: the value to set the KVC key with
+     - parameter KVCKey: the KVC key
+     */
    public func setValue(value: AnyObject?, forKVCKey KVCKey: KeyPath) {
        
        self.willChangeValueForKey(KVCKey)
@@ -61,16 +61,16 @@ public extension NSManagedObject {
    }
    
    /**
-    Re-faults the object to use the latest values from the persistent store
-    */
+     Re-faults the object to use the latest values from the persistent store
+     */
    public func refreshAsFault() {
        
        self.managedObjectContext?.refreshObject(self, mergeChanges: false)
    }
    
    /**
-    Re-faults the object to use the latest values from the persistent store and merges previously pending changes back
-    */
+     Re-faults the object to use the latest values from the persistent store and merges previously pending changes back
+     */
    public func refreshAndMerge() {
        
        self.managedObjectContext?.refreshObject(self, mergeChanges: true)
--- a/Helpers/NSProgress+Convenience.swift
+++ b/Helpers/NSProgress+Convenience.swift
@@ -2,7 +2,7 @@
 //  NSProgress+Convenience.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -33,12 +33,10 @@ import Foundation

 public extension NSProgress {
    
-    // MARK: Public
-    
    /**
-    Sets a closure that the `NSProgress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO.
-    - parameter closure: the closure to execute on progress change
-    */
+     Sets a closure that the `NSProgress` calls whenever its `fractionCompleted` changes. You can use this instead of setting up KVO.
+     - parameter closure: the closure to execute on progress change
+     */
    public func setProgressHandler(closure: ((progress: NSProgress) -> Void)?) {
        
        self.progressObserver.progressHandler = closure
--- a/CoreStore/CoreStore.h
+++ b/CoreStore/CoreStore.h
@@ -2,7 +2,7 @@
 //  CoreStore.h
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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,4 +28,3 @@

 FOUNDATION_EXPORT double CoreStoreVersionNumber;
 FOUNDATION_EXPORT const unsigned char CoreStoreVersionString[];
-
--- a/CoreStore/CoreStore.swift
+++ b/CoreStore/CoreStore.swift
@@ -2,7 +2,7 @@
 //  CoreStore.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -32,17 +32,15 @@ import CoreData
 // MARK: - CoreStore

 /**
-`CoreStore` is the main entry point for all other APIs.
-*/
+ `CoreStore` is the main entry point for all other APIs.
+ */
 public enum CoreStore {
    
-    // MARK: Public
-    
    /**
-    The default `DataStack` instance to be used. If `defaultStack` is not set before the first time accessed, a default-configured `DataStack` will be created.
-    
-    Changing the `defaultStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
-    */
+     The default `DataStack` instance to be used. If `defaultStack` is not set before the first time accessed, a default-configured `DataStack` will be created.
+     
+     Changing the `defaultStack` is thread safe, but it is recommended to setup `DataStacks` on a common queue (e.g. the main queue).
+     */
    public static var defaultStack: DataStack {
        
        get {
--- a/Querying/BaseDataTransaction+Querying.swift
+++ b/Querying/BaseDataTransaction+Querying.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Querying.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,14 +31,12 @@ import CoreData

 public extension BaseDataTransaction {
    
-    // MARK: Public
-    
    /**
-    Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
-    
-    - parameter object: a reference to the object created/fetched outside the transaction
-    - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
-    */
+     Fetches the `NSManagedObject` instance in the transaction's context from a reference created from a transaction or from a different managed object context.
+     
+     - parameter object: a reference to the object created/fetched outside the transaction
+     - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject>(object: T) -> T? {
        
@@ -53,11 +51,11 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObject` instance in the transaction's context from an `NSManagedObjectID`.
-    
-    - parameter objectID: the `NSManagedObjectID` for the object
-    - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
-    */
+     Fetches the `NSManagedObject` instance in the transaction's context from an `NSManagedObjectID`.
+     
+     - parameter objectID: the `NSManagedObjectID` for the object
+     - returns: the `NSManagedObject` instance if the object exists in the transaction, or `nil` if not found.
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
        
@@ -72,11 +70,11 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObject` instances in the transaction's context from references created from a transaction or from a different managed object context.
-    
-    - parameter objects: an array of `NSManagedObject`s created/fetched outside the transaction
-    - returns: the `NSManagedObject` array for objects that exists in the transaction
-    */
+     Fetches the `NSManagedObject` instances in the transaction's context from references created from a transaction or from a different managed object context.
+     
+     - parameter objects: an array of `NSManagedObject`s created/fetched outside the transaction
+     - returns: the `NSManagedObject` array for objects that exists in the transaction
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
        
@@ -84,11 +82,11 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObject` instances in the transaction's context from a list of `NSManagedObjectID`.
-    
-    - parameter objectIDs: the `NSManagedObjectID` array for the objects
-    - returns: the `NSManagedObject` array for objects that exists in the transaction
-    */
+     Fetches the `NSManagedObject` instances in the transaction's context from a list of `NSManagedObjectID`.
+     
+     - parameter objectIDs: the `NSManagedObjectID` array for the objects
+     - returns: the `NSManagedObject` array for objects that exists in the transaction
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
        
@@ -96,12 +94,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
@@ -114,12 +112,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
@@ -132,12 +130,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
@@ -150,12 +148,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
@@ -168,12 +166,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
@@ -186,12 +184,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
@@ -204,12 +202,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
@@ -222,12 +220,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
@@ -240,12 +238,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
@@ -258,12 +256,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
@@ -276,12 +274,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number of `NSManagedObject`s deleted
-    */
+     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number of `NSManagedObject`s deleted
+     */
    public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: DeleteClause...) -> Int? {
        
        CoreStore.assert(
@@ -293,12 +291,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number of `NSManagedObject`s deleted
-    */
+     Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter deleteClauses: a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number of `NSManagedObject`s deleted
+     */
    public func deleteAll<T: NSManagedObject>(from: From<T>, _ deleteClauses: [DeleteClause]) -> Int? {
        
        CoreStore.assert(
@@ -310,15 +308,15 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
@@ -331,15 +329,15 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Queries aggregate values or aggregates as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries aggregate values or aggregates as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
@@ -352,15 +350,15 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
@@ -373,15 +371,15 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
--- a/Clauses/From.swift
+++ b/Clauses/From.swift
@@ -2,7 +2,7 @@
 //  From.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,115 +30,269 @@ import CoreData
 // MARK: - From

 /**
-A `Form` clause binds the `NSManagedObject` entity type to the generics type system.
-*/
+ A `From` clause specifies the source entity and source persistent store for fetch and query methods. A common usage is to just indicate the entity:
+ ```
+ let person = transaction.fetchOne(From(MyPersonEntity))
+ ```
+ For cases where multiple `NSPersistentStore`s contain the same entity, the source configuration's name needs to be specified as well:
+ ```
+ let person = transaction.fetchOne(From<MyPersonEntity>("Configuration1"))
+ ```
+ */
 public struct From<T: NSManagedObject> {
    
-    // MARK: Public
-    
+    /**
+     Initializes a `From` clause.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From<MyPersonEntity>())
+     ```
+     */
    public init(){
        
-        self.entityClass = T.self
-        self.findPersistentStores = { _ in nil }
+        self.init(entityClass: T.self)
    }
    
+    /**
+     Initializes a `From` clause with the specified entity type.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From<MyPersonEntity>())
+     ```
+     - parameter entity: the `NSManagedObject` type to be created
+     */
    public init(_ entity: T.Type) {
        
-        self.entityClass = entity
-        self.findPersistentStores = { _ in nil }
+        self.init(entityClass: entity)
    }
    
+    /**
+     Initializes a `From` clause with the specified entity class.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From<MyPersonEntity>())
+     ```
+     - parameter entityClass: the `NSManagedObject` class type to be created
+     */
    public init(_ entityClass: AnyClass) {
        
-        self.entityClass = entityClass
-        self.findPersistentStores = { _ in nil }
+        self.init(entityClass: entityClass)
    }
    
-    public init(_ configurations: String?...) {
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From<MyPersonEntity>(nil, "Configuration1"))
+     ```
+     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
+     */
+    public init(_ configuration: String?, otherConfigurations: String?...) {
        
-        self.init(entityClass: T.self, configurations: configurations)
+        self.init(entityClass: T.self, configurations: [configuration] + otherConfigurations)
    }
    
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From<MyPersonEntity>(["Configuration1", "Configuration2"]))
+     ```
+     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ configurations: [String?]) {
        
        self.init(entityClass: T.self, configurations: configurations)
    }
    
-    public init(_ entity: T.Type, _ configurations: String?...) {
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From(MyPersonEntity.self, nil, "Configuration1"))
+     ```
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
+     */
+    public init(_ entity: T.Type, _ configuration: String?, _ otherConfigurations: String?...) {
        
-        self.init(entityClass: entity, configurations: configurations)
+        self.init(entityClass: entity, configurations: [configuration] + otherConfigurations)
    }
    
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From(MyPersonEntity.self, ["Configuration1", "Configuration1"]))
+     ```
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ entity: T.Type, _ configurations: [String?]) {
        
        self.init(entityClass: entity, configurations: configurations)
    }
    
-    public init(_ entityClass: AnyClass, _ configurations: String?...) {
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From(MyPersonEntity.self, nil, "Configuration1"))
+     ```
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     - parameter otherConfigurations: an optional list of other configuration names to associate objects from (see `configuration` parameter)
+     */
+    public init(_ entityClass: AnyClass, _ configuration: String?, _ otherConfigurations: String?...) {
        
-        self.init(entityClass: entityClass, configurations: configurations)
+        self.init(entityClass: entityClass, configurations: [configuration] + otherConfigurations)
    }
    
+    /**
+     Initializes a `From` clause with the specified configurations.
+     Sample Usage:
+     ```
+     let people = transaction.fetchAll(From(MyPersonEntity.self, ["Configuration1", "Configuration1"]))
+     ```
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter configurations: a list of `NSPersistentStore` configuration names to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ entityClass: AnyClass, _ configurations: [String?]) {
        
        self.init(entityClass: entityClass, configurations: configurations)
    }
    
-    public init(_ storeURLs: NSURL...) {
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter storeURL: the persistent store URL to associate objects from.
+     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
+     */
+    public init(_ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
        
-        self.init(entityClass: T.self, storeURLs: storeURLs)
+        self.init(entityClass: T.self, storeURLs: [storeURL] + otherStoreURLs)
    }
    
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter storeURLs: the persistent store URLs to associate objects from.
+     */
    public init(_ storeURLs: [NSURL]) {
        
        self.init(entityClass: T.self, storeURLs: storeURLs)
    }
    
-    public init(_ entity: T.Type, _ storeURLs: NSURL...) {
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter storeURL: the persistent store URL to associate objects from.
+     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
+     */
+    public init(_ entity: T.Type, _ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
        
-        self.init(entityClass: entity, storeURLs: storeURLs)
+        self.init(entityClass: entity, storeURLs: [storeURL] + otherStoreURLs)
    }
    
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter storeURLs: the persistent store URLs to associate objects from.
+     */
    public init(_ entity: T.Type, _ storeURLs: [NSURL]) {
        
        self.init(entityClass: entity, storeURLs: storeURLs)
    }
    
-    public init(_ entityClass: AnyClass, _ storeURLs: NSURL...) {
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter storeURL: the persistent store URL to associate objects from.
+     - parameter otherStoreURLs: an optional list of other persistent store URLs to associate objects from (see `storeURL` parameter)
+     */
+    public init(_ entityClass: AnyClass, _ storeURL: NSURL, _ otherStoreURLs: NSURL...) {
        
-        self.init(entityClass: entityClass, storeURLs: storeURLs)
+        self.init(entityClass: entityClass, storeURLs: [storeURL] + otherStoreURLs)
    }
    
+    /**
+     Initializes a `From` clause with the specified store URLs.
+     
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter storeURLs: the persistent store URLs to associate objects from.
+     */
    public init(_ entityClass: AnyClass, _ storeURLs: [NSURL]) {
        
        self.init(entityClass: entityClass, storeURLs: storeURLs)
    }
    
-    public init(_ persistentStores: NSPersistentStore...) {
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
+     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
+     */
+    public init(_ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
        
-        self.init(entityClass: T.self, persistentStores: persistentStores)
+        self.init(entityClass: T.self, persistentStores: [persistentStore] + otherPersistentStores)
    }
    
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
+     */
    public init(_ persistentStores: [NSPersistentStore]) {
        
        self.init(entityClass: T.self, persistentStores: persistentStores)
    }
    
-    public init(_ entity: T.Type, _ persistentStores: NSPersistentStore...) {
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
+     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
+     */
+    public init(_ entity: T.Type, _ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
        
-        self.init(entityClass: entity, persistentStores: persistentStores)
+        self.init(entityClass: entity, persistentStores: [persistentStore] + otherPersistentStores)
    }
    
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter entity: the associated `NSManagedObject` type
+     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
+     */
    public init(_ entity: T.Type, _ persistentStores: [NSPersistentStore]) {
        
        self.init(entityClass: entity, persistentStores: persistentStores)
    }
    
-    public init(_ entityClass: AnyClass, _ persistentStores: NSPersistentStore...) {
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter persistentStore: the `NSPersistentStore` to associate objects from.
+     - parameter otherPersistentStores: an optional list of other `NSPersistentStore`s to associate objects from (see `persistentStore` parameter)
+     */
+    public init(_ entityClass: AnyClass, _ persistentStore: NSPersistentStore, _ otherPersistentStores: NSPersistentStore...) {
        
-        self.init(entityClass: entityClass, persistentStores: persistentStores)
+        self.init(entityClass: entityClass, persistentStores: [persistentStore] + otherPersistentStores)
    }
    
+    /**
+     Initializes a `From` clause with the specified `NSPersistentStore`s.
+     
+     - parameter entity: the associated `NSManagedObject` entity class
+     - parameter persistentStores: the `NSPersistentStore`s to associate objects from.
+     */
    public init(_ entityClass: AnyClass, _ persistentStores: [NSPersistentStore]) {
        
        self.init(entityClass: entityClass, persistentStores: persistentStores)
@@ -147,10 +301,20 @@ public struct From<T: NSManagedObject> {
    
    // MARK: Internal
    
-    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext) {
+    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext, applyAffectedStores: Bool = true) {
        
        fetchRequest.entity = context.entityDescriptionForEntityClass(self.entityClass)
-        fetchRequest.affectedStores = self.findPersistentStores(context: context)
+        if applyAffectedStores {
+            
+            self.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+        }
+    }
+    
+    internal func applyAffectedStoresForFetchedRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool {
+        
+        let stores = self.findPersistentStores(context: context)
+        fetchRequest.affectedStores = stores
+        return stores?.isEmpty == false
    }
    
    
@@ -160,6 +324,15 @@ public struct From<T: NSManagedObject> {
    
    private let findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?
    
+    private init(entityClass: AnyClass) {
+        
+        self.entityClass = entityClass
+        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
+            
+            return context.parentStack?.persistentStoresForEntityClass(entityClass)
+        }
+    }
+    
    private init(entityClass: AnyClass, configurations: [String?]) {
        
        let configurationsSet = Set(configurations.map { $0 ?? Into.defaultConfigurationName })
--- a/Clauses/GroupBy.swift
+++ b/Clauses/GroupBy.swift
@@ -2,7 +2,7 @@
 //  GroupBy.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,36 +30,34 @@ import CoreData
 // MARK: - GroupBy

 /**
-The `GroupBy` clause specifies that the result of a query be grouped accoording to the specified key path.
-*/
+ The `GroupBy` clause specifies that the result of a query be grouped accoording to the specified key path.
+ */
 public struct GroupBy: QueryClause {
    
-    // MARK: Public
-    
    /**
-    Initializes a `GroupBy` clause with a list of key path strings
-    
-    - parameter keyPaths: a list of key path strings to group results with
-    */
+     Initializes a `GroupBy` clause with a list of key path strings
+     
+     - parameter keyPaths: a list of key path strings to group results with
+     */
    public init(_ keyPaths: [KeyPath]) {
        
        self.keyPaths = keyPaths
    }
    
    /**
-    Initializes a `GroupBy` clause with an empty list of key path strings
-    */
+     Initializes a `GroupBy` clause with an empty list of key path strings
+     */
    public init() {
        
        self.init([])
    }
    
    /**
-    Initializes a `GroupBy` clause with a list of key path strings
-    
-    - parameter keyPath: a key path string to group results with
-    - parameter keyPaths: a series of key path strings to group results with
-    */
+     Initializes a `GroupBy` clause with a list of key path strings
+     
+     - parameter keyPath: a key path string to group results with
+     - parameter keyPaths: a series of key path strings to group results with
+     */
    public init(_ keyPath: KeyPath, _ keyPaths: KeyPath...) {
        
        self.init([keyPath] + keyPaths)
@@ -72,7 +70,7 @@ public struct GroupBy: QueryClause {
    
    public func applyToFetchRequest(fetchRequest: NSFetchRequest) {
        
-        if fetchRequest.propertiesToGroupBy != nil {
+        if let keyPaths = fetchRequest.propertiesToGroupBy as? [String] where keyPaths != self.keyPaths {
            
            CoreStore.log(
                .Warning,
--- a/Clauses/OrderBy.swift
+++ b/Clauses/OrderBy.swift
@@ -2,7 +2,7 @@
 //  OrderBy.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -46,18 +46,18 @@ public typealias KeyPath = String
 // MARK: - SortKey

 /**
-The `SortKey` is passed to the `OrderBy` clause to indicate the sort keys and their sort direction.
-*/
+ The `SortKey` is passed to the `OrderBy` clause to indicate the sort keys and their sort direction.
+ */
 public enum SortKey {
    
    /**
-    Indicates that the `KeyPath` should be sorted in ascending order
-    */
+     Indicates that the `KeyPath` should be sorted in ascending order
+     */
    case Ascending(KeyPath)
    
    /**
-    Indicates that the `KeyPath` should be sorted in descending order
-    */
+     Indicates that the `KeyPath` should be sorted in descending order
+     */
    case Descending(KeyPath)
 }

@@ -65,45 +65,43 @@ public enum SortKey {
 // MARK: - OrderBy

 /**
-The `OrderBy` clause specifies the sort order for results for a fetch or a query.
-*/
+ The `OrderBy` clause specifies the sort order for results for a fetch or a query.
+ */
 public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    
-    // MARK: Public
-    
    /**
-    Initializes a `OrderBy` clause with a list of sort descriptors
-    
-    - parameter sortDescriptors: a series of `NSSortDescriptor`s
-    */
+     Initializes a `OrderBy` clause with a list of sort descriptors
+     
+     - parameter sortDescriptors: a series of `NSSortDescriptor`s
+     */
    public init(_ sortDescriptors: [NSSortDescriptor]) {
        
        self.sortDescriptors = sortDescriptors
    }
    
    /**
-    Initializes a `OrderBy` clause with an empty list of sort descriptors
-    */
+     Initializes a `OrderBy` clause with an empty list of sort descriptors
+     */
    public init() {
        
        self.init([NSSortDescriptor]())
    }
    
    /**
-    Initializes a `OrderBy` clause with a single sort descriptor
-    
-    - parameter sortDescriptor: a `NSSortDescriptor`
-    */
+     Initializes a `OrderBy` clause with a single sort descriptor
+     
+     - parameter sortDescriptor: a `NSSortDescriptor`
+     */
    public init(_ sortDescriptor: NSSortDescriptor) {
        
        self.init([sortDescriptor])
    }
    
    /**
-    Initializes a `OrderBy` clause with a series of `SortKey`s
-    
-    - parameter sortKey: a series of `SortKey`s
-    */
+     Initializes a `OrderBy` clause with a series of `SortKey`s
+     
+     - parameter sortKey: a series of `SortKey`s
+     */
    public init(_ sortKey: [SortKey]) {
        
        self.init(
@@ -122,11 +120,11 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    }
    
    /**
-    Initializes a `OrderBy` clause with a series of `SortKey`s
-    
-    - parameter sortKey: a single `SortKey`
-    - parameter sortKeys: a series of `SortKey`s
-    */
+     Initializes a `OrderBy` clause with a series of `SortKey`s
+     
+     - parameter sortKey: a single `SortKey`
+     - parameter sortKeys: a series of `SortKey`s
+     */
    public init(_ sortKey: SortKey, _ sortKeys: SortKey...) {
        
        self.init([sortKey] + sortKeys)
@@ -139,7 +137,7 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    
    public func applyToFetchRequest(fetchRequest: NSFetchRequest) {
        
-        if fetchRequest.sortDescriptors != nil {
+        if let sortDescriptors = fetchRequest.sortDescriptors where sortDescriptors != self.sortDescriptors {
            
            CoreStore.log(
                .Warning,
--- a/Clauses/Select.swift
+++ b/Clauses/Select.swift
@@ -2,7 +2,7 @@
 //  Select.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,16 +30,16 @@ import CoreData
 // MARK: - SelectResultType

 /**
-The `SelectResultType` protocol is implemented by return types supported by the `Select` clause.
-*/
+ The `SelectResultType` protocol is implemented by return types supported by the `Select` clause.
+ */
 public protocol SelectResultType { }


 // MARK: - SelectValueResultType

 /**
-The `SelectValueResultType` protocol is implemented by return types supported by the `queryValue(...)` methods.
-*/
+ The `SelectValueResultType` protocol is implemented by return types supported by the `queryValue(...)` methods.
+ */
 public protocol SelectValueResultType: SelectResultType {
    
    static func fromResultObject(result: AnyObject) -> Self?
@@ -49,8 +49,8 @@ public protocol SelectValueResultType: SelectResultType {
 // MARK: - SelectAttributesResultType

 /**
-The `SelectValueResultType` protocol is implemented by return types supported by the `queryAttributes(...)` methods.
-*/
+ The `SelectValueResultType` protocol is implemented by return types supported by the `queryAttributes(...)` methods.
+ */
 public protocol SelectAttributesResultType: SelectResultType {
    
    static func fromResultObjects(result: [AnyObject]) -> [[NSString: AnyObject]]
@@ -60,49 +60,47 @@ public protocol SelectAttributesResultType: SelectResultType {
 // MARK: - SelectTerm

 /**
-The `SelectTerm` is passed to the `Select` clause to indicate the attributes/aggregate keys to be queried.
-*/
+ The `SelectTerm` is passed to the `Select` clause to indicate the attributes/aggregate keys to be queried.
+ */
 public enum SelectTerm: StringLiteralConvertible {
    
-    // MARK: Public
-    
    /**
-    Provides a `SelectTerm` to a `Select` clause for querying an entity attribute. A shorter way to do the same is to assign from the string keypath directly:
-    
-        let fullName = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<String>(.Attribute("fullName")),
-            Where("employeeID", isEqualTo: 1111)
-        )
-    
-    is equivalent to:
-    
-        let fullName = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<String>("fullName"),
-            Where("employeeID", isEqualTo: 1111)
-        )
-    
-    - parameter keyPath: the attribute name
-    - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
-    */
+     Provides a `SelectTerm` to a `Select` clause for querying an entity attribute. A shorter way to do the same is to assign from the string keypath directly:
+     ```
+     let fullName = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<String>(.Attribute("fullName")),
+         Where("employeeID", isEqualTo: 1111)
+     )
+     ```
+     is equivalent to:
+     ```
+     let fullName = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<String>("fullName"),
+         Where("employeeID", isEqualTo: 1111)
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
+     */
    public static func Attribute(keyPath: KeyPath) -> SelectTerm {
        
        return ._Attribute(keyPath)
    }
    
    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the average value of an attribute.
-
-        let averageAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Average("age"))
-        )
-    
-    - parameter keyPath: the attribute name
-    - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average(<attributeName>)" is used
-    - returns: a `SelectTerm` to a `Select` clause for querying the average value of an attribute
-    */
+     Provides a `SelectTerm` to a `Select` clause for querying the average value of an attribute.
+     ```
+     let averageAge = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<Int>(.Average("age"))
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "average(<attributeName>)" is used
+     - returns: a `SelectTerm` to a `Select` clause for querying the average value of an attribute
+     */
    public static func Average(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
        
        return ._Aggregate(
@@ -114,17 +112,17 @@ public enum SelectTerm: StringLiteralConvertible {
    }
    
    /**
-    Provides a `SelectTerm` to a `Select` clause for a count query.
-    
-        let numberOfEmployees = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Count("employeeID"))
-        )
-    
-    - parameter keyPath: the attribute name
-    - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count(<attributeName>)" is used
-    - returns: a `SelectTerm` to a `Select` clause for a count query
-    */
+     Provides a `SelectTerm` to a `Select` clause for a count query.
+     ```
+     let numberOfEmployees = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<Int>(.Count("employeeID"))
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "count(<attributeName>)" is used
+     - returns: a `SelectTerm` to a `Select` clause for a count query
+     */
    public static func Count(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
        
        return ._Aggregate(
@@ -136,17 +134,17 @@ public enum SelectTerm: StringLiteralConvertible {
    }
    
    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute.
-    
-        let maximumAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Maximum("age"))
-        )
-    
-    - parameter keyPath: the attribute name
-    - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max(<attributeName>)" is used
-    - returns: a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute
-    */
+     Provides a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute.
+     ```
+     let maximumAge = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<Int>(.Maximum("age"))
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "max(<attributeName>)" is used
+     - returns: a `SelectTerm` to a `Select` clause for querying the maximum value for an attribute
+     */
    public static func Maximum(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
        
        return ._Aggregate(
@@ -158,17 +156,17 @@ public enum SelectTerm: StringLiteralConvertible {
    }
    
    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute.
-    
-        let minimumAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Minimum("age"))
-        )
-    
-    - parameter keyPath: the attribute name
-    - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min(<attributeName>)" is used
-    - returns: a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute
-    */
+     Provides a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute.
+     ```
+     let minimumAge = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<Int>(.Minimum("age"))
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "min(<attributeName>)" is used
+     - returns: a `SelectTerm` to a `Select` clause for querying the minimum value for an attribute
+     */
    public static func Minimum(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
        
        return ._Aggregate(
@@ -180,17 +178,17 @@ public enum SelectTerm: StringLiteralConvertible {
    }
    
    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the sum value for an attribute.
-    
-        let totalAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Sum("age"))
-        )
-    
-    - parameter keyPath: the attribute name
-    - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum(<attributeName>)" is used
-    - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
-    */
+     Provides a `SelectTerm` to a `Select` clause for querying the sum value for an attribute.
+     ```
+     let totalAge = CoreStore.queryValue(
+         From(MyPersonEntity),
+         Select<Int>(.Sum("age"))
+     )
+     ```
+     - parameter keyPath: the attribute name
+     - parameter alias: the dictionary key to use to access the result. Ignored when the query return value is not an `NSDictionary`. If `nil`, the default key "sum(<attributeName>)" is used
+     - returns: a `SelectTerm` to a `Select` clause for querying the sum value for an attribute
+     */
    public static func Sum(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
        
        return ._Aggregate(
@@ -230,68 +228,66 @@ public enum SelectTerm: StringLiteralConvertible {
 // MARK: - Select

 /**
-The `Select` clause indicates the attribute / aggregate value to be queried. The generic type is a `SelectResultType`, and will be used as the return type for the query. 
-
-You can bind the return type by specializing the initializer:
-
-    let maximumAge = CoreStore.queryValue(
-        From(MyPersonEntity),
-        Select<Int>(.Maximum("age"))
-    )
-
-or by casting the type of the return value:
-
-    let maximumAge: Int = CoreStore.queryValue(
-        From(MyPersonEntity),
-        Select(.Maximum("age"))
-    )
-
-Valid return types depend on the query:
-
- for `queryValue(...)` methods:
-    - `Bool`
-    - `Int8`
-    - `Int16`
-    - `Int32`
-    - `Int64`
-    - `Double`
-    - `Float`
-    - `String`
-    - `NSNumber`
-    - `NSString`
-    - `NSDecimalNumber`
-    - `NSDate`
-    - `NSData`
-    - `NSManagedObjectID`
-    - `NSString`
- for `queryAttributes(...)` methods:
-    - `NSDictionary`
-
- parameter sortDescriptors: a series of `NSSortDescriptor`s
-*/
+ The `Select` clause indicates the attribute / aggregate value to be queried. The generic type is a `SelectResultType`, and will be used as the return type for the query.
+ 
+ You can bind the return type by specializing the initializer:
+ ```
+ let maximumAge = CoreStore.queryValue(
+     From(MyPersonEntity),
+     Select<Int>(.Maximum("age"))
+ )
+ ```
+ or by casting the type of the return value:
+ ```
+ let maximumAge: Int = CoreStore.queryValue(
+     From(MyPersonEntity),
+     Select(.Maximum("age"))
+ )
+ ```
+ Valid return types depend on the query:
+ 
+ - for `queryValue(...)` methods:
+     - `Bool`
+     - `Int8`
+     - `Int16`
+     - `Int32`
+     - `Int64`
+     - `Double`
+     - `Float`
+     - `String`
+     - `NSNumber`
+     - `NSString`
+     - `NSDecimalNumber`
+     - `NSDate`
+     - `NSData`
+     - `NSManagedObjectID`
+     - `NSString`
+ - for `queryAttributes(...)` methods:
+     - `NSDictionary`
+ 
+ - parameter sortDescriptors: a series of `NSSortDescriptor`s
+ */
 public struct Select<T: SelectResultType> {
    
-    // MARK: Public
-    
    /**
-    The `SelectResultType` type for the query's return value
-    */
+     The `SelectResultType` type for the query's return value
+     */
    public typealias ReturnType = T
    
    /**
-    Initializes a `Select` clause with a list of `SelectTerm`s
-    
-    - parameter selectTerm: a `SelectTerm`
-    - parameter selectTerms: a series of `SelectTerm`s
-    */
+     Initializes a `Select` clause with a list of `SelectTerm`s
+     
+     - parameter selectTerm: a `SelectTerm`
+     - parameter selectTerms: a series of `SelectTerm`s
+     */
    public init(_ selectTerm: SelectTerm, _ selectTerms: SelectTerm...) {
        
        self.selectTerms = [selectTerm] + selectTerms
    }
-
-
+    
+    
    // MARK: Internal
-
+    
    internal func applyToFetchRequest(fetchRequest: NSFetchRequest) {
        
        if fetchRequest.propertiesToFetch != nil {
--- a/Clauses/Tweak.swift
+++ b/Clauses/Tweak.swift
@@ -2,7 +2,7 @@
 //  Tweak.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,27 +30,25 @@ import CoreData
 // MARK: - Tweak

 /**
-The `Tweak` clause allows fine-tuning the `NSFetchRequest` for a fetch or query.
-
-Sample usage:
-
-    let employees = transaction.fetchAll(
-        From(MyPersonEntity),
-        Tweak { (fetchRequest) -> Void in
-            fetchRequest.includesPendingChanges = false
-            fetchRequest.fetchLimit = 5
-        }
-    )
-*/
+ The `Tweak` clause allows fine-tuning the `NSFetchRequest` for a fetch or query.
+ Sample usage:
+ ```
+ let employees = transaction.fetchAll(
+     From(MyPersonEntity),
+     Tweak { (fetchRequest) -> Void in
+         fetchRequest.includesPendingChanges = false
+         fetchRequest.fetchLimit = 5
+     }
+ )
+ ```
+ */
 public struct Tweak: FetchClause, QueryClause, DeleteClause {
    
-    // MARK: Public
-    
    /**
-    Initializes a `Tweak` clause with a closure where the `NSFetchRequest` may be configured.
-    
-    - parameter customization: a list of key path strings to group results with
-    */
+     Initializes a `Tweak` clause with a closure where the `NSFetchRequest` may be configured.
+     
+     - parameter customization: a list of key path strings to group results with
+     */
    public init(_ customization: (fetchRequest: NSFetchRequest) -> Void) {
        
        self.customization = customization
@@ -65,5 +63,7 @@ public struct Tweak: FetchClause, QueryClause, DeleteClause {
    }
    
    
+    // MARK: Private
+    
    private let customization: (fetchRequest: NSFetchRequest) -> Void
 }
--- a/Clauses/Where.swift
+++ b/Clauses/Where.swift
@@ -2,7 +2,7 @@
 //  Where.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -46,68 +46,66 @@ public prefix func !(clause: Where) -> Where {
 // MARK: - Where

 /**
-The `Where` clause specifies the conditions for a fetch or a query.
-*/
+ The `Where` clause specifies the conditions for a fetch or a query.
+ */
 public struct Where: FetchClause, QueryClause, DeleteClause {
    
-    // MARK: Public
-    
    /**
-    Initializes a `Where` clause with an `NSPredicate`
-    
-    - parameter predicate: the `NSPredicate` for the fetch or query
-    */
+     Initializes a `Where` clause with an `NSPredicate`
+     
+     - parameter predicate: the `NSPredicate` for the fetch or query
+     */
    public init(_ predicate: NSPredicate) {
        
        self.predicate = predicate
    }
    
    /**
-    Initializes a `Where` clause with a predicate that always evaluates to `true`
-    */
+     Initializes a `Where` clause with a predicate that always evaluates to `true`
+     */
    public init() {
        
        self.init(true)
    }
    
    /**
-    Initializes a `Where` clause with a predicate that always evaluates to the specified boolean value
-    
-    - parameter value: the boolean value for the predicate
-    */
+     Initializes a `Where` clause with a predicate that always evaluates to the specified boolean value
+     
+     - parameter value: the boolean value for the predicate
+     */
    public init(_ value: Bool) {
        
        self.init(NSPredicate(value: value))
    }
    
    /**
-    Initializes a `Where` clause with a predicate using the specified string format and arguments
-    
-    - parameter format: the format string for the predicate
-    - parameter args: the arguments for `format`
-    */
+     Initializes a `Where` clause with a predicate using the specified string format and arguments
+     
+     - parameter format: the format string for the predicate
+     - parameter args: the arguments for `format`
+     */
    public init(_ format: String, _ args: NSObject...) {
        
        self.init(NSPredicate(format: format, argumentArray: args))
    }
    
    /**
-    Initializes a `Where` clause with a predicate using the specified string format and arguments
-    
-    - parameter format: the format string for the predicate
-    - parameter argumentArray: the arguments for `format`
-    */
+     Initializes a `Where` clause with a predicate using the specified string format and arguments
+     
+     - parameter format: the format string for the predicate
+     - parameter argumentArray: the arguments for `format`
+     */
    public init(_ format: String, argumentArray: [NSObject]?) {
        
        self.init(NSPredicate(format: format, argumentArray: argumentArray))
    }
    
    /**
-    Initializes a `Where` clause that compares equality
-    
-    - parameter keyPath: the keyPath to compare with
-    - parameter value: the arguments for the `==` operator
-    */
+     Initializes a `Where` clause that compares equality
+     
+     - parameter keyPath: the keyPath to compare with
+     - parameter value: the arguments for the `==` operator
+     */
    public init(_ keyPath: KeyPath, isEqualTo value: NSObject?) {
        
        self.init(value == nil
@@ -116,22 +114,22 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    }
    
    /**
-    Initializes a `Where` clause that compares membership
-    
-    - parameter keyPath: the keyPath to compare with
-    - parameter list: the array to check membership of
-    */
+     Initializes a `Where` clause that compares membership
+     
+     - parameter keyPath: the keyPath to compare with
+     - parameter list: the array to check membership of
+     */
    public init(_ keyPath: KeyPath, isMemberOf list: NSArray) {
        
        self.init(NSPredicate(format: "\(keyPath) IN %@", list))
    }
    
    /**
-    Initializes a `Where` clause that compares membership
-    
-    - parameter keyPath: the keyPath to compare with
-    - parameter list: the sequence to check membership of
-    */
+     Initializes a `Where` clause that compares membership
+     
+     - parameter keyPath: the keyPath to compare with
+     - parameter list: the sequence to check membership of
+     */
    public init<S: SequenceType where S.Generator.Element: NSObject>(_ keyPath: KeyPath, isMemberOf list: S) {
        
        self.init(NSPredicate(format: "\(keyPath) IN %@", Array(list) as NSArray))
@@ -144,7 +142,7 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    
    public func applyToFetchRequest(fetchRequest: NSFetchRequest) {
        
-        if fetchRequest.predicate != nil {
+        if let predicate = fetchRequest.predicate where predicate != self.predicate {
            
            CoreStore.log(
                .Warning,
--- a/Querying/CoreStore+Querying.swift
+++ b/Querying/CoreStore+Querying.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Querying.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,14 +31,12 @@ import CoreData

 public extension CoreStore {
    
-    // MARK: Public
-    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
-    
-    - parameter object: a reference to the object created/fetched outside the `DataStack`
-    - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
-    */
+     Using the `defaultStack`, fetches the `NSManagedObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
+     
+     - parameter object: a reference to the object created/fetched outside the `DataStack`
+     - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
+     */
    @warn_unused_result
    public static func fetchExisting<T: NSManagedObject>(object: T) -> T? {
        
@@ -46,11 +44,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
-    
-    - parameter objectID: the `NSManagedObjectID` for the object
-    - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
-    */
+     Using the `defaultStack`, fetches the `NSManagedObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
+     
+     - parameter objectID: the `NSManagedObjectID` for the object
+     - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
+     */
    @warn_unused_result
    public static func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
        
@@ -58,11 +56,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
-    
-    - parameter objects: an array of `NSManagedObject`s created/fetched outside the `DataStack`
-    - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
-    */
+     Using the `defaultStack`, fetches the `NSManagedObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
+     
+     - parameter objects: an array of `NSManagedObject`s created/fetched outside the `DataStack`
+     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
+     */
    @warn_unused_result
    public static func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
        
@@ -70,11 +68,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
-    
-    - parameter objectIDs: the `NSManagedObjectID` array for the objects
-    - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
-    */
+     Using the `defaultStack`, fetches the `NSManagedObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
+     
+     - parameter objectIDs: the `NSManagedObjectID` array for the objects
+     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
+     */
    @warn_unused_result
    public static func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
        
@@ -82,12 +80,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
@@ -95,12 +93,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
@@ -108,12 +106,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
@@ -121,12 +119,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
@@ -134,12 +132,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
@@ -147,12 +145,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
@@ -160,12 +158,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
@@ -173,12 +171,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
@@ -186,12 +184,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
@@ -199,12 +197,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public static func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
@@ -212,15 +210,15 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public static func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
@@ -228,15 +226,15 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Using the `defaultStack`, queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public static func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
@@ -244,15 +242,15 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, queries a dictionary of attribtue values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Using the `defaultStack`, queries a dictionary of attribtue values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public static func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
@@ -260,15 +258,15 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Using the `defaultStack`, queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public static func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
--- a/Querying/DataStack+Querying.swift
+++ b/Querying/DataStack+Querying.swift
@@ -2,7 +2,7 @@
 //  DataStack+Querying.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -34,14 +34,12 @@ import CoreData

 public extension DataStack {
    
-    // MARK: Public
-    
    /**
-    Fetches the `NSManagedObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
-    
-    - parameter object: a reference to the object created/fetched outside the `DataStack`
-    - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
-    */
+     Fetches the `NSManagedObject` instance in the `DataStack`'s context from a reference created from a transaction or from a different managed object context.
+     
+     - parameter object: a reference to the object created/fetched outside the `DataStack`
+     - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject>(object: T) -> T? {
        
@@ -56,11 +54,11 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
-    
-    - parameter objectID: the `NSManagedObjectID` for the object
-    - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
-    */
+     Fetches the `NSManagedObject` instance in the `DataStack`'s context from an `NSManagedObjectID`.
+     
+     - parameter objectID: the `NSManagedObjectID` for the object
+     - returns: the `NSManagedObject` instance if the object exists in the `DataStack`, or `nil` if not found.
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
        
@@ -75,11 +73,11 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
-    
-    - parameter objects: an array of `NSManagedObject`s created/fetched outside the `DataStack`
-    - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
-    */
+     Fetches the `NSManagedObject` instances in the `DataStack`'s context from references created from a transaction or from a different managed object context.
+     
+     - parameter objects: an array of `NSManagedObject`s created/fetched outside the `DataStack`
+     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == T>(objects: S) -> [T] {
        
@@ -87,11 +85,11 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
-    
-    - parameter objectIDs: the `NSManagedObjectID` array for the objects
-    - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
-    */
+     Fetches the `NSManagedObject` instances in the `DataStack`'s context from a list of `NSManagedObjectID`.
+     
+     - parameter objectIDs: the `NSManagedObjectID` array for the objects
+     - returns: the `NSManagedObject` array for objects that exists in the `DataStack`
+     */
    @warn_unused_result
    public func fetchExisting<T: NSManagedObject, S: SequenceType where S.Generator.Element == NSManagedObjectID>(objectIDs: S) -> [T] {
        
@@ -99,12 +97,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
@@ -117,12 +115,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
-    */
+     Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the first `NSManagedObject` instance that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
@@ -135,12 +133,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
@@ -153,12 +151,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
-    */
+     Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: all `NSManagedObject` instances that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
@@ -171,12 +169,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
@@ -189,12 +187,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the number `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
@@ -207,12 +205,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
@@ -225,12 +223,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
@@ -243,12 +241,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
@@ -261,12 +259,12 @@ public extension DataStack {
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
-    */
+     Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for the fetch request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s
+     */
    @warn_unused_result
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
@@ -279,15 +277,15 @@ public extension DataStack {
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
@@ -300,15 +298,15 @@ public extension DataStack {
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries aggregate values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
@@ -321,15 +319,15 @@ public extension DataStack {
    }
    
    /**
-    Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
@@ -342,15 +340,15 @@ public extension DataStack {
    }
    
    /**
-    Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
-    
-    A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
-    
-    - 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.
-    */
+     Queries a dictionary of attribute values as specified by the `QueryClause`s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+     
+     A "query" differs from a "fetch" in that it only retrieves values already stored in the persistent store. As such, values from unsaved transactions or contexts will not be incorporated in the query result.
+     
+     - 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.
+     */
    @warn_unused_result
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
--- a/Clauses/ClauseTypes.swift
+++ b/Clauses/ClauseTypes.swift
@@ -2,7 +2,7 @@
 //  ClauseTypes.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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,6 +29,9 @@ import CoreData

 // MARK: - FetchClause

+/**
+ The `FetchClause` implement clauses used to configure `NSFetchRequest`s.
+ */
 public protocol FetchClause {
    
    func applyToFetchRequest(fetchRequest: NSFetchRequest)
@@ -37,6 +40,9 @@ public protocol FetchClause {

 // MARK: - QueryClause

+/**
+ The `QueryClause` implement clauses used to configure `NSFetchRequest`s.
+ */
 public protocol QueryClause {
    
    func applyToFetchRequest(fetchRequest: NSFetchRequest)
@@ -45,6 +51,9 @@ public protocol QueryClause {

 // MARK: - DeleteClause

+/**
+ The `DeleteClause` implement clauses used to configure `NSFetchRequest`s.
+ */
 public protocol DeleteClause {
    
    func applyToFetchRequest(fetchRequest: NSFetchRequest)
--- a/Data/BaseDataTransaction+Importing.swift
+++ b/Data/BaseDataTransaction+Importing.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction+Importing.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,15 +31,13 @@ import CoreData

 public extension BaseDataTransaction {
    
-    // MARK: Public
-    
    /**
-    Creates an `ImportableObject` by importing from the specified import source.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter source: the object to import values from
-    - returns: the created `ImportableObject` instance, or `nil` if the import was ignored
-    */
+     Creates an `ImportableObject` by importing from the specified import source.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter source: the object to import values from
+     - returns: the created `ImportableObject` instance, or `nil` if the import was ignored
+     */
    public func importObject<T where T: NSManagedObject, T: ImportableObject>(
        into: Into<T>,
        source: T.ImportSource) throws -> T? {
@@ -63,12 +61,38 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Creates multiple `ImportableObject`s by importing from the specified array of import sources.
+     Updates an existing `ImportableObject` by importing values from the specified import source.
+     
+     - parameter object: the `NSManagedObject` to update
+     - parameter source: the object to import values from
+     */
+    public func importObject<T where T: NSManagedObject, T: ImportableObject>(
+        object: T,
+        source: T.ImportSource) throws {
+            
+            CoreStore.assert(
+                self.isRunningInAllowedQueue(),
+                "Attempted to import an object of type \(typeName(object)) outside the transaction's designated queue."
+            )
+            
+            try autoreleasepool {
+                
+                guard T.shouldInsertFromImportSource(source, inTransaction: self) else {
+                    
+                    return
+                }
+                
+                try object.didInsertFromImportSource(source, inTransaction: self)
+            }
+    }
    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter sourceArray: the array of objects to import values from
-    - returns: the array of created `ImportableObject` instances
-    */
+    /**
+     Creates multiple `ImportableObject`s by importing from the specified array of import sources.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter sourceArray: the array of objects to import values from
+     - returns: the array of created `ImportableObject` instances
+     */
    public func importObjects<T, S: SequenceType where T: NSManagedObject, T: ImportableObject, S.Generator.Element == T.ImportSource>(
        into: Into<T>,
        sourceArray: S) throws -> [T] {
@@ -98,12 +122,12 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Updates an existing `ImportableUniqueObject` or creates a new instance by importing from the specified import source.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter source: the object to import values from
-    - returns: the created/updated `ImportableUniqueObject` instance, or `nil` if the import was ignored
-    */
+     Updates an existing `ImportableUniqueObject` or creates a new instance by importing from the specified import source.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter source: the object to import values from
+     - returns: the created/updated `ImportableUniqueObject` instance, or `nil` if the import was ignored
+     */
    public func importUniqueObject<T where T: NSManagedObject, T: ImportableUniqueObject>(
        into: Into<T>,
        source: T.ImportSource) throws -> T?  {
@@ -124,7 +148,7 @@ public extension BaseDataTransaction {
                if let object = self.fetchOne(From(T), Where(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
                    
                    guard T.shouldUpdateFromImportSource(source, inTransaction: self) else {
-                    
+                        
                        return nil
                    }
                    
@@ -147,13 +171,13 @@ public extension BaseDataTransaction {
    }
    
    /**
-    Updates existing `ImportableUniqueObject`s or creates them by importing from the specified array of import sources.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter sourceArray: the array of objects to import values from
-    - parameter preProcess: a closure that lets the caller tweak the internal `UniqueIDType`-to-`ImportSource` mapping to be used for importing. Callers can remove from/add to/update `mapping` and return the updated array from the closure.
-    - returns: the array of created/updated `ImportableUniqueObject` instances
-    */
+     Updates existing `ImportableUniqueObject`s or creates them by importing from the specified array of import sources.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter sourceArray: the array of objects to import values from
+     - parameter preProcess: a closure that lets the caller tweak the internal `UniqueIDType`-to-`ImportSource` mapping to be used for importing. Callers can remove from/add to/update `mapping` and return the updated array from the closure.
+     - returns: the array of created/updated `ImportableUniqueObject` instances
+     */
    public func importUniqueObjects<T, S: SequenceType where T: NSManagedObject, T: ImportableUniqueObject, S.Generator.Element == T.ImportSource>(
        into: Into<T>,
        sourceArray: S,
--- a/Data/ImportableObject.swift
+++ b/Data/ImportableObject.swift
@@ -2,7 +2,7 @@
 //  ImportableObject.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,44 +30,45 @@ import CoreData
 // MARK: - ImportableObject

 /**
-`NSManagedObject` subclasses that conform to the `ImportableObject` protocol can be imported from a specified `ImportSource`. This allows transactions to create and insert instances this way:
-
-    class MyPersonEntity: NSManagedObject, ImportableObject {
-        typealias ImportSource = NSDictionary
-        // ...
-    }
-
-    CoreStore.beginAsynchronous { (transaction) -> Void in
-        let json: NSDictionary = // ...
-        let person = try! transaction.importObject(
-            Into(MyPersonEntity),
-            source: json
-        )
-        // ...
-        transaction.commit()
-    }
-*/
+ `NSManagedObject` subclasses that conform to the `ImportableObject` protocol can be imported from a specified `ImportSource`. This allows transactions to create and insert instances this way:
+ ```
+ class MyPersonEntity: NSManagedObject, ImportableObject {
+     typealias ImportSource = NSDictionary
+     // ...
+ }
+ 
+ CoreStore.beginAsynchronous { (transaction) -> Void in
+     let json: NSDictionary = // ...
+     let person = try! transaction.importObject(
+         Into(MyPersonEntity),
+         source: json
+     )
+     // ...
+     transaction.commit()
+ }
+ ```
+ */
 public protocol ImportableObject: class {
    
    /**
-    The data type for the import source. This is most commonly an `NSDictionary` or another external source such as an `NSUserDefaults`.
-    */
-    typealias ImportSource
+     The data type for the import source. This is most commonly an `NSDictionary` or another external source such as an `NSUserDefaults`.
+     */
+    associatedtype ImportSource
    
    /**
-    Return `true` if an object should be created from `source`. Return `false` to ignore and skip `source`. The default implementation returns `true`.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    - returns: `true` if an object should be created from `source`. Return `false` to ignore.
-    */
+     Return `true` if an object should be created from `source`. Return `false` to ignore and skip `source`. The default implementation returns `true`.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     - returns: `true` if an object should be created from `source`. Return `false` to ignore.
+     */
    static func shouldInsertFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) -> Bool
    
    /**
-    Implements the actual importing of data from `source`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importObjects(:sourceArray:)` call to be cancelled.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     Implements the actual importing of data from `source`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importObjects(:sourceArray:)` call to be cancelled.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
    */
    func didInsertFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) throws
 }
--- a/Data/ImportableUniqueObject.swift
+++ b/Data/ImportableUniqueObject.swift
@@ -2,7 +2,7 @@
 //  ImportableUniqueObject.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,87 +30,88 @@ import CoreData
 // MARK: - ImportableUniqueObject

 /**
-`NSManagedObject` subclasses that conform to the `ImportableUniqueObject` protocol can be imported from a specified `ImportSource`. This allows transactions to either update existing objects or create new instances this way:
-
-    class MyPersonEntity: NSManagedObject, ImportableUniqueObject {
-        typealias ImportSource = NSDictionary
-        typealias UniqueIDType = NSString
-        // ...
-    }
-
-    CoreStore.beginAsynchronous { (transaction) -> Void in
-        let json: NSDictionary = // ...
-        let person = try! transaction.importUniqueObject(
-            Into(MyPersonEntity),
-            source: json
-        )
-        // ...
-        transaction.commit()
-    }
-*/
+ `NSManagedObject` subclasses that conform to the `ImportableUniqueObject` protocol can be imported from a specified `ImportSource`. This allows transactions to either update existing objects or create new instances this way:
+ ```
+ class MyPersonEntity: NSManagedObject, ImportableUniqueObject {
+     typealias ImportSource = NSDictionary
+     typealias UniqueIDType = NSString
+     // ...
+ }
+ 
+ CoreStore.beginAsynchronous { (transaction) -> Void in
+     let json: NSDictionary = // ...
+     let person = try! transaction.importUniqueObject(
+         Into(MyPersonEntity),
+         source: json
+     )
+     // ...
+     transaction.commit()
+ }
+ ```
+ */
 public protocol ImportableUniqueObject: ImportableObject {
    
    /**
-    The data type for the import source. This is most commonly an `NSDictionary` or another external source such as an `NSUserDefaults`.
-    */
-    typealias ImportSource
+     The data type for the import source. This is most commonly an `NSDictionary` or another external source such as an `NSUserDefaults`.
+     */
+    associatedtype ImportSource
    
    /**
-    The data type for the entity's unique ID attribute
-    */
-    typealias UniqueIDType: NSObject
+     The data type for the entity's unique ID attribute
+     */
+    associatedtype UniqueIDType: NSObject
    
    /**
-    The keyPath to the entity's unique ID attribute
-    */
+     The keyPath to the entity's unique ID attribute
+     */
    static var uniqueIDKeyPath: String { get }
    
    /**
-    The object's unique ID value
-    */
+     The object's unique ID value
+     */
    var uniqueIDValue: UniqueIDType { get set }
    
    /**
-    Return `true` if an object should be created from `source`. Return `false` to ignore and skip `source`. The default implementation returns the value returned by the `shouldUpdateFromImportSource(:inTransaction:)` implementation.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    - returns: `true` if an object should be created from `source`. Return `false` to ignore.
-    */
+     Return `true` if an object should be created from `source`. Return `false` to ignore and skip `source`. The default implementation returns the value returned by the `shouldUpdateFromImportSource(:inTransaction:)` implementation.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     - returns: `true` if an object should be created from `source`. Return `false` to ignore.
+     */
    static func shouldInsertFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) -> Bool
    
    /**
-    Return `true` if an object should be updated from `source`. Return `false` to ignore and skip `source`. The default implementation returns `true`.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    - returns: `true` if an object should be updated from `source`. Return `false` to ignore.
-    */
+     Return `true` if an object should be updated from `source`. Return `false` to ignore and skip `source`. The default implementation returns `true`.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     - returns: `true` if an object should be updated from `source`. Return `false` to ignore.
+     */
    static func shouldUpdateFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) -> Bool
    
    /**
-    Return the unique ID as extracted from `source`. This method is called before `shouldInsertFromImportSource(...)` or `shouldUpdateFromImportSource(...)`. Return `nil` to skip importing from `source`. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    - returns: the unique ID as extracted from `source`, or `nil` to skip importing from `source`.
-    */
+     Return the unique ID as extracted from `source`. This method is called before `shouldInsertFromImportSource(...)` or `shouldUpdateFromImportSource(...)`. Return `nil` to skip importing from `source`. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     - returns: the unique ID as extracted from `source`, or `nil` to skip importing from `source`.
+     */
    static func uniqueIDFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) throws -> UniqueIDType?
    
    /**
-    Implements the actual importing of data from `source`. This method is called just after the object is created and assigned its unique ID as returned from `uniqueIDFromImportSource(...)`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled. The default implementation simply calls `updateFromImportSource(...)`.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    */
+     Implements the actual importing of data from `source`. This method is called just after the object is created and assigned its unique ID as returned from `uniqueIDFromImportSource(...)`. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled. The default implementation simply calls `updateFromImportSource(...)`.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     */
    func didInsertFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) throws
    
    /**
-    Implements the actual importing of data from `source`. This method is called just after the existing object is fetched using its unique ID. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
-    
-    - parameter source: the object to import from
-    - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
-    */
+     Implements the actual importing of data from `source`. This method is called just after the existing object is fetched using its unique ID. Implementers should pull values from `source` and assign them to the receiver's attributes. Note that throwing from this method will cause subsequent imports that are part of the same `importUniqueObjects(:sourceArray:)` call to be cancelled.
+     
+     - parameter source: the object to import from
+     - parameter transaction: the transaction that invoked the import. Use the transaction to fetch or create related objects if needed.
+     */
    func updateFromImportSource(source: ImportSource, inTransaction transaction: BaseDataTransaction) throws
 }

--- a/CoreStore/Info.plist
+++ b/CoreStore/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.3</string>
+	<string>1.5.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStore/Internal/AssociatedObjects.swift
+++ b/CoreStore/Internal/AssociatedObjects.swift
@@ -2,7 +2,7 @@
 //  NSObject+CoreStore.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/CoreStore/Internal/CoreStoreFetchedResultsController.swift
+++ b/CoreStore/Internal/CoreStoreFetchedResultsController.swift
@@ -0,0 +1,101 @@
+//
+//  CoreStoreFetchedResultsController.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+
+
+// MARK: - CoreStoreFetchedResultsController
+
+@available(OSX, unavailable)
+internal final class CoreStoreFetchedResultsController<T: NSManagedObject>: NSFetchedResultsController {
+    
+    
+    // MARK: Internal
+    
+    internal convenience init<T>(dataStack: DataStack, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) {
+        
+        self.init(
+            context: dataStack.mainContext,
+            fetchRequest: fetchRequest,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    internal init<T>(context: NSManagedObjectContext, fetchRequest: NSFetchRequest, from: From<T>? = nil, sectionBy: SectionBy? = nil, fetchClauses: [FetchClause]) {
+        
+        from?.applyToFetchRequest(fetchRequest, context: context, applyAffectedStores: false)
+        for clause in fetchClauses {
+            
+            clause.applyToFetchRequest(fetchRequest)
+        }
+        
+        if let from = from {
+            
+            self.reapplyAffectedStores = {
+                
+                return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+            }
+        }
+        else {
+            
+            guard let from = (fetchRequest.entity.flatMap { $0.managedObjectClassName }).flatMap(NSClassFromString).flatMap(From.init) else {
+                
+                fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a  From clause or an NSEntityDescription.")
+            }
+            
+            self.reapplyAffectedStores = {
+                
+                return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
+            }
+        }
+        
+        super.init(
+            fetchRequest: fetchRequest,
+            managedObjectContext: context,
+            sectionNameKeyPath: sectionBy?.sectionKeyPath,
+            cacheName: nil
+        )
+    }
+    
+    internal func performFetchFromSpecifiedStores() throws {
+        
+        if !self.reapplyAffectedStores() {
+            
+            CoreStore.log(
+                .Warning,
+                message: "Attempted to perform a fetch on an \(typeName(NSFetchedResultsController)) but could not find any persistent store for the entity \(typeName(self.fetchRequest.entityName))"
+            )
+        }
+        try self.performFetch()
+    }
+    
+    
+    // MARK: Private
+    
+    private let reapplyAffectedStores: () -> Bool
+}
--- a/CoreStore/Internal/FetchedResultsControllerDelegate.swift
+++ b/CoreStore/Internal/FetchedResultsControllerDelegate.swift
@@ -2,7 +2,7 @@
 //  FetchedResultsControllerDelegate.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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/CoreStore/Internal/Functions.swift
+++ b/CoreStore/Internal/Functions.swift
@@ -2,7 +2,7 @@
 //  Functions.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/CoreStore/Internal/MigrationManager.swift
+++ b/CoreStore/Internal/MigrationManager.swift
@@ -2,7 +2,7 @@
 //  MigrationManager.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectContext+CoreStore.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/CoreStore/Internal/NSManagedObjectContext+Querying.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Querying.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectContext+Querying.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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/CoreStore/Internal/NSManagedObjectContext+Setup.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Setup.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectContext+Setup.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectContext+Transaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -167,6 +167,18 @@ internal extension NSManagedObjectContext {
        }
    }
    
+    internal func refreshAllObjectsAsFaults() {
+        
+        if #available(iOS 8.3, OSX 10.11, *) {
+            
+            self.refreshAllObjects()
+        }
+        else {
+            
+            self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: false) }
+        }
+    }
+    
    
    // MARK: Private
    
--- a/CoreStore/Internal/NSManagedObjectModel+Setup.swift
+++ b/CoreStore/Internal/NSManagedObjectModel+Setup.swift
@@ -2,7 +2,7 @@
 //  NSManagedObjectModel+Setup.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -154,12 +154,13 @@ internal extension NSManagedObjectModel {
    }
    
    @nonobjc internal func entityTypesMapping() -> [String: NSManagedObject.Type] {
-    
-        return self.entityNameMapping.reduce([:]) { (var mapping, pair) in
+        
+        var mapping = [String: NSManagedObject.Type]()
+        self.entityNameMapping.forEach { (className, entityName) in
            
-            mapping[pair.1] = (NSClassFromString(pair.0)! as! NSManagedObject.Type)
-            return mapping
+            mapping[entityName] = (NSClassFromString(className)! as! NSManagedObject.Type)
        }
+        return mapping
    }
    
    @nonobjc internal func mergedModels() -> [NSManagedObjectModel] {
@@ -249,15 +250,16 @@ internal extension NSManagedObjectModel {
                return mapping as! [String: String]
            }
            
-            let mapping = self.entities.reduce([String: String]()) {
-                (var mapping, entityDescription) -> [String: String] in
+            var mapping = [String: String]()
+            self.entities.forEach {
                
-                if let entityName = entityDescription.name {
+                guard let entityName = $0.name else {
                    
-                    let className = entityDescription.managedObjectClassName
-                    mapping[className] = entityName
+                    return
                }
-                return mapping
+                
+                let className = $0.managedObjectClassName
+                mapping[className] = entityName
            }
            setAssociatedCopiedObject(
                mapping as NSDictionary,
--- a/CoreStore/Internal/NotificationObserver.swift
+++ b/CoreStore/Internal/NotificationObserver.swift
@@ -2,7 +2,7 @@
 //  NotificationObserver.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/CoreStore/Internal/WeakObject.swift
+++ b/CoreStore/Internal/WeakObject.swift
@@ -2,7 +2,7 @@
 //  WeakObject.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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/CoreStore/Logging/CoreStore+Logging.swift
+++ b/CoreStore/Logging/CoreStore+Logging.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Logging.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,8 +30,6 @@ import Foundation

 public extension CoreStore {
    
-    // MARK: Public
-    
    /**
    The `CoreStoreLogger` instance to be used. The default logger is an instance of a `DefaultLogger`.
    */
@@ -40,7 +38,7 @@ public extension CoreStore {
    
    // MARK: Internal
    
-    internal static func log(level: LogLevel, message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
+    internal static func log(level: LogLevel, message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
        
        self.logger.log(
            level: level,
@@ -51,7 +49,7 @@ public extension CoreStore {
        )
    }
    
-    internal static func handleError(error: NSError, _ message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
+    internal static func handleError(error: NSError, _ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
        
        self.logger.handleError(
            error: error,
@@ -62,7 +60,7 @@ public extension CoreStore {
        )
    }
    
-    internal static func assert(@autoclosure condition: () -> Bool, _ message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
+    internal static func assert(@autoclosure condition: () -> Bool, _ message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
        
        self.logger.assert(
            condition,
--- a/CoreStore/Logging/CoreStoreLogger.swift
+++ b/CoreStore/Logging/CoreStoreLogger.swift
@@ -2,7 +2,7 @@
 //  CoreStoreLogger.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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 Foundation
 // MARK: - LogLevel

 /**
-The `LogLevel` indicates the severity of a log message.
-*/
+ The `LogLevel` indicates the severity of a log message.
+ */
 public enum LogLevel {
    
    case Trace
@@ -43,41 +43,41 @@ public enum LogLevel {
 // MARK: - CoreStoreLogger

 /**
-Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStore.logger`. Calls to `log(...)`, `handleError(...)`, and `assert(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety.
-*/
+ Custom loggers should implement the `CoreStoreLogger` protocol and pass its instance to `CoreStore.logger`. Calls to `log(...)`, `handleError(...)`, and `assert(...)` are not tied to a specific queue/thread, so it is the implementer's job to handle thread-safety.
+ */
 public protocol CoreStoreLogger {
    
    /**
-    Handles log messages sent by the `CoreStore` framework.
-    
-    :level: the severity of the log message
-    :message: the log message
-    :fileName: the source file name
-    :lineNumber: the source line number
-    :functionName: the source function name
-    */
+     Handles log messages sent by the `CoreStore` framework.
+     
+     :level: the severity of the log message
+     :message: the log message
+     :fileName: the source file name
+     :lineNumber: the source line number
+     :functionName: the source function name
+     */
    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
    
    /**
-    Handles errors sent by the `CoreStore` framework.
-    
-    :error: the error
-    :message: the error message
-    :fileName: the source file name
-    :lineNumber: the source line number
-    :functionName: the source function name
-    */
+     Handles errors sent by the `CoreStore` framework.
+     
+     :error: the error
+     :message: the error message
+     :fileName: the source file name
+     :lineNumber: the source line number
+     :functionName: the source function name
+     */
    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
    
    /**
-    Handles assertions made throughout the `CoreStore` framework.
-    
-    :condition: the assertion condition
-    :message: the assertion message
-    :fileName: the source file name
-    :lineNumber: the source line number
-    :functionName: the source function name
-    */
+     Handles assertions made throughout the `CoreStore` framework.
+     
+     :condition: the assertion condition
+     :message: the assertion message
+     :fileName: the source file name
+     :lineNumber: the source line number
+     :functionName: the source function name
+     */
    func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
 }

@@ -86,7 +86,7 @@ public protocol CoreStoreLogger {

 internal func typeName<T>(value: T) -> String {
    
-    return "'\(_stdlib_getDemangledTypeName(value))'"
+    return "'\(String(reflecting: value.dynamicType))'"
 }

 internal func typeName<T>(value: T.Type) -> String {
@@ -101,6 +101,5 @@ internal func typeName(value: AnyClass) -> String {

 internal func typeName(name: String?) -> String {
    
-    let typeName = name ?? "unknown"
-    return "<\(typeName)>"
+    return "<\(name ?? "unknown")>"
 }
--- a/CoreStore/Logging/DefaultLogger.swift
+++ b/CoreStore/Logging/DefaultLogger.swift
@@ -2,7 +2,7 @@
 //  DefaultLogger.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,12 +29,12 @@ import Foundation
 // MARK: - DefaultLogger

 /**
-The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol.
-
- The `log(...)` method calls `print(...)` to print the level, source file name, line number, function name, and the log message.
- The `handleError(...)` method calls `print(...)` to print the source file name, line number, function name, and the error message.
- The `assert(...)` method calls `assert(...)` on the arguments.
-*/
+ The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol.
+ 
+ - The `log(...)` method calls `print(...)` to print the level, source file name, line number, function name, and the log message.
+ - The `handleError(...)` method calls `print(...)` to print the source file name, line number, function name, and the error message.
+ - The `assert(...)` method calls `assert(...)` on the arguments.
+ */
 public final class DefaultLogger: CoreStoreLogger {
    
    public init() { }
--- a/CoreStore/Migrating/CoreStore+Migration.swift
+++ b/CoreStore/Migrating/CoreStore+Migration.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Migration.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,15 +35,15 @@ import CoreData
 public extension CoreStore {
    
    /**
-    Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public static func addSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
        
        return try self.defaultStack.addSQLiteStore(
@@ -56,15 +56,15 @@ public extension CoreStore {
    }
    
    /**
-    Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Asynchronously adds to the `defaultStack` an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public static func addSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = NSBundle.allBundles(), resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
        
        return try self.defaultStack.addSQLiteStore(
@@ -77,14 +77,14 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Using the `defaultStack`, migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public static func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
        
        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
@@ -96,14 +96,14 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Using the `defaultStack`, migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public static func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
        
        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
@@ -115,13 +115,13 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
-    */
+     Using the `defaultStack`, checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
+     */
    @warn_unused_result
    public static func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
        
@@ -133,13 +133,13 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    :return: a `MigrationType` indicating the type of migration required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
-    */
+     Using the `defaultStack`, checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     :return: a `MigrationType` indicating the type of migration required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
+     */
    @warn_unused_result
    public static func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
        
--- a/CoreStore/Migrating/DataStack+Migration.swift
+++ b/CoreStore/Migrating/DataStack+Migration.swift
@@ -2,7 +2,7 @@
 //  DataStack+Migration.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,11 +35,11 @@ import CoreData
 public extension DataStack {
    
    /**
-    Asynchronously adds an in-memory store to the stack.
-    
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-    - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result.
-    */
+     Asynchronously adds an in-memory store to the stack.
+     
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
+     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result.
+     */
    public func addInMemoryStore(configuration configuration: String? = nil, completion: (PersistentStoreResult) -> Void) {
        
        self.coordinator.performBlock {
@@ -76,19 +76,19 @@ public extension DataStack {
    }
    
    /**
-    Asynchronously adds to the stack an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Asynchronously adds to the stack an SQLite store from the given SQLite file name. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public func addSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
        
        return try self.addSQLiteStore(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                fileName,
                isDirectory: false
            ),
@@ -100,15 +100,15 @@ public extension DataStack {
    }
    
    /**
-    Asynchronously adds to the stack an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Asynchronously adds to the stack an SQLite store from the given SQLite file URL. Note that using `addSQLiteStore(...)` instead of `addSQLiteStoreAndWait(...)` implies that the migrations are allowed and expected (thus the asynchronous `completion`.)
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to report failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - parameter completion: the closure to be executed on the main queue when the process completes, either due to success or failure. The closure's `PersistentStoreResult` argument indicates the result. This closure is NOT executed if an error is thrown, but will be executed with a `.Failure` result if an error occurs asynchronously.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public func addSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = NSBundle.allBundles(), resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
        
        CoreStore.assert(
@@ -231,18 +231,18 @@ public extension DataStack {
    }
    
    /**
-    Migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Migrates an SQLite store with the specified filename to the `DataStack`'s managed object model version WITHOUT adding the migrated store to the data stack.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
        
        return try self.upgradeSQLiteStoreIfNeeded(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                fileName,
                isDirectory: false
            ),
@@ -253,14 +253,14 @@ public extension DataStack {
    }
    
    /**
-    Migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
-    - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
-    */
+     Migrates an SQLite store at the specified file URL and configuration name to the `DataStack`'s managed object model version. This method does NOT add the migrated store to the data stack.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - parameter sourceBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.mainBundle()`.
+     - returns: an `NSProgress` instance if a migration has started, or `nil` is no migrations are required
+     */
    public func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
        
        let metadata: [String: AnyObject]
@@ -291,18 +291,18 @@ public extension DataStack {
    }
    
    /**
-    Checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
-    */
+     Checks for the required migrations needed for the store with the specified filename and configuration to be migrated to the `DataStack`'s managed object model version. This method throws an error if the store does not exist, if inspection of the store failed, or no mapping model was found/inferred.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     :return: an array of `MigrationType`s indicating the chain of migrations required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
+     */
    @warn_unused_result
    public func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
        
        return try requiredMigrationsForSQLiteStore(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                fileName,
                isDirectory: false
            ),
@@ -312,13 +312,13 @@ public extension DataStack {
    }
    
    /**
-    Checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
-    - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
-    :return: a `MigrationType` indicating the type of migration required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
-    */
+     Checks if the store at the specified file URL and configuration needs to be migrated to the `DataStack`'s managed object model version.
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil` which indicates the "Default" configuration.
+     - parameter mappingModelBundles: an optional array of bundles to search mapping model files from. If not set, defaults to the `NSBundle.allBundles()`.
+     :return: a `MigrationType` indicating the type of migration required for the store; or `nil` if either inspection of the store failed, or no mapping model was found/inferred. `MigrationType` acts as a `Bool` and evaluates to `false` if no migration is required, and `true` if either a lightweight or custom migration is needed.
+     */
    @warn_unused_result
    public func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
        
--- a/CoreStore/Migrating/MigrationChain.swift
+++ b/CoreStore/Migrating/MigrationChain.swift
@@ -2,7 +2,7 @@
 //  MigrationChain.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,36 +30,36 @@ import CoreData
 // MARK: - MigrationChain

 /**
-A `MigrationChain` indicates the sequence of model versions to be used as the order for incremental migration. This is typically passed to the `DataStack` initializer and will be applied to all stores added to the `DataStack` with `addSQLiteStore(...)` and its variants.
-
-Initializing with empty values (either `nil`, `[]`, or `[:]`) instructs the `DataStack` to use the .xcdatamodel's current version as the final version, and to disable incremental migrations:
-
-    let dataStack = DataStack(migrationChain: nil)
-
-This means that the mapping model will be computed from the store's version straight to the `DataStack`'s model version.
-To support incremental migrations, specify the linear order of versions:
-
-    let dataStack = DataStack(migrationChain: 
-        ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4"])
-
-or for more complex migration paths, a version tree that maps the key-values to the source-destination versions:
-
-    let dataStack = DataStack(migrationChain: [
-        "MyAppModel": "MyAppModelV3",
-        "MyAppModelV2": "MyAppModelV4",
-        "MyAppModelV3": "MyAppModelV4"
-    ])
-
-This allows for different migration paths depending on the starting version. The example above resolves to the following paths:
- MyAppModel-MyAppModelV3-MyAppModelV4
- MyAppModelV2-MyAppModelV4
- MyAppModelV3-MyAppModelV4
-
-The `MigrationChain` is validated when passed to the `DataStack` and unless it is empty, will raise an assertion if any of the following conditions are met:
- a version appears twice in an array
- a version appears twice as a key in a dictionary literal
- a loop is found in any of the paths
-*/
+ A `MigrationChain` indicates the sequence of model versions to be used as the order for progressive migrations. This is typically passed to the `DataStack` initializer and will be applied to all stores added to the `DataStack` with `addSQLiteStore(...)` and its variants.
+ 
+ Initializing with empty values (either `nil`, `[]`, or `[:]`) instructs the `DataStack` to use the .xcdatamodel's current version as the final version, and to disable progressive migrations:
+ ```
+ let dataStack = DataStack(migrationChain: nil)
+ ```
+ This means that the mapping model will be computed from the store's version straight to the `DataStack`'s model version.
+ To support progressive migrations, specify the linear order of versions:
+ ```
+ let dataStack = DataStack(migrationChain:
+    ["MyAppModel", "MyAppModelV2", "MyAppModelV3", "MyAppModelV4"])
+ ```
+ or for more complex migration paths, a version tree that maps the key-values to the source-destination versions:
+ ```
+ let dataStack = DataStack(migrationChain: [
+     "MyAppModel": "MyAppModelV3",
+     "MyAppModelV2": "MyAppModelV4",
+     "MyAppModelV3": "MyAppModelV4"
+ ])
+ ```
+ This allows for different migration paths depending on the starting version. The example above resolves to the following paths:
+ - MyAppModel-MyAppModelV3-MyAppModelV4
+ - MyAppModelV2-MyAppModelV4
+ - MyAppModelV3-MyAppModelV4
+ 
+ The `MigrationChain` is validated when passed to the `DataStack` and unless it is empty, will raise an assertion if any of the following conditions are met:
+ - a version appears twice in an array
+ - a version appears twice as a key in a dictionary literal
+ - a loop is found in any of the paths
+ */
 public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, DictionaryLiteralConvertible, ArrayLiteralConvertible {
    
    // MARK: NilLiteralConvertible
@@ -111,22 +111,24 @@ public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, D
    public init(dictionaryLiteral elements: (String, String)...) {
        
        var valid = true
-        let versionTree = elements.reduce([String: String]()) { (var versionTree, tuple: (String, String)) -> [String: String] in
+        var versionTree = [String: String]()
+        elements.forEach { (sourceVersion, destinationVersion) in
            
-            if let _ = versionTree.updateValue(tuple.1, forKey: tuple.0) {
+            guard let _ = versionTree.updateValue(destinationVersion, forKey: sourceVersion) else {
                
-                CoreStore.assert(false, "\(typeName(MigrationChain))'s migration chain could not be created due to ambiguous version paths.")
-                
-                valid = false
+                return
            }
-            return versionTree
+            
+            CoreStore.assert(false, "\(typeName(MigrationChain))'s migration chain could not be created due to ambiguous version paths.")
+            
+            valid = false
        }
        let leafVersions = Set(
            elements.filter { (tuple: (String, String)) -> Bool in
                
                return versionTree[tuple.1] == nil
                
-            }.map { $1 }
+                }.map { $1 }
        )
        
        let isVersionAmbiguous = { (start: String) -> Bool in
--- a/CoreStore/Migrating/MigrationResult.swift
+++ b/CoreStore/Migrating/MigrationResult.swift
@@ -2,7 +2,7 @@
 //  MigrationResult.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,46 +29,44 @@ import Foundation
 // MARK: - MigrationResult

 /**
-The `MigrationResult` indicates the result of a migration.
-The `MigrationResult` can be treated as a boolean:
-
-    CoreStore.upgradeSQLiteStoreIfNeeded { transaction in
-        // ...
-        let result = transaction.commit()
-        if result {
-            // succeeded
-        }
-        else {
-            // failed
-        }
-    }
-
-or as an `enum`, where the resulting associated object can also be inspected:
-
-    CoreStore.beginAsynchronous { transaction in
-        // ...
-        let result = transaction.commit()
-        switch result {
-        case .Success(let hasChanges):
-            // hasChanges indicates if there were changes or not
-        case .Failure(let error):
-            // error is the NSError instance for the failure
-        }
-    }
-```
-*/
+ The `MigrationResult` indicates the result of a migration.
+ The `MigrationResult` can be treated as a boolean:
+ ```
+ CoreStore.upgradeSQLiteStoreIfNeeded { transaction in
+     // ...
+     let result = transaction.commit()
+     if result {
+         // succeeded
+     }
+     else {
+         // failed
+     }
+ }
+ ```
+ or as an `enum`, where the resulting associated object can also be inspected:
+ ```
+ CoreStore.beginAsynchronous { transaction in
+     // ...
+     let result = transaction.commit()
+     switch result {
+     case .Success(let hasChanges):
+         // hasChanges indicates if there were changes or not
+     case .Failure(let error):
+         // error is the NSError instance for the failure
+     }
+ }
+ ```
+ */
 public enum MigrationResult {
    
-    // MARK: Public
-    
    /**
-    `MigrationResult.Success` indicates either the migration succeeded, or there were no migrations needed. The associated value is an array of `MigrationType`s reflecting the migration steps completed.
-    */
+     `MigrationResult.Success` indicates either the migration succeeded, or there were no migrations needed. The associated value is an array of `MigrationType`s reflecting the migration steps completed.
+     */
    case Success([MigrationType])
    
    /**
-    `SaveResult.Failure` indicates that the migration failed. The associated object for this value is the related `NSError` instance.
-    */
+     `SaveResult.Failure` indicates that the migration failed. The associated object for this value is the related `NSError` instance.
+     */
    case Failure(NSError)
    
    
@@ -103,6 +101,7 @@ extension MigrationResult: BooleanType {
    public var boolValue: Bool {
        
        switch self {
+            
        case .Success: return true
        case .Failure: return false
        }
--- a/CoreStore/Migrating/MigrationType.swift
+++ b/CoreStore/Migrating/MigrationType.swift
@@ -2,7 +2,7 @@
 //  MigrationType.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,30 +29,28 @@ import Foundation
 // MARK: - MigrationType

 /**
-The `MigrationType` specifies the type of migration required for a store.
-*/
+ The `MigrationType` specifies the type of migration required for a store.
+ */
 public enum MigrationType: BooleanType {
    
-    // MARK: Public
-    
    /**
-    Indicates that the persistent store matches the latest model version and no migration is needed
-    */
+     Indicates that the persistent store matches the latest model version and no migration is needed
+     */
    case None(version: String)
    
    /**
-    Indicates that the persistent store does not match the latest model version but Core Data can infer the mapping model, so a lightweight migration is needed
-    */
+     Indicates that the persistent store does not match the latest model version but Core Data can infer the mapping model, so a lightweight migration is needed
+     */
    case Lightweight(sourceVersion: String, destinationVersion: String)
    
    /**
-    Indicates that the persistent store does not match the latest model version and Core Data could not infer a mapping model, so a custom migration is needed
-    */
+     Indicates that the persistent store does not match the latest model version and Core Data could not infer a mapping model, so a custom migration is needed
+     */
    case Heavyweight(sourceVersion: String, destinationVersion: String)
    
    /**
-    Returns the source model version for the migration type. If no migration is required, `sourceVersion` will be equal to the `destinationVersion`.
-    */
+     Returns the source model version for the migration type. If no migration is required, `sourceVersion` will be equal to the `destinationVersion`.
+     */
    public var sourceVersion: String {
        
        switch self {
@@ -69,8 +67,8 @@ public enum MigrationType: BooleanType {
    }
    
    /**
-    Returns the destination model version for the migration type. If no migration is required, `destinationVersion` will be equal to the `sourceVersion`.
-    */
+     Returns the destination model version for the migration type. If no migration is required, `destinationVersion` will be equal to the `sourceVersion`.
+     */
    public var destinationVersion: String {
        
        switch self {
@@ -87,8 +85,8 @@ public enum MigrationType: BooleanType {
    }
    
    /**
-    Returns `true` if the `MigrationType` is a lightweight migration. Used as syntactic sugar.
-    */
+     Returns `true` if the `MigrationType` is a lightweight migration. Used as syntactic sugar.
+     */
    public var isLightweightMigration: Bool {
        
        if case .Lightweight = self {
@@ -99,8 +97,8 @@ public enum MigrationType: BooleanType {
    }
    
    /**
-    Returns `true` if the `MigrationType` is a heavyweight migration. Used as syntactic sugar.
-    */
+     Returns `true` if the `MigrationType` is a heavyweight migration. Used as syntactic sugar.
+     */
    public var isHeavyweightMigration: Bool {
        
        if case .Heavyweight = self {
--- a/CoreStore/NSError+CoreStore.swift
+++ b/CoreStore/NSError+CoreStore.swift
@@ -2,7 +2,7 @@
 //  NSError+CoreStore.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -26,45 +26,48 @@
 import Foundation
 import CoreData

+
+// MARK: - CoreStoreError
+
 /**
-The `NSError` error domain for `CoreStore`.
-*/
+ The `NSError` error domain for `CoreStore`.
+ */
 public let CoreStoreErrorDomain = "com.corestore.error"

 /**
-The `NSError` error codes for `CoreStoreErrorDomain`.
-*/
+ The `NSError` error codes for `CoreStoreErrorDomain`.
+ */
 public enum CoreStoreErrorCode: Int {
    
    /**
-    A failure occured because of an unknown error.
-    */
+     A failure occured because of an unknown error.
+     */
    case UnknownError
    
    /**
-    The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`.
-    */
+     The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`.
+     */
    case DifferentPersistentStoreExistsAtURL
    
    /**
-    The `NSPersistentStore` specified could not be found.
-    */
+     The `NSPersistentStore` specified could not be found.
+     */
    case PersistentStoreNotFound
    
    /**
-    An `NSMappingModel` could not be found for a specific source and destination model versions.
-    */
+     An `NSMappingModel` could not be found for a specific source and destination model versions.
+     */
    case MappingModelNotFound
 }


-// MARK: - NSError+CoreStore
+// MARK: - NSError

 public extension NSError {
-   
+    
    /**
-    If the error's domain is equal to `CoreStoreErrorDomain`, returns the associated `CoreStoreErrorCode`. For other domains, returns `nil`.
-    */
+     If the error's domain is equal to `CoreStoreErrorDomain`, returns the associated `CoreStoreErrorCode`. For other domains, returns `nil`.
+     */
    public var coreStoreErrorCode: CoreStoreErrorCode? {
        
        return (self.domain == CoreStoreErrorDomain
--- a/CoreStore/Observing/CoreStore+Observing.swift
+++ b/CoreStore/Observing/CoreStore+Observing.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Observing.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -32,14 +32,12 @@ import CoreData
@available(OSX, unavailable)
 public extension CoreStore {
    
-    // MARK: Public
-    
    /**
-    Using the `defaultStack`, creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
-    
-    - parameter object: the `NSManagedObject` to observe changes from
-    - returns: a `ObjectMonitor` that monitors changes to `object`
-    */
+     Using the `defaultStack`, creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
+     
+     - parameter object: the `NSManagedObject` to observe changes from
+     - returns: a `ObjectMonitor` that monitors changes to `object`
+     */
    @warn_unused_result
    public static func monitorObject<T: NSManagedObject>(object: T) -> ObjectMonitor<T> {
        
@@ -47,11 +45,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
+     Using the `defaultStack`, creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
     */
    @warn_unused_result
    public static func monitorList<T: NSManagedObject>(from: From<T>, _ queryClauses: FetchClause...) -> ListMonitor<T> {
@@ -60,12 +58,12 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     Using the `defaultStack`, creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
    @warn_unused_result
    public static func monitorList<T: NSManagedObject>(from: From<T>, _ queryClauses: [FetchClause]) -> ListMonitor<T> {
        
@@ -97,13 +95,13 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
    @warn_unused_result
    public static func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
        
@@ -111,13 +109,13 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
-    */
+     Using the `defaultStack`, creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
    @warn_unused_result
    public static func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
        
--- a/CoreStore/Observing/DataStack+Observing.swift
+++ b/CoreStore/Observing/DataStack+Observing.swift
@@ -2,7 +2,7 @@
 //  DataStack+Observing.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,14 +35,12 @@ import CoreData
@available(OSX, unavailable)
 public extension DataStack {
    
-    // MARK: Public
-    
    /**
-    Creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
-    
-    - parameter object: the `NSManagedObject` to observe changes from
-    - returns: a `ObjectMonitor` that monitors changes to `object`
-    */
+     Creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
+     
+     - parameter object: the `NSManagedObject` to observe changes from
+     - returns: a `ObjectMonitor` that monitors changes to `object`
+     */
    @warn_unused_result
    public func monitorObject<T: NSManagedObject>(object: T) -> ObjectMonitor<T> {
        
@@ -58,11 +56,11 @@ public extension DataStack {
    }
    
    /**
-    Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
+     Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
     */
    @warn_unused_result
    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
@@ -71,11 +69,11 @@ public extension DataStack {
    }
    
    /**
-    Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
+     Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
     */
    @warn_unused_result
    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
@@ -137,26 +135,26 @@ public extension DataStack {
    }
    
    /**
-    Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
+     Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
     */
    @warn_unused_result
    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
-     
+        
        return self.monitorSectionedList(from, sectionBy, fetchClauses)
    }
    
    /**
-    Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
-    
-    - parameter from: a `From` clause indicating the entity type
-    - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    - returns: a `ListMonitor` instance that monitors changes to the list
+     Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
     */
    @warn_unused_result
    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
--- a/CoreStore/Observing/ListMonitor.swift
+++ b/CoreStore/Observing/ListMonitor.swift
@@ -2,7 +2,7 @@
 //  ListMonitor.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -33,88 +33,88 @@ import CoreData
 // MARK: - ListMonitor

 /**
-The `ListMonitor` monitors changes to a list of `NSManagedObject` instances. Observers that implement the `ListObserver` protocol may then register themselves to the `ListMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorList(
-        From(MyPersonEntity),
-        Where("title", isEqualTo: "Engineer"),
-        OrderBy(.Ascending("lastName"))
-    )
-    monitor.addObserver(self)
-
-The `ListMonitor` instance needs to be held on (retained) for as long as the list needs to be observed.
-Observers registered via `addObserver(_:)` are not retained. `ListMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
-
-Lists created with `monitorList(...)` keep a single-section list of objects, where each object can be accessed by index:
-
-    let firstPerson: MyPersonEntity = monitor[0]
-
-Accessing the list with an index above the valid range will throw an exception.
-
-Creating a sectioned-list is also possible with the `monitorSectionedList(...)` method:
-
-    let monitor = CoreStore.monitorSectionedList(
-        From(MyPersonEntity),
-        SectionBy("age") { "Age \($0)" },
-        Where("title", isEqualTo: "Engineer"),
-        OrderBy(.Ascending("lastName"))
-    )
-    monitor.addObserver(self)
-
-Objects from `ListMonitor`s created this way can be accessed either by an `NSIndexPath` or a tuple:
-
-    let indexPath = NSIndexPath(forItem: 3, inSection: 2)
-    let person1 = monitor[indexPath]
-    let person2 = monitor[2, 3]
-
-In the example above, both `person1` and `person2` will contain the object at section=2, index=3.
-*/
+ The `ListMonitor` monitors changes to a list of `NSManagedObject` instances. Observers that implement the `ListObserver` protocol may then register themselves to the `ListMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorList(
+     From(MyPersonEntity),
+     Where("title", isEqualTo: "Engineer"),
+     OrderBy(.Ascending("lastName"))
+ )
+ monitor.addObserver(self)
+ ```
+ The `ListMonitor` instance needs to be held on (retained) for as long as the list needs to be observed.
+ Observers registered via `addObserver(_:)` are not retained. `ListMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+ 
+ Lists created with `monitorList(...)` keep a single-section list of objects, where each object can be accessed by index:
+ ```
+ let firstPerson: MyPersonEntity = monitor[0]
+ ```
+ Accessing the list with an index above the valid range will throw an exception.
+ 
+ Creating a sectioned-list is also possible with the `monitorSectionedList(...)` method:
+ ```
+ let monitor = CoreStore.monitorSectionedList(
+     From(MyPersonEntity),
+     SectionBy("age") { "Age \($0)" },
+     Where("title", isEqualTo: "Engineer"),
+     OrderBy(.Ascending("lastName"))
+ )
+ monitor.addObserver(self)
+ ```
+ Objects from `ListMonitor`s created this way can be accessed either by an `NSIndexPath` or a tuple:
+ ```
+ let indexPath = NSIndexPath(forItem: 3, inSection: 2)
+ let person1 = monitor[indexPath]
+ let person2 = monitor[2, 3]
+ ```
+ In the example above, both `person1` and `person2` will contain the object at section=2, index=3.
+ */
@available(OSX, unavailable)
 public final class ListMonitor<T: NSManagedObject> {
    
    // MARK: Public (Accessors)
    
    /**
-    Returns the object at the given index within the first section. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
-    
-    - parameter index: the index of the object. Using an index above the valid range will throw an exception.
-    - returns: the `NSManagedObject` at the specified index
-    */
+     Returns the object at the given index within the first section. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
+     
+     - parameter index: the index of the object. Using an index above the valid range will throw an exception.
+     - returns: the `NSManagedObject` at the specified index
+     */
    public subscript(index: Int) -> T {
        
        return self[0, index]
    }
    
    /**
-    Returns the object at the given index, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
-    
-    - parameter index: the index for the object. Using an index above the valid range will return `nil`.
-    - returns: the `NSManagedObject` at the specified index, or `nil` if out of bounds
-    */
+     Returns the object at the given index, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
+     
+     - parameter index: the index for the object. Using an index above the valid range will return `nil`.
+     - returns: the `NSManagedObject` at the specified index, or `nil` if out of bounds
+     */
    public subscript(safeIndex index: Int) -> T? {
        
        return self[safeSectionIndex: 0, safeItemIndex: index]
    }
    
    /**
-    Returns the object at the given `sectionIndex` and `itemIndex`. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
-    
-    - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will throw an exception.
-    - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will throw an exception.
-    - returns: the `NSManagedObject` at the specified section and item index
-    */
+     Returns the object at the given `sectionIndex` and `itemIndex`. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
+     
+     - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will throw an exception.
+     - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will throw an exception.
+     - returns: the `NSManagedObject` at the specified section and item index
+     */
    public subscript(sectionIndex: Int, itemIndex: Int) -> T {
        
        return self[NSIndexPath(indexes: [sectionIndex, itemIndex], length: 2)]
    }
    
    /**
-    Returns the object at the given section and item index, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
-    
-    - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will return `nil`.
-    - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`.
-    - returns: the `NSManagedObject` at the specified section and item index, or `nil` if out of bounds
-    */
+     Returns the object at the given section and item index, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
+     
+     - parameter sectionIndex: the section index for the object. Using a `sectionIndex` with an invalid range will return `nil`.
+     - parameter itemIndex: the index for the object within the section. Using an `itemIndex` with an invalid range will return `nil`.
+     - returns: the `NSManagedObject` at the specified section and item index, or `nil` if out of bounds
+     */
    public subscript(safeSectionIndex sectionIndex: Int, safeItemIndex itemIndex: Int) -> T? {
        
        CoreStore.assert(
@@ -137,11 +137,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the object at the given `NSIndexPath`. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
-    
-    - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will throw an exception.
-    - returns: the `NSManagedObject` at the specified index path
-    */
+     Returns the object at the given `NSIndexPath`. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
+     
+     - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will throw an exception.
+     - returns: the `NSManagedObject` at the specified index path
+     */
    public subscript(indexPath: NSIndexPath) -> T {
        
        CoreStore.assert(
@@ -153,11 +153,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the object at the given `NSIndexPath`, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
-    
-    - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will return `nil`.
-    - returns: the `NSManagedObject` at the specified index path, or `nil` if out of bounds
-    */
+     Returns the object at the given `NSIndexPath`, or `nil` if out of bounds. This subscript indexer is typically used for `ListMonitor`s created with `monitorSectionedList(_:)`.
+     
+     - parameter indexPath: the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will return `nil`.
+     - returns: the `NSManagedObject` at the specified index path, or `nil` if out of bounds
+     */
    public subscript(safeIndexPath indexPath: NSIndexPath) -> T? {
        
        return self[
@@ -167,10 +167,10 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Checks if the `ListMonitor` has at least one object in any section.
-    
-    - returns: `true` if at least one object in any section exists, `false` otherwise
-    */
+     Checks if the `ListMonitor` has at least one object in any section.
+     
+     - returns: `true` if at least one object in any section exists, `false` otherwise
+     */
    @warn_unused_result
    public func hasObjects() -> Bool {
        
@@ -178,11 +178,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Checks if the `ListMonitor` has at least one object the specified section.
-    
-    - parameter section: the section index. Using an index outside the valid range will return `false`.
-    - returns: `true` if at least one object in the specified section exists, `false` otherwise
-    */
+     Checks if the `ListMonitor` has at least one object the specified section.
+     
+     - parameter section: the section index. Using an index outside the valid range will return `false`.
+     - returns: `true` if at least one object in the specified section exists, `false` otherwise
+     */
    @warn_unused_result
    public func hasObjectsInSection(section: Int) -> Bool {
        
@@ -190,10 +190,10 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns all objects in all sections
-    
-    - returns: all objects in all sections
-    */
+     Returns all objects in all sections
+     
+     - returns: all objects in all sections
+     */
    @warn_unused_result
    public func objectsInAllSections() -> [T] {
        
@@ -206,11 +206,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns all objects in the specified section
-    
-    - parameter section: the section index. Using an index outside the valid range will throw an exception.
-    - returns: all objects in the specified section
-    */
+     Returns all objects in the specified section
+     
+     - parameter section: the section index. Using an index outside the valid range will throw an exception.
+     - returns: all objects in the specified section
+     */
    @warn_unused_result
    public func objectsInSection(section: Int) -> [T] {
        
@@ -223,11 +223,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns all objects in the specified section, or `nil` if out of bounds.
-    
-    - parameter section: the section index. Using an index outside the valid range will return `nil`.
-    - returns: all objects in the specified section
-    */
+     Returns all objects in the specified section, or `nil` if out of bounds.
+     
+     - parameter section: the section index. Using an index outside the valid range will return `nil`.
+     - returns: all objects in the specified section
+     */
    @warn_unused_result
    public func objectsInSection(safeSectionIndex section: Int) -> [T]? {
        
@@ -240,10 +240,10 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the number of sections
-    
-    - returns: the number of sections
-    */
+     Returns the number of sections
+     
+     - returns: the number of sections
+     */
    @warn_unused_result
    public func numberOfSections() -> Int {
        
@@ -256,10 +256,10 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the number of objects in all sections
-    
-    - returns: the number of objects in all sections
-    */
+     Returns the number of objects in all sections
+     
+     - returns: the number of objects in all sections
+     */
    @warn_unused_result
    public func numberOfObjects() -> Int {
        
@@ -272,11 +272,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the number of objects in the specified section
-    
-    - parameter section: the section index. Using an index outside the valid range will throw an exception.
-    - returns: the number of objects in the specified section
-    */
+     Returns the number of objects in the specified section
+     
+     - parameter section: the section index. Using an index outside the valid range will throw an exception.
+     - returns: the number of objects in the specified section
+     */
    @warn_unused_result
    public func numberOfObjectsInSection(section: Int) -> Int {
        
@@ -284,11 +284,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the number of objects in the specified section, or `nil` if out of bounds.
-    
-    - parameter section: the section index. Using an index outside the valid range will return `nil`.
-    - returns: the number of objects in the specified section
-    */
+     Returns the number of objects in the specified section, or `nil` if out of bounds.
+     
+     - parameter section: the section index. Using an index outside the valid range will return `nil`.
+     - returns: the number of objects in the specified section
+     */
    @warn_unused_result
    public func numberOfObjectsInSection(safeSectionIndex section: Int) -> Int? {
        
@@ -296,11 +296,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the `NSFetchedResultsSectionInfo` for the specified section
-    
-    - parameter section: the section index. Using an index outside the valid range will throw an exception.
-    - returns: the `NSFetchedResultsSectionInfo` for the specified section
-    */
+     Returns the `NSFetchedResultsSectionInfo` for the specified section
+     
+     - parameter section: the section index. Using an index outside the valid range will throw an exception.
+     - returns: the `NSFetchedResultsSectionInfo` for the specified section
+     */
    @warn_unused_result
    public func sectionInfoAtIndex(section: Int) -> NSFetchedResultsSectionInfo {
        
@@ -313,11 +313,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if out of bounds.
-    
-    - parameter section: the section index. Using an index outside the valid range will return `nil`.
-    - returns: the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if the section index is out of bounds.
-    */
+     Returns the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if out of bounds.
+     
+     - parameter section: the section index. Using an index outside the valid range will return `nil`.
+     - returns: the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if the section index is out of bounds.
+     */
    @warn_unused_result
    public func sectionInfoAtIndex(safeSectionIndex section: Int) -> NSFetchedResultsSectionInfo? {
        
@@ -386,11 +386,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
-    
-    - parameter object: the `NSManagedObject` to search the index of
-    - returns: the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
-    */
+     Returns the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
+     
+     - parameter object: the `NSManagedObject` to search the index of
+     - returns: the index of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
+     */
    @warn_unused_result
    public func indexOf(object: T) -> Int? {
        
@@ -403,11 +403,11 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Returns the `NSIndexPath` of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
-    
-    - parameter object: the `NSManagedObject` to search the index of
-    - returns: the `NSIndexPath` of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
-    */
+     Returns the `NSIndexPath` of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
+     
+     - parameter object: the `NSManagedObject` to search the index of
+     - returns: the `NSIndexPath` of the `NSManagedObject` if it exists in the `ListMonitor`'s fetched objects, or `nil` if not found.
+     */
    @warn_unused_result
    public func indexPathOf(object: T) -> NSIndexPath? {
        
@@ -423,16 +423,16 @@ public final class ListMonitor<T: NSManagedObject> {
    // MARK: Public (Observers)
    
    /**
-    Registers a `ListObserver` to be notified when changes to the receiver's list occur.
-    
-    To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
-    
-    - parameter observer: a `ListObserver` to send change notifications to
-    */
+     Registers a `ListObserver` to be notified when changes to the receiver's list occur.
+     
+     To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
+     
+     - parameter observer: a `ListObserver` to send change notifications to
+     */
    public func addObserver<U: ListObserver where U.ListEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -497,16 +497,16 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Registers a `ListObjectObserver` to be notified when changes to the receiver's list occur.
-    
-    To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
-    
-    - parameter observer: a `ListObjectObserver` to send change notifications to
-    */
+     Registers a `ListObjectObserver` to be notified when changes to the receiver's list occur.
+     
+     To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
+     
+     - parameter observer: a `ListObjectObserver` to send change notifications to
+     */
    public func addObserver<U: ListObjectObserver where U.ListEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -641,16 +641,16 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Registers a `ListSectionObserver` to be notified when changes to the receiver's list occur.
-    
-    To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
-    
-    - parameter observer: a `ListSectionObserver` to send change notifications to
-    */
+     Registers a `ListSectionObserver` to be notified when changes to the receiver's list occur.
+     
+     To prevent retain-cycles, `ListMonitor` only keeps `weak` references to its observers.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
+     
+     - parameter observer: a `ListSectionObserver` to send change notifications to
+     */
    public func addObserver<U: ListSectionObserver where U.ListEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -737,7 +737,7 @@ public final class ListMonitor<T: NSManagedObject> {
            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                guard let observer = observer else {
-                 
+                    
                    return
                }
                observer.listMonitor(
@@ -820,12 +820,12 @@ public final class ListMonitor<T: NSManagedObject> {
    }
    
    /**
-    Unregisters a `ListObserver` from receiving notifications for changes to the receiver's list.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    - parameter observer: a `ListObserver` to unregister notifications to
-    */
+     Unregisters a `ListObserver` from receiving notifications for changes to the receiver's list.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     - parameter observer: a `ListObserver` to unregister notifications to
+     */
    public func removeObserver<U: ListObserver where U.ListEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -852,29 +852,29 @@ public final class ListMonitor<T: NSManagedObject> {
    // MARK: Public (Refetching)
    
    /**
-    Returns `true` if a call to `refetch(...)` was made to the `ListMonitor` and is currently waiting for the fetching to complete. Returns `false` otherwise.
-    */
+     Returns `true` if a call to `refetch(...)` was made to the `ListMonitor` and is currently waiting for the fetching to complete. Returns `false` otherwise.
+     */
    private(set) public var isPendingRefetch = false
    
    /**
-    Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-    
-    `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
-    
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. Note that only specified clauses will be changed; unspecified clauses will use previous values.
-    */
+     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+     
+     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
+     
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. Note that only specified clauses will be changed; unspecified clauses will use previous values.
+     */
    public func refetch(fetchClauses: FetchClause...) {
        
        self.refetch(fetchClauses)
    }
    
    /**
-    Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-    
-    `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
-    
-    - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. Note that only specified clauses will be changed; unspecified clauses will use previous values.
-    */
+     Asks the `ListMonitor` to refetch its objects using the specified series of `FetchClause`s. Note that this method does not execute the fetch immediately; the actual fetching will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+     
+     `refetch(...)` broadcasts `listMonitorWillRefetch(...)` to its observers immediately, and then `listMonitorDidRefetch(...)` after the new fetch request completes.
+     
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses. Note that only specified clauses will be changed; unspecified clauses will use previous values.
+     */
    public func refetch(fetchClauses: [FetchClause]) {
        
        CoreStore.assert(
@@ -882,12 +882,15 @@ public final class ListMonitor<T: NSManagedObject> {
            "Attempted to refetch a \(typeName(self)) outside the main thread."
        )
        
-        self.isPendingRefetch = true
-        
-        NSNotificationCenter.defaultCenter().postNotificationName(
-            ListMonitorWillRefetchListNotification,
-            object: self
-        )
+        if !self.isPendingRefetch {
+            
+            self.isPendingRefetch = true
+            
+            NSNotificationCenter.defaultCenter().postNotificationName(
+                ListMonitorWillRefetchListNotification,
+                object: self
+            )
+        }
        
        self.taskGroup.notify(.Main) { [weak self] () -> Void in
            
@@ -904,14 +907,14 @@ public final class ListMonitor<T: NSManagedObject> {
                clause.applyToFetchRequest(fetchRequest)
            }
            
-            strongSelf.parentStack?.childTransactionQueue.async {
+            strongSelf.transactionQueue.async {
                
                guard let strongSelf = self else {
                    
                    return
                }
                
-                try! strongSelf.fetchedResultsController.performFetch()
+                try! strongSelf.fetchedResultsController.performFetchFromSpecifiedStores()
                
                GCDQueue.Main.async { () -> Void in
                    
@@ -936,38 +939,56 @@ public final class ListMonitor<T: NSManagedObject> {
    // MARK: Internal
    
    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
-     
+        
        self.init(
-            dataStack: dataStack,
+            context: dataStack.mainContext,
+            transactionQueue: dataStack.childTransactionQueue,
            from: from,
            sectionBy: sectionBy,
            fetchClauses: fetchClauses,
-            prepareFetch: { _, performFetch in performFetch() }
+            createAsynchronously: nil
        )
    }
    
    internal convenience init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: (ListMonitor<T>) -> Void) {
        
+        let queue = dataStack.childTransactionQueue
        self.init(
-            dataStack: dataStack,
+            context: dataStack.mainContext,
+            transactionQueue: queue,
            from: from,
            sectionBy: sectionBy,
            fetchClauses: fetchClauses,
-            prepareFetch: { listMonitor, performFetch in
-                
-                dataStack.childTransactionQueue.async {
-                    
-                    performFetch()
-                    GCDQueue.Main.async {
-                        
-                        createAsynchronously(listMonitor)
-                    }
-                }
-            }
+            createAsynchronously: createAsynchronously
        )
    }
    
-    private init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], prepareFetch: (ListMonitor<T>, () -> Void) -> Void) {
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
+        
+        self.init(
+            context: unsafeTransaction.context,
+            transactionQueue: unsafeTransaction.transactionQueue,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            createAsynchronously: nil
+        )
+    }
+    
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: (ListMonitor<T>) -> Void) {
+        
+        let queue = unsafeTransaction.transactionQueue
+        self.init(
+            context: unsafeTransaction.context,
+            transactionQueue: queue,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+    
+    private init(context: NSManagedObjectContext, transactionQueue: GCDQueue, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause], createAsynchronously: ((ListMonitor<T>) -> Void)?) {
        
        let fetchRequest = NSFetchRequest()
        fetchRequest.fetchLimit = 0
@@ -976,8 +997,8 @@ public final class ListMonitor<T: NSManagedObject> {
        fetchRequest.includesPendingChanges = false
        fetchRequest.shouldRefreshRefetchedObjects = true
        
-        let fetchedResultsController = NSFetchedResultsController(
-            dataStack: dataStack,
+        let fetchedResultsController = CoreStoreFetchedResultsController<T>(
+            context: context,
            fetchRequest: fetchRequest,
            from: from,
            sectionBy: sectionBy,
@@ -988,7 +1009,6 @@ public final class ListMonitor<T: NSManagedObject> {
        
        self.fetchedResultsController = fetchedResultsController
        self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
-        self.parentStack = dataStack
        
        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
            
@@ -998,26 +1018,118 @@ public final class ListMonitor<T: NSManagedObject> {
            
            self.sectionIndexTransformer = { $0 }
        }
+        self.transactionQueue = transactionQueue
        
        fetchedResultsControllerDelegate.handler = self
        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
        
-        prepareFetch(self, { try! fetchedResultsController.performFetch() })
+        guard let coordinator = context.parentStack?.coordinator else {
+            
+            return
+        }
+        
+        self.observerForWillChangePersistentStore = NotificationObserver(
+            notificationName: NSPersistentStoreCoordinatorStoresWillChangeNotification,
+            object: coordinator,
+            closure: { [weak self] (note) -> Void in
+                
+                guard let `self` = self else {
+                    
+                    return
+                }
+                
+                self.isPersistentStoreChanging = true
+                
+                guard let removedStores = (note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore]).flatMap(Set.init)
+                    where !Set(self.fetchedResultsController.fetchRequest.affectedStores ?? []).intersect(removedStores).isEmpty else {
+                        
+                        return
+                }
+                self.refetch(fetchClauses)
+            }
+        )
+        
+        self.observerForDidChangePersistentStore = NotificationObserver(
+            notificationName: NSPersistentStoreCoordinatorStoresDidChangeNotification,
+            object: coordinator,
+            closure: { [weak self] (note) -> Void in
+                
+                guard let `self` = self else {
+                    
+                    return
+                }
+                
+                if !self.isPendingRefetch {
+                    
+                    let previousStores = Set(self.fetchedResultsController.fetchRequest.affectedStores ?? [])
+                    let currentStores = previousStores
+                        .subtract(note.userInfo?[NSRemovedPersistentStoresKey] as? [NSPersistentStore] ?? [])
+                        .union(note.userInfo?[NSAddedPersistentStoresKey] as? [NSPersistentStore] ?? [])
+                    
+                    if previousStores != currentStores {
+                        
+                        self.refetch(fetchClauses)
+                    }
+                }
+                
+                self.isPersistentStoreChanging = false
+            }
+        )
+        
+        if let createAsynchronously = createAsynchronously {
+            
+            transactionQueue.async {
+                
+                try! fetchedResultsController.performFetchFromSpecifiedStores()
+                self.taskGroup.notify(.Main) {
+                    
+                    createAsynchronously(self)
+                }
+            }
+        }
+        else {
+            
+            try! fetchedResultsController.performFetchFromSpecifiedStores()
+        }
    }
    
    deinit {
        
        self.fetchedResultsControllerDelegate.fetchedResultsController = nil
+        self.isPersistentStoreChanging = false
+    }
+    
+    private var isPersistentStoreChanging: Bool = false {
+        
+        didSet {
+            
+            let newValue = self.isPersistentStoreChanging
+            guard newValue != oldValue else {
+                
+                return
+            }
+            
+            if newValue {
+                
+                self.taskGroup.enter()
+            }
+            else {
+                
+                self.taskGroup.leave()
+            }
+        }
    }
    
    
    // MARK: Private
    
-    private let fetchedResultsController: NSFetchedResultsController
+    private let fetchedResultsController: CoreStoreFetchedResultsController<T>
    private let fetchedResultsControllerDelegate: FetchedResultsControllerDelegate
    private let sectionIndexTransformer: (sectionName: KeyPath?) -> String?
+    private var observerForWillChangePersistentStore: NotificationObserver!
+    private var observerForDidChangePersistentStore: NotificationObserver!
    private let taskGroup = GCDGroup()
-    private weak var parentStack: DataStack?
+    private let transactionQueue: GCDQueue
    
    private var willChangeListKey: Void?
    private var didChangeListKey: Void?
--- a/CoreStore/Observing/ListObserver.swift
+++ b/CoreStore/Observing/ListObserver.swift
@@ -2,7 +2,7 @@
 //  ListObserver.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,48 +30,49 @@ import CoreData
 // MARK: - ListObserver

 /**
-Implement the `ListObserver` protocol to observe changes to a list of `NSManagedObject`s. `ListObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorList(
-        From(MyPersonEntity),
-        OrderBy(.Ascending("lastName"))
-    )
-    monitor.addObserver(self)
-*/
+ Implement the `ListObserver` protocol to observe changes to a list of `NSManagedObject`s. `ListObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorList(
+     From(MyPersonEntity),
+     OrderBy(.Ascending("lastName"))
+ )
+ monitor.addObserver(self)
+ ```
+ */
@available(OSX, unavailable)
 public protocol ListObserver: class {
    
    /**
-    The `NSManagedObject` type for the observed list
-    */
-    typealias ListEntityType: NSManagedObject
+     The `NSManagedObject` type for the observed list
+     */
+    associatedtype ListEntityType: NSManagedObject
    
    /**
-    Handles processing just before a change to the observed list occurs
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    */
+     Handles processing just before a change to the observed list occurs
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     */
    func listMonitorWillChange(monitor: ListMonitor<ListEntityType>)
    
    /**
-    Handles processing right after a change to the observed list occurs
-    
-    - parameter monitor: the `ListMonitor` monitoring the object being observed
-    */
+     Handles processing right after a change to the observed list occurs
+     
+     - parameter monitor: the `ListMonitor` monitoring the object being observed
+     */
    func listMonitorDidChange(monitor: ListMonitor<ListEntityType>)
    
    /**
-    This method is broadcast from within the `ListMonitor`'s `refetch(...)` method to let observers prepare for the internal `NSFetchedResultsController`'s pending change to its predicate, sort descriptors, etc. Note that the actual refetch will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-    
-    - parameter monitor: the `ListMonitor` monitoring the object being observed
-    */
+     This method is broadcast from within the `ListMonitor`'s `refetch(...)` method to let observers prepare for the internal `NSFetchedResultsController`'s pending change to its predicate, sort descriptors, etc. Note that the actual refetch will happen after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+     
+     - parameter monitor: the `ListMonitor` monitoring the object being observed
+     */
    func listMonitorWillRefetch(monitor: ListMonitor<ListEntityType>)
    
    /**
-    After the `ListMonitor`'s `refetch(...)` method is called, this method is broadcast after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
-    
-    - parameter monitor: the `ListMonitor` monitoring the object being observed
-    */
+     After the `ListMonitor`'s `refetch(...)` method is called, this method is broadcast after the `NSFetchedResultsController`'s last `controllerDidChangeContent(_:)` notification completes.
+     
+     - parameter monitor: the `ListMonitor` monitoring the object being observed
+     */
    func listMonitorDidRefetch(monitor: ListMonitor<ListEntityType>)
 }

@@ -82,23 +83,23 @@ public protocol ListObserver: class {
 public extension ListObserver {
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitorWillChange(monitor: ListMonitor<ListEntityType>) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitorDidChange(monitor: ListMonitor<ListEntityType>) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitorWillRefetch(monitor: ListMonitor<ListEntityType>) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitorDidRefetch(monitor: ListMonitor<ListEntityType>) { }
 }

@@ -106,52 +107,53 @@ public extension ListObserver {
 // MARK: - ListObjectObserver

 /**
-Implement the `ListObjectObserver` protocol to observe detailed changes to a list's object. `ListObjectObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorList(
-        From(MyPersonEntity),
-        OrderBy(.Ascending("lastName"))
-    )
-    monitor.addObserver(self)
-*/
+ Implement the `ListObjectObserver` protocol to observe detailed changes to a list's object. `ListObjectObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorList(
+     From(MyPersonEntity),
+     OrderBy(.Ascending("lastName"))
+ )
+ monitor.addObserver(self)
+ ```
+ */
@available(OSX, unavailable)
 public protocol ListObjectObserver: ListObserver {
    
    /**
-    Notifies that an object was inserted to the specified `NSIndexPath` in the list
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter object: the entity type for the inserted object
-    - parameter indexPath: the new `NSIndexPath` for the inserted object
-    */
+     Notifies that an object was inserted to the specified `NSIndexPath` in the list
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter object: the entity type for the inserted object
+     - parameter indexPath: the new `NSIndexPath` for the inserted object
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertObject object: ListEntityType, toIndexPath indexPath: NSIndexPath)
    
    /**
-    Notifies that an object was deleted from the specified `NSIndexPath` in the list
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter object: the entity type for the deleted object
-    - parameter indexPath: the `NSIndexPath` for the deleted object
-    */
+     Notifies that an object was deleted from the specified `NSIndexPath` in the list
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter object: the entity type for the deleted object
+     - parameter indexPath: the `NSIndexPath` for the deleted object
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteObject object: ListEntityType, fromIndexPath indexPath: NSIndexPath)
    
    /**
-    Notifies that an object at the specified `NSIndexPath` was updated
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter object: the entity type for the updated object
-    - parameter indexPath: the `NSIndexPath` for the updated object
-    */
+     Notifies that an object at the specified `NSIndexPath` was updated
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter object: the entity type for the updated object
+     - parameter indexPath: the `NSIndexPath` for the updated object
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didUpdateObject object: ListEntityType, atIndexPath indexPath: NSIndexPath)
    
    /**
-    Notifies that an object's index changed
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter object: the entity type for the moved object
-    - parameter fromIndexPath: the previous `NSIndexPath` for the moved object
-    - parameter toIndexPath: the new `NSIndexPath` for the moved object
-    */
+     Notifies that an object's index changed
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter object: the entity type for the moved object
+     - parameter fromIndexPath: the previous `NSIndexPath` for the moved object
+     - parameter toIndexPath: the new `NSIndexPath` for the moved object
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didMoveObject object: ListEntityType, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath)
 }

@@ -162,23 +164,23 @@ public protocol ListObjectObserver: ListObserver {
 public extension ListObjectObserver {
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertObject object: ListEntityType, toIndexPath indexPath: NSIndexPath) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteObject object: ListEntityType, fromIndexPath indexPath: NSIndexPath) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didUpdateObject object: ListEntityType, atIndexPath indexPath: NSIndexPath) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didMoveObject object: ListEntityType, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) { }
 }

@@ -186,33 +188,34 @@ public extension ListObjectObserver {
 // MARK: - ListSectionObserver

 /**
-Implement the `ListSectionObserver` protocol to observe changes to a list's section info. `ListSectionObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorSectionedList(
-        From(MyPersonEntity),
-        SectionBy("age") { "Age \($0)" },
-        OrderBy(.Ascending("lastName"))
-    )
-    monitor.addObserver(self)
-*/
+ Implement the `ListSectionObserver` protocol to observe changes to a list's section info. `ListSectionObserver`s may register themselves to a `ListMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorSectionedList(
+     From(MyPersonEntity),
+     SectionBy("age") { "Age \($0)" },
+     OrderBy(.Ascending("lastName"))
+ )
+ monitor.addObserver(self)
+ ```
+ */
@available(OSX, unavailable)
 public protocol ListSectionObserver: ListObjectObserver {
    
    /**
-    Notifies that a section was inserted at the specified index
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section
-    - parameter sectionIndex: the new section index for the new section
+     Notifies that a section was inserted at the specified index
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the inserted section
+     - parameter sectionIndex: the new section index for the new section
     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int)
    
    /**
-    Notifies that a section was inserted at the specified index
-    
-    - parameter monitor: the `ListMonitor` monitoring the list being observed
-    - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section
-    - parameter sectionIndex: the previous section index for the deleted section
+     Notifies that a section was inserted at the specified index
+     
+     - parameter monitor: the `ListMonitor` monitoring the list being observed
+     - parameter sectionInfo: the `NSFetchedResultsSectionInfo` for the deleted section
+     - parameter sectionIndex: the previous section index for the deleted section
     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int)
 }
@@ -224,12 +227,12 @@ public protocol ListSectionObserver: ListObjectObserver {
 public extension ListSectionObserver {
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func listMonitor(monitor: ListMonitor<ListEntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) { }
 }
--- a/CoreStore/Observing/ObjectMonitor.swift
+++ b/CoreStore/Observing/ObjectMonitor.swift
@@ -2,7 +2,7 @@
 //  ObjectMonitor.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -33,47 +33,45 @@ import CoreData
 // MARK: - ObjectMonitor

 /**
-The `ObjectMonitor` monitors changes to a single `NSManagedObject` instance. Observers that implement the `ObjectObserver` protocol may then register themselves to the `ObjectMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorObject(object)
-    monitor.addObserver(self)
-
-The created `ObjectMonitor` instance needs to be held on (retained) for as long as the object needs to be observed.
-
-Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
-*/
+ The `ObjectMonitor` monitors changes to a single `NSManagedObject` instance. Observers that implement the `ObjectObserver` protocol may then register themselves to the `ObjectMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorObject(object)
+ monitor.addObserver(self)
+ ```
+ The created `ObjectMonitor` instance needs to be held on (retained) for as long as the object needs to be observed.
+ 
+ Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+ */
@available(OSX, unavailable)
 public final class ObjectMonitor<T: NSManagedObject> {
    
-    // MARK: Public
-    
    /**
-    Returns the `NSManagedObject` instance being observed, or `nil` if the object was already deleted.
-    */
+     Returns the `NSManagedObject` instance being observed, or `nil` if the object was already deleted.
+     */
    public var object: T? {
        
        return self.fetchedResultsController.fetchedObjects?.first as? T
    }
    
    /**
-    Returns `true` if the `NSManagedObject` instance being observed still exists, or `false` if the object was already deleted.
-    */
+     Returns `true` if the `NSManagedObject` instance being observed still exists, or `false` if the object was already deleted.
+     */
    public var isObjectDeleted: Bool {
        
        return self.object?.managedObjectContext == nil
    }
    
    /**
-    Registers an `ObjectObserver` to be notified when changes to the receiver's `object` are made.
-    
-    To prevent retain-cycles, `ObjectMonitor` only keeps `weak` references to its observers.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ObjectMonitor` unregisters previous notifications to the observer before re-registering them.
-    
-    - parameter observer: an `ObjectObserver` to send change notifications to
-    */
+     Registers an `ObjectObserver` to be notified when changes to the receiver's `object` are made.
+     
+     To prevent retain-cycles, `ObjectMonitor` only keeps `weak` references to its observers.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     Calling `addObserver(_:)` multiple times on the same observer is safe, as `ObjectMonitor` unregisters previous notifications to the observer before re-registering them.
+     
+     - parameter observer: an `ObjectObserver` to send change notifications to
+     */
    public func addObserver<U: ObjectObserver where U.ObjectEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -143,12 +141,12 @@ public final class ObjectMonitor<T: NSManagedObject> {
    }
    
    /**
-    Unregisters an `ObjectObserver` from receiving notifications for changes to the receiver's `object`.
-    
-    For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
-    
-    - parameter observer: an `ObjectObserver` to unregister notifications to
-    */
+     Unregisters an `ObjectObserver` from receiving notifications for changes to the receiver's `object`.
+     
+     For thread safety, this method needs to be called from the main thread. An assertion failure will occur (on debug builds only) if called from any thread other than the main thread.
+     
+     - parameter observer: an `ObjectObserver` to unregister notifications to
+     */
    public func removeObserver<U: ObjectObserver where U.ObjectEntityType == T>(observer: U) {
        
        CoreStore.assert(
@@ -165,7 +163,17 @@ public final class ObjectMonitor<T: NSManagedObject> {
    
    // MARK: Internal
    
-    internal init(dataStack: DataStack, object: T) {
+    internal convenience init(dataStack: DataStack, object: T) {
+        
+        self.init(context: dataStack.mainContext, object: object)
+    }
+    
+    internal convenience init(unsafeTransaction: UnsafeDataTransaction, object: T) {
+        
+        self.init(context: unsafeTransaction.context, object: object)
+    }
+    
+    private init(context: NSManagedObjectContext, object: T) {
        
        let fetchRequest = NSFetchRequest()
        fetchRequest.entity = object.entity
@@ -175,8 +183,8 @@ public final class ObjectMonitor<T: NSManagedObject> {
        fetchRequest.includesPendingChanges = false
        fetchRequest.shouldRefreshRefetchedObjects = true
        
-        let fetchedResultsController = NSFetchedResultsController(
-            dataStack: dataStack,
+        let fetchedResultsController = CoreStoreFetchedResultsController<T>(
+            context: context,
            fetchRequest: fetchRequest,
            fetchClauses: [Where("SELF", isEqualTo: object.objectID)]
        )
@@ -185,11 +193,10 @@ public final class ObjectMonitor<T: NSManagedObject> {
        
        self.fetchedResultsController = fetchedResultsController
        self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
-        self.parentStack = dataStack
        
        fetchedResultsControllerDelegate.handler = self
        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        try! fetchedResultsController.performFetch()
+        try! fetchedResultsController.performFetchFromSpecifiedStores()
        
        self.lastCommittedAttributes = (self.object?.committedValuesForKeys(nil) as? [String: NSObject]) ?? [:]
    }
@@ -202,10 +209,9 @@ public final class ObjectMonitor<T: NSManagedObject> {
    
    // MARK: Private
    
-    private let fetchedResultsController: NSFetchedResultsController
+    private let fetchedResultsController: CoreStoreFetchedResultsController<T>
    private let fetchedResultsControllerDelegate: FetchedResultsControllerDelegate
    private var lastCommittedAttributes = [String: NSObject]()
-    private weak var parentStack: DataStack?
    
    private var willChangeObjectKey: Void?
    private var didDeleteObjectKey: Void?
--- a/CoreStore/Observing/ObjectObserver.swift
+++ b/CoreStore/Observing/ObjectObserver.swift
@@ -2,7 +2,7 @@
 //  ObjectObserver.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,42 +30,43 @@ import CoreData
 // MARK: - ObjectObserver

 /**
-Implement the `ObjectObserver` protocol to observe changes to a single `NSManagedObject` instance. `ObjectObserver`s may register themselves to a `ObjectMonitor`'s `addObserver(_:)` method:
-
-    let monitor = CoreStore.monitorObject(object)
-    monitor.addObserver(self)
-*/
+ Implement the `ObjectObserver` protocol to observe changes to a single `NSManagedObject` instance. `ObjectObserver`s may register themselves to a `ObjectMonitor`'s `addObserver(_:)` method:
+ ```
+ let monitor = CoreStore.monitorObject(object)
+ monitor.addObserver(self)
+ ```
+ */
@available(OSX, unavailable)
 public protocol ObjectObserver: class {
    
    /**
-    The `NSManagedObject` type for the observed object
-    */
-    typealias ObjectEntityType: NSManagedObject
+     The `NSManagedObject` type for the observed object
+     */
+    associatedtype ObjectEntityType: NSManagedObject
    
    /**
-    Handles processing just before a change to the observed `object` occurs
-    
-    - parameter monitor: the `ObjectMonitor` monitoring the object being observed
-    - parameter object: the `NSManagedObject` instance being observed
-    */
+     Handles processing just before a change to the observed `object` occurs
+     
+     - parameter monitor: the `ObjectMonitor` monitoring the object being observed
+     - parameter object: the `NSManagedObject` instance being observed
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, willUpdateObject object: ObjectEntityType)
    
    /**
-    Handles processing right after a change to the observed `object` occurs
-    
-    - parameter monitor: the `ObjectMonitor` monitoring the object being observed
-    - parameter object: the `NSManagedObject` instance being observed
-    - parameter changedPersistentKeys: a `Set` of key paths for the attributes that were changed. Note that `changedPersistentKeys` only contains keys for attributes/relationships present in the persistent store, thus transient properties will not be reported.
-    */
+     Handles processing right after a change to the observed `object` occurs
+     
+     - parameter monitor: the `ObjectMonitor` monitoring the object being observed
+     - parameter object: the `NSManagedObject` instance being observed
+     - parameter changedPersistentKeys: a `Set` of key paths for the attributes that were changed. Note that `changedPersistentKeys` only contains keys for attributes/relationships present in the persistent store, thus transient properties will not be reported.
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, didUpdateObject object: ObjectEntityType, changedPersistentKeys: Set<KeyPath>)
    
    /**
-    Handles processing right after `object` is deleted
-    
-    - parameter monitor: the `ObjectMonitor` monitoring the object being observed
-    - parameter object: the `NSManagedObject` instance being observed
-    */
+     Handles processing right after `object` is deleted
+     
+     - parameter monitor: the `ObjectMonitor` monitoring the object being observed
+     - parameter object: the `NSManagedObject` instance being observed
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, didDeleteObject object: ObjectEntityType)
 }

@@ -76,17 +77,17 @@ public protocol ObjectObserver: class {
 public extension ObjectObserver {
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, willUpdateObject object: ObjectEntityType) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, didUpdateObject object: ObjectEntityType, changedPersistentKeys: Set<KeyPath>) { }
    
    /**
-    The default implementation does nothing.
-    */
+     The default implementation does nothing.
+     */
    func objectMonitor(monitor: ObjectMonitor<ObjectEntityType>, didDeleteObject object: ObjectEntityType) { }
 }
--- a/CoreStore/Observing/SectionBy.swift
+++ b/CoreStore/Observing/SectionBy.swift
@@ -2,7 +2,7 @@
 //  SectionBy.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,35 +30,34 @@ import CoreData
 // MARK: - SectionBy

 /**
-The `SectionBy` clause indicates the key path to use to group the `ListMonitor` objects into sections. An optional closure can also be provided to transform the value into an appropriate section name:
-
-    let monitor = CoreStore.monitorSectionedList(
-        From(MyPersonEntity),
-        SectionBy("age") { "Age \($0)" },
-        OrderBy(.Ascending("lastName"))
-    )
-*/
+ The `SectionBy` clause indicates the key path to use to group the `ListMonitor` objects into sections. An optional closure can also be provided to transform the value into an appropriate section name:
+ ```
+ let monitor = CoreStore.monitorSectionedList(
+     From(MyPersonEntity),
+     SectionBy("age") { "Age \($0)" },
+     OrderBy(.Ascending("lastName"))
+ )
+ ```
+ */
@available(OSX, unavailable)
 public struct SectionBy {
    
-    // MARK: Public
-    
    /**
-    Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
-    
-    - parameter sectionKeyPath: the key path to use to group the objects into sections
-    */
+     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections
+     
+     - parameter sectionKeyPath: the key path to use to group the objects into sections
+     */
    public init(_ sectionKeyPath: KeyPath) {
        
        self.init(sectionKeyPath, { $0 })
    }
    
    /**
-    Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section name
-    
-    - parameter sectionKeyPath: the key path to use to group the objects into sections
-    - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name
-    */
+     Initializes a `SectionBy` clause with the key path to use to group `ListMonitor` objects into sections, and a closure to transform the value for the key path to an appropriate section name
+     
+     - parameter sectionKeyPath: the key path to use to group the objects into sections
+     - parameter sectionIndexTransformer: a closure to transform the value for the key path to an appropriate section name
+     */
    public init(_ sectionKeyPath: KeyPath, _ sectionIndexTransformer: (sectionName: String?) -> String?) {
        
        self.sectionKeyPath = sectionKeyPath
--- a/CoreStore/Observing/UnsafeDataTransaction+Observing.swift
+++ b/CoreStore/Observing/UnsafeDataTransaction+Observing.swift
@@ -0,0 +1,198 @@
+//
+//  UnsafeDataTransaction+Observing.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+import CoreData
+#if USE_FRAMEWORKS
+    import GCDKit
+#endif
+
+
+// MARK: - UnsafeDataTransaction
+
+@available(OSX, unavailable)
+public extension UnsafeDataTransaction {
+    
+    /**
+     Creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
+     
+     - parameter object: the `NSManagedObject` to observe changes from
+     - returns: a `ObjectMonitor` that monitors changes to `object`
+     */
+    @warn_unused_result
+    public func monitorObject<T: NSManagedObject>(object: T) -> ObjectMonitor<T> {
+        
+        return ObjectMonitor(
+            unsafeTransaction: self,
+            object: object
+        )
+    }
+    
+    /**
+     Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
+    @warn_unused_result
+    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
+        
+        return self.monitorList(from, fetchClauses)
+    }
+    
+    /**
+     Creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
+    @warn_unused_result
+    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
+        
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        return ListMonitor(
+            unsafeTransaction: self,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: FetchClause...) {
+        
+        self.monitorList(createAsynchronously: createAsynchronously, from, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ fetchClauses: [FetchClause])  {
+        
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            unsafeTransaction: self,
+            from: from,
+            sectionBy: nil,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+    
+    /**
+     Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
+    @warn_unused_result
+    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
+        
+        return self.monitorSectionedList(from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list.
+     
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     - returns: a `ListMonitor` instance that monitors changes to the list
+     */
+    @warn_unused_result
+    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
+        
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        return ListMonitor(
+            unsafeTransaction: self,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses
+        )
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) {
+        
+        self.monitorSectionedList(createAsynchronously: createAsynchronously, from, sectionBy, fetchClauses)
+    }
+    
+    /**
+     Asynchronously creates a `ListMonitor` for a sectioned list of `NSManagedObject`s that satisfy the specified fetch clauses. Multiple `ListObserver`s may then register themselves to be notified when changes are made to the list. Since `NSFetchedResultsController` greedily locks the persistent store on initial fetch, you may prefer this method instead of the synchronous counterpart to avoid deadlocks while background updates/saves are being executed.
+     
+     - parameter createAsynchronously: the closure that receives the created `ListMonitor` instance
+     - parameter from: a `From` clause indicating the entity type
+     - parameter sectionBy: a `SectionBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
+     - parameter fetchClauses: a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+     */
+    public func monitorSectionedList<T: NSManagedObject>(createAsynchronously createAsynchronously: (ListMonitor<T>) -> Void, _ from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) {
+        
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
+        
+        _ = ListMonitor(
+            unsafeTransaction: self,
+            from: from,
+            sectionBy: sectionBy,
+            fetchClauses: fetchClauses,
+            createAsynchronously: createAsynchronously
+        )
+    }
+}
--- a/Processing/AsynchronousDataTransaction.swift
+++ b/Processing/AsynchronousDataTransaction.swift
@@ -2,7 +2,7 @@
 //  AsynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -33,17 +33,15 @@ import CoreData
 // MARK: - AsynchronousDataTransaction

 /**
-The `AsynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginAsynchronous(_:)`, or from `CoreStore.beginAsynchronous(_:)`.
-*/
+ The `AsynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginAsynchronous(_:)`, or from `CoreStore.beginAsynchronous(_:)`.
+ */
 public final class AsynchronousDataTransaction: BaseDataTransaction {
    
-    // MARK: Public
-    
    /**
-    Saves the transaction changes. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
-    */
+     Saves the transaction changes. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
+     */
    public func commit(completion: (result: SaveResult) -> Void = { _ in }) {
        
        CoreStore.assert(
@@ -68,11 +66,11 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Begins a child transaction synchronously where NSManagedObject creates, updates, and deletes can be made. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Begins a child transaction synchronously where NSManagedObject creates, updates, and deletes can be made. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
    public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
        
        CoreStore.assert(
@@ -94,11 +92,11 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    // MARK: BaseDataTransaction
    
    /**
-    Creates a new `NSManagedObject` with the specified entity type.
-    
-    - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    - returns: a new `NSManagedObject` instance of the specified entity type.
-    */
+     Creates a new `NSManagedObject` with the specified entity type.
+     
+     - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
+     - returns: a new `NSManagedObject` instance of the specified entity type.
+     */
    public override func create<T: NSManagedObject>(into: Into<T>) -> T {
        
        CoreStore.assert(
@@ -110,11 +108,11 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter object: the `NSManagedObject` type to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter object: the `NSManagedObject` type to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public override func edit<T: NSManagedObject>(object: T?) -> T? {
        
@@ -127,12 +125,12 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter objectID: the `NSManagedObjectID` for the object to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter objectID: the `NSManagedObjectID` for the object to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public override func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
        
@@ -145,10 +143,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter object: the `NSManagedObject` type to be deleted
-    */
+     Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter object: the `NSManagedObject` type to be deleted
+     */
    public override func delete(object: NSManagedObject?) {
        
        CoreStore.assert(
@@ -160,12 +158,12 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter object1: the `NSManagedObject` type to be deleted
-    - parameter object2: another `NSManagedObject` type to be deleted
-    - parameter objects: other `NSManagedObject`s type to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter object1: the `NSManagedObject` type to be deleted
+     - parameter object2: another `NSManagedObject` type to be deleted
+     - parameter objects: other `NSManagedObject`s type to be deleted
+     */
    public override func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
        
        CoreStore.assert(
@@ -177,10 +175,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter objects: the `NSManagedObject`s type to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter objects: the `NSManagedObject`s type to be deleted
+     */
    public override func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
        
        CoreStore.assert(
--- a/Processing/BaseDataTransaction.swift
+++ b/Processing/BaseDataTransaction.swift
@@ -2,7 +2,7 @@
 //  BaseDataTransaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -33,26 +33,26 @@ import CoreData
 // MARK: - BaseDataTransaction

 /**
-The `BaseDataTransaction` is an abstract interface for `NSManagedObject` creates, updates, and deletes. All `BaseDataTransaction` subclasses manage a private `NSManagedObjectContext` which are direct children of the `NSPersistentStoreCoordinator`'s root `NSManagedObjectContext`. This means that all updates are saved first to the persistent store, and then propagated up to the read-only `NSManagedObjectContext`.
-*/
+ The `BaseDataTransaction` is an abstract interface for `NSManagedObject` creates, updates, and deletes. All `BaseDataTransaction` subclasses manage a private `NSManagedObjectContext` which are direct children of the `NSPersistentStoreCoordinator`'s root `NSManagedObjectContext`. This means that all updates are saved first to the persistent store, and then propagated up to the read-only `NSManagedObjectContext`.
+ */
 public /*abstract*/ class BaseDataTransaction {
    
    // MARK: Object management
    
    /**
-    Indicates if the transaction has pending changes
-    */
+     Indicates if the transaction has pending changes
+     */
    public var hasChanges: Bool {
        
        return self.context.hasChanges
    }
    
    /**
-    Creates a new `NSManagedObject` with the specified entity type.
-    
-    - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    - returns: a new `NSManagedObject` instance of the specified entity type.
-    */
+     Creates a new `NSManagedObject` with the specified entity type.
+     
+     - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
+     - returns: a new `NSManagedObject` instance of the specified entity type.
+     */
    public func create<T: NSManagedObject>(into: Into<T>) -> T {
        
        CoreStore.assert(
@@ -101,11 +101,11 @@ public /*abstract*/ class BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of a specified `NSManagedObject`.
-    
-    - parameter object: the `NSManagedObject` type to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of a specified `NSManagedObject`.
+     
+     - parameter object: the `NSManagedObject` type to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public func edit<T: NSManagedObject>(object: T?) -> T? {
        
@@ -121,12 +121,12 @@ public /*abstract*/ class BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of the object with the specified `NSManagedObjectID`. 
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter objectID: the `NSManagedObjectID` for the object to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of the object with the specified `NSManagedObjectID`.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter objectID: the `NSManagedObjectID` for the object to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
        
@@ -143,10 +143,10 @@ public /*abstract*/ class BaseDataTransaction {
    }
    
    /**
-    Deletes a specified `NSManagedObject`.
-    
-    - parameter object: the `NSManagedObject` to be deleted
-    */
+     Deletes a specified `NSManagedObject`.
+     
+     - parameter object: the `NSManagedObject` to be deleted
+     */
    public func delete(object: NSManagedObject?) {
        
        CoreStore.assert(
@@ -161,22 +161,22 @@ public /*abstract*/ class BaseDataTransaction {
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter object1: the `NSManagedObject` to be deleted
-    - parameter object2: another `NSManagedObject` to be deleted
-    - parameter objects: other `NSManagedObject`s to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter object1: the `NSManagedObject` to be deleted
+     - parameter object2: another `NSManagedObject` to be deleted
+     - parameter objects: other `NSManagedObject`s to be deleted
+     */
    public func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
        
        self.delete(([object1, object2] + objects).flatMap { $0 })
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter objects: the `NSManagedObject`s to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter objects: the `NSManagedObject`s to be deleted
+     */
    public func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
        
        CoreStore.assert(
@@ -188,6 +188,257 @@ public /*abstract*/ class BaseDataTransaction {
        objects.forEach { context.fetchExisting($0)?.deleteFromContext() }
    }
    
+    /**
+     Refreshes all registered objects `NSManagedObject`s in the transaction.
+     */
+    public func refreshAllObjectsAsFaults() {
+        
+        CoreStore.assert(
+            self.isRunningInAllowedQueue(),
+            "Attempted to refresh entities outside their designated queue."
+        )
+        
+        self.context.refreshAllObjectsAsFaults()
+    }
+    
+    
+    // MARK: Inspecting Pending Objects
+    
+    /**
+    Returns all pending `NSManagedObject`s that were inserted to the transaction. This method should not be called after the `commit()` method was called.
+    
+    - returns: a `Set` of pending `NSManagedObject`s that were inserted to the transaction.
+    */
+    public func insertedObjects() -> Set<NSManagedObject> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access inserted objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access inserted objects from an already committed \(typeName(self))."
+        )
+        
+        return self.context.insertedObjects
+    }
+    
+    /**
+     Returns all pending `NSManagedObject`s of the specified type that were inserted to the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObject`s of the specified type that were inserted to the transaction.
+     */
+    public func insertedObjects<T: NSManagedObject>(entity: T.Type) -> Set<T> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access inserted objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access inserted objects from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.insertedObjects.flatMap { $0 as? T })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s that were inserted to the transaction. This method should not be called after the `commit()` method was called.
+     
+     - returns: a `Set` of pending `NSManagedObjectID`s that were inserted to the transaction.
+     */
+    public func insertedObjectIDs() -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access inserted object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access inserted objects IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.insertedObjects.map { $0.objectID })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s of the specified type that were inserted to the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were inserted to the transaction.
+     */
+    public func insertedObjectIDs<T: NSManagedObject>(entity: T.Type) -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access inserted object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access inserted objects IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.insertedObjects.flatMap { $0 as? T }.map { $0.objectID })
+    }
+    
+    /**
+     Returns all pending `NSManagedObject`s that were updated in the transaction. This method should not be called after the `commit()` method was called.
+     
+     - returns: a `Set` of pending `NSManagedObject`s that were updated to the transaction.
+     */
+    public func updatedObjects() -> Set<NSManagedObject> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access updated objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access updated objects from an already committed \(typeName(self))."
+        )
+        
+        return self.context.updatedObjects
+    }
+    
+    /**
+     Returns all pending `NSManagedObject`s of the specified type that were updated in the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObject`s of the specified type that were updated in the transaction.
+     */
+    public func updatedObjects<T: NSManagedObject>(entity: T.Type) -> Set<T> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access updated objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access updated objects from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.updatedObjects.flatMap { $0 as? T })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s that were updated in the transaction. This method should not be called after the `commit()` method was called.
+     
+     - returns: a `Set` of pending `NSManagedObjectID`s that were updated in the transaction.
+     */
+    public func updatedObjectIDs() -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access updated object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access updated object IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.updatedObjects.map { $0.objectID })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s of the specified type that were updated in the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were updated in the transaction.
+     */
+    public func updatedObjectIDs<T: NSManagedObject>(entity: T.Type) -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access updated object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access updated object IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.updatedObjects.flatMap { $0 as? T }.map { $0.objectID })
+    }
+    
+    /**
+     Returns all pending `NSManagedObject`s that were deleted from the transaction. This method should not be called after the `commit()` method was called.
+     
+     - returns: a `Set` of pending `NSManagedObject`s that were deleted from the transaction.
+     */
+    public func deletedObjects() -> Set<NSManagedObject> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access deleted objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access deleted objects from an already committed \(typeName(self))."
+        )
+        
+        return self.context.deletedObjects
+    }
+    
+    /**
+     Returns all pending `NSManagedObject`s of the specified type that were deleted from the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObject`s of the specified type that were deleted from the transaction.
+     */
+    public func deletedObjects<T: NSManagedObject>(entity: T.Type) -> Set<T> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access deleted objects from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access deleted objects from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.deletedObjects.flatMap { $0 as? T })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were deleted from the transaction.
+     */
+    public func deletedObjectIDs() -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access deleted object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access deleted object IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.deletedObjects.map { $0.objectID })
+    }
+    
+    /**
+     Returns all pending `NSManagedObjectID`s of the specified type that were deleted from the transaction. This method should not be called after the `commit()` method was called.
+     
+     - parameter entity: the `NSManagedObject` subclass to filter
+     - returns: a `Set` of pending `NSManagedObjectID`s of the specified type that were deleted from the transaction.
+     */
+    public func deletedObjectIDs<T: NSManagedObject>(entity: T.Type) -> Set<NSManagedObjectID> {
+        
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to access deleted object IDs from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to access deleted object IDs from an already committed \(typeName(self))."
+        )
+        
+        return Set(self.context.deletedObjects.flatMap { $0 as? T }.map { $0.objectID })
+    }
+    
    
    // MARK: Internal
    
--- a/Processing/CoreStore+Transaction.swift
+++ b/Processing/CoreStore+Transaction.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Transaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -30,13 +30,11 @@ import Foundation

 public extension CoreStore {
    
-    // MARK: Public
-    
    /**
-    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    */
+     Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     */
    public static func beginAsynchronous(closure: (transaction: AsynchronousDataTransaction) -> Void) {
        
        self.defaultStack.beginAsynchronous(closure)
@@ -65,6 +63,14 @@ public extension CoreStore {
        return self.defaultStack.beginUnsafe(supportsUndo: supportsUndo)
    }
    
+    /**
+     Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
+     */
+    public static func refreshAllObjectsAsFaults() {
+        
+        self.defaultStack.refreshAllObjectsAsFaults()
+    }
+    
    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
    @warn_unused_result
    public static func beginDetached() -> UnsafeDataTransaction {
--- a/Processing/DataStack+Transaction.swift
+++ b/Processing/DataStack+Transaction.swift
@@ -2,7 +2,7 @@
 //  DataStack+Transaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -34,13 +34,11 @@ import CoreData

 public extension DataStack {
    
-    // MARK: Public
-    
    /**
-    Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    */
+     Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     */
    public func beginAsynchronous(closure: (transaction: AsynchronousDataTransaction) -> Void) {
        
        AsynchronousDataTransaction(
@@ -82,6 +80,19 @@ public extension DataStack {
        )
    }
    
+    /**
+     Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
+     */
+    public func refreshAllObjectsAsFaults() {
+        
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to refresh entities outside their designated queue."
+        )
+        
+        self.mainContext.refreshAllObjectsAsFaults()
+    }
+    
    @available(*, deprecated=1.3.1, renamed="beginUnsafe")
    @warn_unused_result
    public func beginDetached() -> UnsafeDataTransaction {
--- a/Processing/Into.swift
+++ b/Processing/Into.swift
@@ -2,7 +2,7 @@
 //  Into.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -30,26 +30,24 @@ import CoreData
 // MARK: - Into

 /**
-A `Into` clause contains the destination entity and destination persistent store for a `create(...)` method. A common usage is to just indicate the entity:
-
-let person = transaction.create(Into(MyPersonEntity))
-
-For cases where multiple `NSPersistentStore`s contain the same entity, the destination configuration's name needs to be specified as well:
-
-    let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
-
-This helps the `NSManagedObjectContext` to determine which
-*/
+ An `Into` clause contains the destination entity and destination persistent store for a `create(...)` method. A common usage is to just indicate the entity:
+ ```
+ let person = transaction.create(Into(MyPersonEntity))
+ ```
+ For cases where multiple `NSPersistentStore`s contain the same entity, the destination configuration's name needs to be specified as well:
+ ```
+ let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
+ ```
+ */
 public struct Into<T: NSManagedObject> {
    
-    // MARK: Public
-    
    /**
-    Initializes an `Into` clause.
-    Sample Usage:
-    
-        let person = transaction.create(Into<MyPersonEntity>())
-    */
+     Initializes an `Into` clause.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into<MyPersonEntity>())
+     ```
+     */
    public init(){
        
        self.configuration = nil
@@ -58,13 +56,13 @@ public struct Into<T: NSManagedObject> {
    }
    
    /**
-    Initializes an `Into` clause with the specified entity type.
-    Sample Usage:
-    
-    let person = transaction.create(Into(MyPersonEntity))
-    
-    - parameter entity: the `NSManagedObject` type to be created
-    */
+     Initializes an `Into` clause with the specified entity type.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into(MyPersonEntity))
+     ```
+     - parameter entity: the `NSManagedObject` type to be created
+     */
    public init(_ entity: T.Type) {
        
        self.configuration = nil
@@ -73,10 +71,13 @@ public struct Into<T: NSManagedObject> {
    }
    
    /**
-    Initializes an `Into` clause with the specified entity class.
-    
-    - parameter entityClass: the `NSManagedObject` class type to be created
-    */
+     Initializes an `Into` clause with the specified entity class.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into(MyPersonEntity))
+     ```
+     - parameter entityClass: the `NSManagedObject` class type to be created
+     */
    public init(_ entityClass: AnyClass) {
        
        self.configuration = nil
@@ -85,13 +86,13 @@ public struct Into<T: NSManagedObject> {
    }
    
    /**
-    Initializes an `Into` clause with the specified configuration.
-    Sample Usage:
-    
-    let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
-    
-    - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-    */
+     Initializes an `Into` clause with the specified configuration.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
+     ```
+     - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ configuration: String?) {
        
        self.configuration = configuration
@@ -100,14 +101,14 @@ public struct Into<T: NSManagedObject> {
    }
    
    /**
-    Initializes an `Into` clause with the specified entity type and configuration.
-    Sample Usage:
-    
-    let person = transaction.create(Into(MyPersonEntity.self, "Configuration1"))
-    
-    - parameter entity: the `NSManagedObject` type to be created
-    - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-    */
+     Initializes an `Into` clause with the specified entity type and configuration.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into(MyPersonEntity.self, "Configuration1"))
+     ```
+     - parameter entity: the `NSManagedObject` type to be created
+     - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ entity: T.Type, _ configuration: String?) {
        
        self.configuration = configuration
@@ -116,14 +117,14 @@ public struct Into<T: NSManagedObject> {
    }
    
    /**
-    Initializes an `Into` clause with the specified entity class and configuration.
-    Sample Usage:
-    
-    let person = transaction.create(Into(MyPersonEntity.self, "Configuration1"))
-    
-    - parameter entityClass: the `NSManagedObject` class type to be created
-    - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
-    */
+     Initializes an `Into` clause with the specified entity class and configuration.
+     Sample Usage:
+     ```
+     let person = transaction.create(Into(MyPersonEntity.self, "Configuration1"))
+     ```
+     - parameter entityClass: the `NSManagedObject` class type to be created
+     - parameter configuration: the `NSPersistentStore` configuration name to associate the object to. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `nil` to use the default configuration.
+     */
    public init(_ entityClass: AnyClass, _ configuration: String?) {
        
        self.configuration = configuration
--- a/Processing/NSManagedObject+Transaction.swift
+++ b/Processing/NSManagedObject+Transaction.swift
@@ -2,7 +2,7 @@
 //  NSManagedObject+Transaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2016 John Rommel Estropia
+//  Copyright © 2016 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
@@ -26,12 +26,11 @@
 import Foundation
 import CoreData

+
 // MARK: - NSManagedObject

 public extension NSManagedObject {
    
-    // MARK: Public
-    
    /**
     Returns this object's parent `UnsafeDataTransaction` instance if it was created from one. Returns `nil` if the parent transaction is either an `AsynchronousDataTransaction` or a `SynchronousDataTransaction`, or if the object is not managed by CoreStore.
     
--- a/Processing/SaveResult.swift
+++ b/Processing/SaveResult.swift
@@ -2,7 +2,7 @@
 //  SaveResult.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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,46 +29,44 @@ import Foundation
 // MARK: - SaveResult

 /**
-The `SaveResult` indicates the result of a `commit(...)` for a transaction.
-The `SaveResult` can be treated as a boolean:
-
-    CoreStore.beginAsynchronous { transaction in
-        // ...
-        let result = transaction.commit()
-        if result {
-            // succeeded
-        }
-        else {
-            // failed
-        }
-    }
-
-or as an `enum`, where the resulting associated object can also be inspected:
-
-    CoreStore.beginAsynchronous { transaction in
-        // ...
-        let result = transaction.commit()
-        switch result {
-        case .Success(let hasChanges):
-            // hasChanges indicates if there were changes or not
-        case .Failure(let error):
-            // error is the NSError instance for the failure
-        }
-    }
-```
-*/
+ The `SaveResult` indicates the result of a `commit(...)` for a transaction.
+ The `SaveResult` can be treated as a boolean:
+ ```
+ CoreStore.beginAsynchronous { transaction in
+     // ...
+     let result = transaction.commit()
+     if result {
+        // succeeded
+     }
+     else {
+        // failed
+     }
+ }
+ ```
+ or as an `enum`, where the resulting associated object can also be inspected:
+ ```
+ CoreStore.beginAsynchronous { transaction in
+     // ...
+     let result = transaction.commit()
+     switch result {
+     case .Success(let hasChanges):
+        // hasChanges indicates if there were changes or not
+     case .Failure(let error):
+        // error is the NSError instance for the failure
+     }
+ }
+ ```
+ */
 public enum SaveResult {
    
-    // MARK: Public
-    
    /**
-    `SaveResult.Success` indicates that the `commit()` for the transaction succeeded, either because the save succeeded or because there were no changes to save. The associated value `hasChanges` indicates if there were saved changes or not.
-    */
+     `SaveResult.Success` indicates that the `commit()` for the transaction succeeded, either because the save succeeded or because there were no changes to save. The associated value `hasChanges` indicates if there were saved changes or not.
+     */
    case Success(hasChanges: Bool)
    
    /**
-    `SaveResult.Failure` indicates that the `commit()` for the transaction failed. The associated object for this value is the related `NSError` instance.
-    */
+     `SaveResult.Failure` indicates that the `commit()` for the transaction failed. The associated object for this value is the related `NSError` instance.
+     */
    case Failure(NSError)
    
    
@@ -103,6 +101,7 @@ extension SaveResult: BooleanType {
    public var boolValue: Bool {
        
        switch self {
+            
        case .Success: return true
        case .Failure: return false
        }
--- a/Processing/SynchronousDataTransaction.swift
+++ b/Processing/SynchronousDataTransaction.swift
@@ -2,7 +2,7 @@
 //  SynchronousDataTransaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -33,16 +33,16 @@ import CoreData
 // MARK: - SynchronousDataTransaction

 /**
-The `SynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`, or from `CoreStore.beginSynchronous(_:)`.
-*/
+ The `SynchronousDataTransaction` provides an interface for `NSManagedObject` creates, updates, and deletes. A transaction object should typically be only used from within a transaction block initiated from `DataStack.beginSynchronous(_:)`, or from `CoreStore.beginSynchronous(_:)`.
+ */
 public final class SynchronousDataTransaction: BaseDataTransaction {
    
-    // MARK: Public
-    
    /**
-    Saves the transaction changes and waits for completion synchronously. This method should not be used after the `commit()` method was already called once.
-    */
-    public func commit() {
+     Saves the transaction changes and waits for completion synchronously. This method should not be used after the `commit()` method was already called once.
+     
+     - returns: a `SaveResult` containing the success or failure information
+     */
+    public func commitAndWait() -> SaveResult {
        
        CoreStore.assert(
            self.transactionQueue.isCurrentExecutionContext(),
@@ -54,15 +54,18 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
        )
        
        self.isCommitted = true
-        self.result = self.context.saveSynchronously()
+        
+        let result = self.context.saveSynchronously()
+        self.result = result
+        return result
    }
    
    /**
-    Begins a child transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
-    - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
-    */
+     Begins a child transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter closure: the block where creates, updates, and deletes can be made to the transaction. Transaction blocks are executed serially in a background queue, and all changes are made from a concurrent `NSManagedObjectContext`.
+     - returns: a `SaveResult` value indicating success or failure, or `nil` if the transaction was not comitted synchronously
+     */
    public func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
        
        CoreStore.assert(
@@ -84,11 +87,11 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    // MARK: BaseDataTransaction
    
    /**
-    Creates a new `NSManagedObject` with the specified entity type.
-    
-    - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    - returns: a new `NSManagedObject` instance of the specified entity type.
-    */
+     Creates a new `NSManagedObject` with the specified entity type.
+     
+     - parameter into: the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
+     - returns: a new `NSManagedObject` instance of the specified entity type.
+     */
    public override func create<T: NSManagedObject>(into: Into<T>) -> T {
        
        CoreStore.assert(
@@ -100,11 +103,11 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter object: the `NSManagedObject` type to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter object: the `NSManagedObject` type to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public override func edit<T: NSManagedObject>(object: T?) -> T? {
        
@@ -117,12 +120,12 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter into: an `Into` clause specifying the entity type
-    - parameter objectID: the `NSManagedObjectID` for the object to be edited
-    - returns: an editable proxy for the specified `NSManagedObject`.
-    */
+     Returns an editable proxy of the object with the specified `NSManagedObjectID`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter into: an `Into` clause specifying the entity type
+     - parameter objectID: the `NSManagedObjectID` for the object to be edited
+     - returns: an editable proxy for the specified `NSManagedObject`.
+     */
    @warn_unused_result
    public override func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
        
@@ -135,10 +138,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
-    
-    - parameter object: the `NSManagedObject` type to be deleted
-    */
+     Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
+     
+     - parameter object: the `NSManagedObject` type to be deleted
+     */
    public override func delete(object: NSManagedObject?) {
        
        CoreStore.assert(
@@ -150,12 +153,12 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter object1: the `NSManagedObject` to be deleted
-    - parameter object2: another `NSManagedObject` to be deleted
-    - parameter objects: other `NSManagedObject`s to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter object1: the `NSManagedObject` to be deleted
+     - parameter object2: another `NSManagedObject` to be deleted
+     - parameter objects: other `NSManagedObject`s to be deleted
+     */
    public override func delete(object1: NSManagedObject?, _ object2: NSManagedObject?, _ objects: NSManagedObject?...) {
        
        CoreStore.assert(
@@ -167,10 +170,10 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Deletes the specified `NSManagedObject`s.
-    
-    - parameter objects: the `NSManagedObject`s to be deleted
-    */
+     Deletes the specified `NSManagedObject`s.
+     
+     - parameter objects: the `NSManagedObject`s to be deleted
+     */
    public override func delete<S: SequenceType where S.Generator.Element: NSManagedObject>(objects: S) {
        
        CoreStore.assert(
@@ -182,7 +185,7 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    }
    
    /**
-    Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
+     Rolls back the transaction by resetting the `NSManagedObjectContext`. After calling this method, all `NSManagedObjects` fetched within the transaction will become invalid. This method should not be used after the `commit()` method was already called once.
     */
    @available(*, deprecated=1.3.4, message="Resetting the context is inherently unsafe. This method will be removed in the near future. Use `beginUnsafe()` to create transactions with `undo` support.")
    public func rollback() {
@@ -199,6 +202,12 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
        self.context.reset()
    }
    
+    @available(*, deprecated=1.5.2, renamed="commitAndWait")
+    public func commit() {
+        
+        self.commitAndWait()
+    }
+    
    
    // MARK: Internal
    
--- a/Processing/UnsafeDataTransaction.swift
+++ b/Processing/UnsafeDataTransaction.swift
@@ -2,7 +2,7 @@
 //  UnsafeDataTransaction.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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
@@ -37,17 +37,15 @@ public typealias DetachedDataTransaction = UnsafeDataTransaction
 // MARK: - UnsafeDataTransaction

 /**
-The `UnsafeDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
-*/
+ The `UnsafeDataTransaction` provides an interface for non-contiguous `NSManagedObject` creates, updates, and deletes. This is useful for making temporary changes, such as partially filled forms. An unsafe transaction object should typically be only used from the main queue.
+ */
 public final class UnsafeDataTransaction: BaseDataTransaction {
    
-    // MARK: Public
-    
    /**
-    Saves the transaction changes asynchronously. For a `UnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
-    
-    - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
-    */
+     Saves the transaction changes asynchronously. For a `UnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
+     
+     - parameter completion: the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
+     */
    public func commit(completion: (result: SaveResult) -> Void) {
        
        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
@@ -57,6 +55,18 @@ public final class UnsafeDataTransaction: BaseDataTransaction {
        }
    }
    
+    /**
+     Saves the transaction changes and waits for completion synchronously. For a `UnsafeDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
+     
+     - returns: a `SaveResult` containing the success or failure information
+     */
+    public func commitAndWait() -> SaveResult {
+        
+        let result = self.context.saveSynchronously()
+        self.result = result
+        return result
+    }
+    
    /**
     Rolls back the transaction.
     */
--- a/Up/CoreStore+Setup.swift
+++ b/Up/CoreStore+Setup.swift
@@ -2,7 +2,7 @@
 //  CoreStore+Setup.swift
 //  CoreStore
 //
-//  Copyright (c) 2015 John Rommel Estropia
+//  Copyright © 2015 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,48 +35,48 @@ import CoreData
 public extension CoreStore {
    
    /**
-    Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
-    */
+     Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
+     */
    public static var modelVersion: String {
        
        return self.defaultStack.modelVersion
    }
    
    /**
-    Returns the entity name-to-class type mapping from the `defaultStack`'s model.
-    */
+     Returns the entity name-to-class type mapping from the `defaultStack`'s model.
+     */
    public static var entityTypesByName: [String: NSManagedObject.Type] {
        
        return self.defaultStack.entityTypesByName
    }
    
    /**
-    Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `defaultStack`'s model.
-    */
+     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass from `defaultStack`'s model.
+     */
    public static func entityDescriptionForType(type: NSManagedObject.Type) -> NSEntityDescription? {
        
        return self.defaultStack.entityDescriptionForType(type)
    }
    
    /**
-    Adds an in-memory store to the `defaultStack`.
-    
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds an in-memory store to the `defaultStack`.
+     
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public static func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
        
        return try self.defaultStack.addInMemoryStoreAndWait(configuration: configuration)
    }
    
    /**
-    Adds to the `defaultStack` an SQLite store from the given SQLite file name.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds to the `defaultStack` an SQLite store from the given SQLite file name.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public static func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
        return try self.defaultStack.addSQLiteStoreAndWait(
@@ -87,13 +87,13 @@ public extension CoreStore {
    }
    
    /**
-    Adds to the `defaultStack` an SQLite store from the given SQLite file URL.
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds to the `defaultStack` an SQLite store from the given SQLite file URL.
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS).
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to nil.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public static func addSQLiteStoreAndWait(fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
        return try self.defaultStack.addSQLiteStoreAndWait(
--- a/Up/DataStack.swift
+++ b/Up/DataStack.swift
@@ -2,7 +2,7 @@
 //  DataStack.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -30,29 +30,33 @@ import CoreData
 #endif


-internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
+#if os(tvOS)
+    internal let deviceDirectorySearchPath = NSSearchPathDirectory.CachesDirectory
+#else
+    internal let deviceDirectorySearchPath = NSSearchPathDirectory.ApplicationSupportDirectory
+#endif
+
+internal let defaultDirectory = NSFileManager.defaultManager().URLsForDirectory(deviceDirectorySearchPath, inDomains: .UserDomainMask).first!

 internal let applicationName = (NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as? String) ?? "CoreData"

-internal let defaultSQLiteStoreURL = applicationSupportDirectory.URLByAppendingPathComponent(applicationName, isDirectory: false).URLByAppendingPathExtension("sqlite")
+internal let defaultSQLiteStoreURL = defaultDirectory.URLByAppendingPathComponent(applicationName, isDirectory: false).URLByAppendingPathExtension("sqlite")


 // MARK: - DataStack

 /**
-The `DataStack` encapsulates the data model for the Core Data stack. Each `DataStack` can have multiple data stores, usually specified as a "Configuration" in the model editor. Behind the scenes, the DataStack manages its own `NSPersistentStoreCoordinator`, a root `NSManagedObjectContext` for disk saves, and a shared `NSManagedObjectContext` designed as a read-only model interface for `NSManagedObjects`.
-*/
+ The `DataStack` encapsulates the data model for the Core Data stack. Each `DataStack` can have multiple data stores, usually specified as a "Configuration" in the model editor. Behind the scenes, the DataStack manages its own `NSPersistentStoreCoordinator`, a root `NSManagedObjectContext` for disk saves, and a shared `NSManagedObjectContext` designed as a read-only model interface for `NSManagedObjects`.
+ */
 public final class DataStack {
    
-    // MARK: Public
-    
    /**
-    Initializes a `DataStack` from an `NSManagedObjectModel`.
-    
-    - parameter modelName: the name of the (.xcdatamodeld) model file. If not specified, the application name will be used.
-    - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
-    - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for incremental migration. If not specified, will default to a non-migrating data stack.
-    */
+     Initializes a `DataStack` from an `NSManagedObjectModel`.
+     
+     - parameter modelName: the name of the (.xcdatamodeld) model file. If not specified, the application name will be used.
+     - parameter bundle: an optional bundle to load models from. If not specified, the main bundle will be used.
+     - parameter migrationChain: the `MigrationChain` that indicates the sequence of model versions to be used as the order for progressive migrations. If not specified, will default to a non-migrating data stack.
+     */
    public required init(modelName: String = applicationName, bundle: NSBundle = NSBundle.mainBundle(), migrationChain: MigrationChain = nil) {
        
        CoreStore.assert(
@@ -76,26 +80,26 @@ public final class DataStack {
    }
    
    /**
-    Returns the `DataStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
-    */
+     Returns the `DataStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
+     */
    public var modelVersion: String {
        
        return self.model.currentModelVersion!
    }
    
    /**
-    Returns the entity name-to-class type mapping from the `DataStack`'s model.
-    */
+     Returns the entity name-to-class type mapping from the `DataStack`'s model.
+     */
    public var entityTypesByName: [String: NSManagedObject.Type] {
        
        return self.model.entityTypesMapping()
    }
    
    /**
-    Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass.
-    */
+     Returns the `NSEntityDescription` for the specified `NSManagedObject` subclass.
+     */
    public func entityDescriptionForType(type: NSManagedObject.Type) -> NSEntityDescription? {
-    
+        
        return NSEntityDescription.entityForName(
            self.model.entityNameForClass(type),
            inManagedObjectContext: self.mainContext
@@ -103,19 +107,19 @@ public final class DataStack {
    }
    
    /**
-    Returns the `NSManagedObjectID` for the specified object URI if it exists in the persistent store.
-    */
+     Returns the `NSManagedObjectID` for the specified object URI if it exists in the persistent store.
+     */
    public func objectIDForURIRepresentation(url: NSURL) -> NSManagedObjectID? {
        
        return self.coordinator.managedObjectIDForURIRepresentation(url)
    }
    
    /**
-    Adds an in-memory store to the stack.
-    
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds an in-memory store to the stack.
+     
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`.
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
        
        let coordinator = self.coordinator;
@@ -154,17 +158,17 @@ public final class DataStack {
    }
    
    /**
-    Adds to the stack an SQLite store from the given SQLite file name.
-    
-    - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory. A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds to the stack an SQLite store from the given SQLite file name.
+     
+     - parameter fileName: the local filename for the SQLite persistent store in the "Application Support" directory (or the "Caches" directory on tvOS). A new SQLite file will be created if it does not exist. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileName` explicitly for each of them.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
        return try self.addSQLiteStoreAndWait(
-            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+            fileURL: defaultDirectory.URLByAppendingPathComponent(
                fileName,
                isDirectory: false
            ),
@@ -174,13 +178,13 @@ public final class DataStack {
    }
    
    /**
-    Adds to the stack an SQLite store from the given SQLite file URL.
-    
-    - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
-    - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
-    - returns: the `NSPersistentStore` added to the stack.
-    */
+     Adds to the stack an SQLite store from the given SQLite file URL.
+     
+     - parameter fileURL: the local file URL for the SQLite persistent store. A new SQLite file will be created if it does not exist. If not specified, defaults to a file URL pointing to a "<Application name>.sqlite" file in the "Application Support" directory (or the "Caches" directory on tvOS). Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter configuration: an optional configuration name from the model file. If not specified, defaults to `nil`, the "Default" configuration. Note that if you have multiple configurations, you will need to specify a different `fileURL` explicitly for each of them.
+     - parameter resetStoreOnModelMismatch: Set to true to delete the store on model mismatch; or set to false to throw exceptions on failure instead. Typically should only be set to true when debugging, or if the persistent store can be recreated easily. If not specified, defaults to false.
+     - returns: the `NSPersistentStore` added to the stack.
+     */
    public func addSQLiteStoreAndWait(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
        CoreStore.assert(
@@ -361,11 +365,17 @@ public final class DataStack {
            self.configurationStoreMapping[configurationName] = persistentStore
            for entityDescription in (self.coordinator.managedObjectModel.entitiesForConfiguration(configurationName) ?? []) {
                
-                if self.entityConfigurationsMapping[entityDescription.managedObjectClassName] == nil {
+                let managedObjectClassName = entityDescription.managedObjectClassName
+                CoreStore.assert(
+                    NSClassFromString(managedObjectClassName) != nil,
+                    "The class \(typeName(managedObjectClassName)) for the entity \(typeName(entityDescription.name)) does not exist. Check if the subclass type and module name are properly configured."
+                )
+                
+                if self.entityConfigurationsMapping[managedObjectClassName] == nil {
                    
-                    self.entityConfigurationsMapping[entityDescription.managedObjectClassName] = []
+                    self.entityConfigurationsMapping[managedObjectClassName] = []
                }
-                self.entityConfigurationsMapping[entityDescription.managedObjectClassName]?.insert(configurationName)
+                self.entityConfigurationsMapping[managedObjectClassName]?.insert(configurationName)
            }
        }
    }
--- a/Up/PersistentStoreResult.swift
+++ b/Up/PersistentStoreResult.swift
@@ -2,7 +2,7 @@
 //  PersistentStoreResult.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -30,42 +30,40 @@ import CoreData
 // MARK: - PersistentStoreResult

 /**
-The `PersistentStoreResult` indicates the result of an asynchronous initialization of a persistent store.
-The `PersistentStoreResult` can be treated as a boolean:
-
-    try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
-        if result {
-            // succeeded
-        }
-        else {
-            // failed
-        }
-    })
-
-or as an `enum`, where the resulting associated object can also be inspected:
-
-    try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
-        switch result {
-        case .Success(let persistentStore):
-            // persistentStore is the related NSPersistentStore instance
-        case .Failure(let error):
-            // error is the NSError instance for the failure
-        }
-    })
-```
-*/
+ The `PersistentStoreResult` indicates the result of an asynchronous initialization of a persistent store.
+ The `PersistentStoreResult` can be treated as a boolean:
+ ```
+ try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
+     if result {
+        // succeeded
+     }
+     else {
+        // failed
+     }
+ })
+ ```
+ or as an `enum`, where the resulting associated object can also be inspected:
+ ```
+ try! CoreStore.addSQLiteStore(completion: { (result: PersistentStoreResult) -> Void in
+     switch result {
+     case .Success(let persistentStore):
+        // persistentStore is the related NSPersistentStore instance
+     case .Failure(let error):
+        // error is the NSError instance for the failure
+     }
+ })
+ ```
+ */
 public enum PersistentStoreResult {
    
-    // MARK: Public
-    
    /**
-    `PersistentStoreResult.Success` indicates that the persistent store process succeeded. The associated object for this `enum` value is the related `NSPersistentStore` instance.
-    */
+     `PersistentStoreResult.Success` indicates that the persistent store process succeeded. The associated object for this `enum` value is the related `NSPersistentStore` instance.
+     */
    case Success(NSPersistentStore)
    
    /**
-    `PersistentStoreResult.Failure` indicates that the persistent store process failed. The associated object for this value is the related `NSError` instance.
-    */
+     `PersistentStoreResult.Failure` indicates that the persistent store process failed. The associated object for this value is the related `NSError` instance.
+     */
    case Failure(NSError)
    
    
@@ -88,9 +86,7 @@ public enum PersistentStoreResult {
    
    internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) {
        
-        self.init(NSError(
-            coreStoreErrorCode: errorCode,
-            userInfo: userInfo))
+        self.init(NSError(coreStoreErrorCode: errorCode, userInfo: userInfo))
    }
 }

@@ -99,8 +95,6 @@ public enum PersistentStoreResult {

 extension PersistentStoreResult: BooleanType {
    
-    // MARK: Public
-    
    public var boolValue: Bool {
        
        switch self {
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -35,11 +35,11 @@
 		B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */; };
 		B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */; };
 		B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */; };
-		B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
-		B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; };
-		B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
+		B5E89ACD1C52929C003B04A9 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; };
+		B5E89ACE1C52929C003B04A9 /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9241C202429008147CD /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; };
+		B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5BDC9211C202429008147CD /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25841B36E23C0000406B /* OrganismV1.swift */; };
 		B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE25861B36E2520000406B /* OrganismV2.swift */; };
 		B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */; };
@@ -48,14 +48,14 @@
 /* End PBXBuildFile section */

 /* Begin PBXCopyFilesBuildPhase section */
-		B583A9241AF5F542001F76AF /* Embed Frameworks */ = {
+		B5E89ACF1C52929C003B04A9 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B5BDC9261C202429008147CD /* GCDKit.framework in Embed Frameworks */,
-				B5BDC9231C202429008147CD /* CoreStore.framework in Embed Frameworks */,
+				B5E89ACE1C52929C003B04A9 /* GCDKit.framework in Embed Frameworks */,
+				B5E89AD11C5292A2003B04A9 /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -93,8 +93,8 @@
 		B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingResultsViewController.swift; sourceTree = "<group>"; };
 		B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryingResultsViewController.swift; sourceTree = "<group>"; };
 		B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemo.xcdatamodel; sourceTree = "<group>"; };
-		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = CoreStore.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/CoreStore.framework"; sourceTree = "<absolute>"; };
-		B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/JohnEstropia/Library/Developer/Xcode/DerivedData/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<absolute>"; };
+		B5BDC9211C202429008147CD /* CoreStore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreStore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B5BDC9241C202429008147CD /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GCDKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OrganismTableViewCell.swift; path = "CoreStoreDemo/MIgrations Demo/OrganismTableViewCell.swift"; sourceTree = SOURCE_ROOT; };
 		B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV2.xcdatamodel; sourceTree = "<group>"; };
 		B5EE25841B36E23C0000406B /* OrganismV1.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV1.swift; sourceTree = "<group>"; };
@@ -110,9 +110,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B5E89ACD1C52929C003B04A9 /* GCDKit.framework in Frameworks */,
+				B5E89AD01C5292A2003B04A9 /* CoreStore.framework in Frameworks */,
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
-				B5BDC9221C202429008147CD /* CoreStore.framework in Frameworks */,
-				B5BDC9251C202429008147CD /* GCDKit.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -254,7 +254,7 @@
 				B54AAD451AF4D26E00848AE0 /* Sources */,
 				B54AAD461AF4D26E00848AE0 /* Frameworks */,
 				B54AAD471AF4D26E00848AE0 /* Resources */,
-				B583A9241AF5F542001F76AF /* Embed Frameworks */,
+				B5E89ACF1C52929C003B04A9 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
--- 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/Demo/FetchingAndQueryingDemoViewController.swift
+++ b/Demo/FetchingAndQueryingDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/12.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -37,7 +37,7 @@ private struct Static {
                cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset
            }
            
-            transaction.commit()
+            transaction.commitAndWait()
        }
        
        return dataStack
--- a/Demo/FetchingResultsViewController.swift
+++ b/Demo/FetchingResultsViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/17.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/Demo/ListObserverDemoViewController.swift
+++ b/Demo/ListObserverDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

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

 import UIKit
@@ -61,7 +61,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                let palette = transaction.create(Into(Palette))
                palette.setInitialValues()
                
-                transaction.commit()
+                transaction.commitAndWait()
            }
            
            let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue")))!
--- a/Demo/ObserversViewController.swift
+++ b/Demo/ObserversViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import Foundation
--- a/CoreStoreDemo/CoreStoreDemo/List
+++ b/CoreStoreDemo/CoreStoreDemo/List
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/05.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import UIKit
--- a/Demo/MigrationsDemoViewController.swift
+++ b/Demo/MigrationsDemoViewController.swift
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/21.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -39,7 +39,7 @@ class MigrationsDemoViewController: UIViewController {
        
        let alert = UIAlertController(
            title: "Migrations Demo",
-            message: "This demo shows how to run incremental migrations and how to support multiple model versions in a single project.\n\nThe persistent store contains 10000 organisms, which gain/lose properties when the migration evolves/devolves them.\n\nYou can use the \"mutate\" button to change an organism's properties then migrate to a different model to see how its value gets affected.",
+            message: "This demo shows how to run progressive migrations and how to support multiple model versions in a single project.\n\nThe persistent store contains 10000 organisms, which gain/lose properties when the migration evolves/devolves them.\n\nYou can use the \"mutate\" button to change an organism's properties then migrate to a different model to see how its value gets affected.",
            preferredStyle: .Alert
        )
        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
@@ -267,7 +267,7 @@ class MigrationsDemoViewController: UIViewController {
        
        self.progressView?.setProgress(Float(progress.fractionCompleted), animated: true)
        self.titleLabel?.text = "Migrating: \(progress.localizedDescription)"
-        self.organismLabel?.text = "Incremental step \(progress.localizedAdditionalDescription)"
+        self.organismLabel?.text = "Progressive step \(progress.localizedAdditionalDescription)"
    }
    
    private func updateDisplay(reloadData reloadData: Bool, scrollToSelection: Bool, animated: Bool) {
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/06/27.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

 import UIKit
@@ -43,7 +43,7 @@ private struct Static {
            account2.name = "Jane Doe HCD"
            account2.friends = 314
            
-            transaction.commit()
+            transaction.commitAndWait()
        }
        
        return dataStack
@@ -77,7 +77,7 @@ private struct Static {
            account2.name = "#janedoe_hcd"
            account2.friends = 100
            
-            transaction.commit()
+            transaction.commitAndWait()
        }
        
        return dataStack
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -3,7 +3,7 @@
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 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 (c) 2015 John Rommel Estropia. All rights reserved.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
 //

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

 import UIKit
@@ -32,7 +32,7 @@ private struct Static {
                let place = transaction.create(Into(Place))
                place.setInitialValues()
                
-                transaction.commit()
+                transaction.commitAndWait()
            }
            place = CoreStore.fetchOne(From(Place))
        }
@@ -178,7 +178,7 @@ class TransactionsDemoViewController: UIViewController, MKMapViewDelegate, Objec
            
            let place = transaction.edit(Static.placeController.object)
            place?.setInitialValues()
-            transaction.commit()
+            transaction.commitAndWait()
        }
    }
    
--- a/CoreStoreTests/CoreStoreTests.swift
+++ b/CoreStoreTests/CoreStoreTests.swift
@@ -2,7 +2,7 @@
 //  CoreStoreTests.swift
 //  CoreStoreTests
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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
@@ -265,7 +265,7 @@ class CoreStoreTests: XCTestCase {
            )
            XCTAssertTrue(numberOfDeletedObjects2 == 2, "numberOfDeletedObjects2 == 2 (actual: \(numberOfDeletedObjects2))")
            
-            transaction.commit()
+            transaction.commitAndWait()
        }
        
        CoreStore.beginSynchronous({ (transaction) -> Void in
@@ -277,7 +277,7 @@ class CoreStoreTests: XCTestCase {
                obj.testEntityID = oldID
            }
            
-            transaction.commit()
+            transaction.commitAndWait()
        })
        
        let objs1 = CoreStore.fetchAll(From(TestEntity1))
@@ -351,7 +351,7 @@ class CoreStoreTests: XCTestCase {
                            let obj5 = transaction.edit(obj5)
                            transaction.delete(obj5, obj6)
                            
-                            transaction.commit()
+                            transaction.commitAndWait()
                        }
                        
                        let count2 = CoreStore.queryValue(
@@ -381,7 +381,7 @@ class CoreStoreTests: XCTestCase {
            
            let fileManager = NSFileManager.defaultManager()
            try fileManager.removeItemAtURL(
-                fileManager.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!
+                fileManager.URLsForDirectory(deviceDirectorySearchPath, inDomains: .UserDomainMask).first!
            )
        }
        catch _ { }
--- a/CoreStoreTests/TestEntity1.swift
+++ b/CoreStoreTests/TestEntity1.swift
@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/TestEntity2.swift
+++ b/CoreStoreTests/TestEntity2.swift
@@ -2,7 +2,7 @@
 //  TestEntity1.swift
 //  CoreStore
 //
-//  Copyright (c) 2014 John Rommel Estropia
+//  Copyright © 2014 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/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014 John Rommel Estropia
+Copyright © 2014 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
@@ -0,0 +1,30 @@
+//
+//  Package.swift
+//  CoreStore
+//
+//  Copyright © 2016 John Rommel Estropia
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "CoreStore"
+)
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # CoreStore
-[![Build Status](https://img.shields.io/travis/JohnEstropia/CoreStore/develop.svg)](https://travis-ci.org/JohnEstropia/CoreStore)
+[![Build Status](https://img.shields.io/travis/JohnEstropia/CoreStore/master.svg)](https://travis-ci.org/JohnEstropia/CoreStore)
 [![Version](https://img.shields.io/cocoapods/v/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![Platform](https://img.shields.io/cocoapods/p/CoreStore.svg?style=flat)](http://cocoadocs.org/docsets/CoreStore)
 [![License](https://img.shields.io/cocoapods/l/CoreStore.svg?style=flat)](https://raw.githubusercontent.com/JohnEstropia/CoreStore/master/LICENSE)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)

 Unleashing the real power of Core Data with the elegance and safety of Swift
-* Swift 2.1 (XCode 7.1), iOS 8+/OSX 10.10+ (or try out the [iOS 7 branch](https://github.com/JohnEstropia/CoreStore/tree/ios7_support_alpha))
+* Swift 2.2 (Xcode 7.3), iOS 8+/OSX 10.10+ (or try out the [iOS 7 branch](https://github.com/JohnEstropia/CoreStore/tree/ios7_support_alpha))

 [Click here for a wiki version of this README](https://github.com/JohnEstropia/CoreStore/wiki)

@@ -14,18 +14,18 @@ Unleashing the real power of Core Data with the elegance and safety of Swift

 ## What CoreStore does better:

- Heavily supports multiple persistent stores per data stack, just the way *.xcdatamodeld* files are designed to. CoreStore will also manage one data stack by default, but you can create and manage as many as you need.
- Incremental Migrations! Just tell the data stack the sequence of model versions and CoreStore will automatically use incremental migrations if needed on stores added to that stack.
- Ability to plug-in your own logging framework
- Gets around a limitation with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you are free to name them independently.
- Provides type-safe, easy to configure observers to replace `NSFetchedResultsController` and KVO
- Exposes API not just for fetching, but also for querying aggregates and property values
- Makes it hard to fall into common concurrency mistakes. All `NSManagedObjectContext` tasks are encapsulated into safer, higher-level abstractions without sacrificing flexibility and customizability.
- Exposes clean and convenient API designed around Swift’s code elegance and type safety.
- Documentation! No magic here; all public classes, functions, properties, etc. have detailed Apple Docs. This README also introduces a lot of concepts and explains a lot of CoreStore's behavior.
- **New in 1.3.0:** Efficient importing utilities!
+- **Heavily supports multiple persistent stores per data stack**, just the way *.xcdatamodeld* files are designed to. CoreStore will also manage one data stack by default, but you can create and manage as many as you need.
+- **Progressive Migrations!** Just tell the data stack the sequence of model versions and CoreStore will automatically use progressive migrations if needed on stores added to that stack.
+- Ability to **plug-in your own logging framework**
+- Gets around a limitation with other Core Data wrappers where the entity name should be the same as the `NSManagedObject` subclass name. CoreStore loads entity-to-class mappings from the managed object model file, so you are **free to name entities and their class names independently**.
+- Provides type-safe, easy to configure **observers to replace `NSFetchedResultsController` and KVO**
+- Exposes **API not just for fetching, but also for querying aggregates and property values**
+- Makes it hard to fall into common concurrency mistakes. All `NSManagedObjectContext` tasks are encapsulated into **safer, higher-level abstractions** without sacrificing flexibility and customizability.
+- Exposes clean and convenient API designed around **Swift’s code elegance and type safety**.
+- **Documentation!** No magic here; all public classes, functions, properties, etc. have detailed Apple Docs. This README also introduces a lot of concepts and explains a lot of CoreStore's behavior.
+- **Efficient importing utilities!**

-**[Or vote for the next feature!](http://goo.gl/RIiHMP)**
+**[Vote for the next feature!](http://goo.gl/RIiHMP)**



@@ -36,7 +36,7 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 - CoreStore Tutorials (All of these have demos in the **CoreStoreDemo** app project!)
    - [Setting up](#setting-up)
    - [Migrations](#migrations)
-        - [Incremental migrations](#incremental-migrations)
+        - [Progressive migrations](#progressive-migrations)
        - [Forecasting migrations](#forecasting-migrations)
    - [Saving and processing transactions](#saving-and-processing-transactions)
        - [Transaction types](#transaction-types)
@@ -65,12 +65,15 @@ Unleashing the real power of Core Data with the elegance and safety of Swift
 - [Installation](#installation)
 - [Changesets](#changesets)
    - [Upgrading from v0.2.0 to 1.0.0](#upgrading-from-v020-to-100)
+- [Contact](#contact)
+- [Who uses CoreStore?](#who-uses-corestore)
+- [License](#license)



 ## TL;DR (a.k.a. sample codes)

-Setting-up with incremental migration support:
+Setting-up with progressive migration support:
 ```swift
 CoreStore.defaultStack = DataStack(
    modelName: "MyStore",
@@ -80,17 +83,12 @@ CoreStore.defaultStack = DataStack(

 Adding a store:
 ```swift
-do {
-    try CoreStore.addSQLiteStore(
-        fileName: "MyStore.sqlite",
-        completion: { (result) -> Void in
-            // ...
-        }
-    )
-}
-catch {
-    // ...
-}
+try CoreStore.addSQLiteStore(
+    fileName: "MyStore.sqlite",
+    completion: { (result) -> Void in
+        // ...
+    }
+)
 ```

 Starting transactions:
@@ -174,14 +172,14 @@ catch {
 This one-liner does the following:
 - Triggers the lazy-initialization of `CoreStore.defaultStack` with a default `DataStack`
 - Sets up the stack's `NSPersistentStoreCoordinator`, the root saving `NSManagedObjectContext`, and the read-only main `NSManagedObjectContext`
- Adds an SQLite store in the *"Application Support"* directory with the file name *"[App bundle name].sqlite"*
+- Adds an SQLite store in the *"Application Support"* directory (or the *"Caches"* directory on tvOS) with the file name *"[App bundle name].sqlite"*
 - Creates and returns the `NSPersistentStore` instance on success, or an `NSError` on failure

 For most cases, this configuration is usable as it is. But for more hardcore settings, refer to this extensive example:
 ```swift
 let dataStack = DataStack(
    modelName: "MyModel", // loads from the "MyModel.xcdatamodeld" file
-    migrationChain: ["MyStore", "MyStoreV2", "MyStoreV3"] // model versions for incremental migrations
+    migrationChain: ["MyStore", "MyStoreV2", "MyStoreV3"] // model versions for progressive migrations
 )

 do {
@@ -259,15 +257,15 @@ class MyViewController: UIViewController {
 So far we have only seen `addSQLiteStoreAndWait(...)` used to initialize our persistent store. As the method name's "AndWait" suffix suggests, this method blocks so it should not do long tasks such as store migrations (in fact CoreStore won't even attempt to, and any model mismatch will be reported as an error). If migrations are expected, the asynchronous variant `addSQLiteStore(... completion:)` method should be used instead:
 ```swift
 do {
-    let progress: NSProgress = try dataStack.addSQLiteStore(
+    let progress: NSProgress? = try dataStack.addSQLiteStore(
        fileName: "MyStore.sqlite",
        configuration: "Config2",
        completion: { (result) -> Void in
            switch result {
            case .Success(let persistentStore):
-                print("Successfully added sqlite store: \(persistentStore)"
+                print("Successfully added sqlite store: \(persistentStore)")
            case .Failure(let error):
-                print("Failed adding sqlite store with error: \(error)"
+                print("Failed adding sqlite store with error: \(error)")
            }
        }
    )
@@ -291,7 +289,7 @@ progress?.setProgressHandler { [weak self] (progress) -> Void in
 This closure is executed on the main thread so UIKit calls can be done safely.


-### Incremental migrations
+### Progressive migrations
 By default, CoreStore uses Core Data's default automatic migration mechanism. In other words, CoreStore will try to migrate the existing persistent store to the *.xcdatamodeld* file's current model version. If no mapping model is found from the store's version to the data model's version, CoreStore gives up and reports an error.

 The `DataStack` lets you specify hints on how to break a migration into several sub-migrations using a `MigrationChain`. This is typically passed to the `DataStack` initializer and will be applied to all stores added to the `DataStack` with `addSQLiteStore(...)` and its variants:
@@ -314,7 +312,7 @@ This allows for different migration paths depending on the starting version. The
 - MyAppModelV2-MyAppModelV4
 - MyAppModelV3-MyAppModelV4

-Initializing with empty values (either `nil`, `[]`, or `[:]`) instructs the `DataStack` to disable incremental migrations and revert to the default migration behavior (i.e. use the .xcdatamodel's current version as the final version):
+Initializing with empty values (either `nil`, `[]`, or `[:]`) instructs the `DataStack` to disable progressive migrations and revert to the default migration behavior (i.e. use the .xcdatamodel's current version as the final version):
 ```swift
 let dataStack = DataStack(migrationChain: nil)
 ```
@@ -566,7 +564,7 @@ CoreStore.beginAsynchronous { (transaction) -> Void in
        From(MyPersonEntity),
        Where("name", isEqualTo: "Jane Smith")
    )
-    jane.friends = NSSet(array: transactin.fetchExisting(peopleIDs)!)
+    jane.friends = NSSet(array: transaction.fetchExisting(peopleIDs)!)
    // ...
 }
 ```
@@ -714,7 +712,7 @@ class func uniqueIDFromImportSource(source: ImportSource, inTransaction transact
 ```
 For `ImportableUniqueObject`, the extraction and assignment of values should be implemented from the `updateFromImportSource(...)` method. The `didInsertFromImportSource(...)` by default calls `updateFromImportSource(...)`, but you can separate the implementation for inserts and updates if needed.

-You can then call create/update an object by calling a transaction's `importUniqueObject(...)` method:
+You can then create/update an object by calling a transaction's `importUniqueObject(...)` method:
 ```swift
 CoreStore.beginAsynchronous { (transaction) -> Void in
    let json: [String: AnyObject] = // ...
@@ -1162,27 +1160,32 @@ let person2 = self.monitor[1, 2]


 # Roadmap
- Data importing utilities for transactions
 - Support iCloud stores
+- CoreSpotlight auto-indexing (experimental)


 # Installation
 - Requires:
    - iOS 8 SDK and above
-    - Swift 2.0 (XCode 7 beta 6)
+    - Swift 2.1 (Xcode 7.2)
 - Dependencies:
    - [GCDKit](https://github.com/JohnEstropia/GCDKit)

-### Install with Cocoapods
+### Install with CocoaPods
 ```
 pod 'CoreStore'
 ```
 This installs CoreStore as a framework. Declare `import CoreStore` in your swift file to use the library.

 ### Install with Carthage
+In your `Cartfile`, add
 ```
-github "JohnEstropia/CoreStore" >= 1.3.0
-github "JohnEstropia/GCDKit" >= 1.1.5
+github "JohnEstropia/CoreStore" >= 1.4.4
+github "JohnEstropia/GCDKit" >= 1.1.7
+```
+and run 
+```
+carthage update
 ```

 ### Install as Git Submodule
@@ -1214,11 +1217,20 @@ The protocols above had their methods renamed as well, to retain the natural lan
 - New migration utilities! (README still pending) Check out *DataStack+Migration.swift* and *CoreStore+Migration.swift* for the new methods, as well as *DataStack.swift* for its new initializer.


-# Contributions
-While CoreStore's design is pretty solid and the unit test and demo app work well, CoreStore is pretty much still in its early stage. With more exposure to production code usage and criticisms from the developer community, CoreStore hopes to mature as well.
-Please feel free to report any issues, suggestions, or criticisms!
-日本語で連絡していただいても構いません！
+# Contact
+Questions? Suggestions?

-## License
+Reach me on Twitter [@JohnEstropia](https://twitter.com/JohnEstropia)
+
+or tag your Stackoverflow question with **corestore**
+
+日本語の対応も可能なので是非！
+
+
+# Who uses CoreStore?
+Did CoreStore serve you well? I'd love to hear about your app :)
+
+
+# License
 CoreStore is released under an MIT license. See the LICENSE file for more information
Author	SHA1	Message	Date
John Estropia	928585029d	XCode 7.3 full support	2016-03-23 12:39:11 +09:00
John Estropia	dc6d22b6ff	updated travis XCode version	2016-03-23 12:14:34 +09:00
John Estropia	5ca0f657cb	XCode 7.3 fixes	2016-03-23 12:07:31 +09:00
John Rommel Estropia	c323a28c19	fix warnings in demo app	2016-03-12 09:27:59 +09:00
John Estropia	64ad7b3bfd	Update README.md	2016-03-11 20:59:52 +09:00
John Estropia	df441c5d04	Update README.md	2016-03-11 20:58:33 +09:00
John Estropia	3c2fb28644	added Packaged.swift	2016-03-01 19:42:28 +09:00
John Estropia	e66a13632a	Merge branch 'develop'	2016-02-25 15:52:59 +09:00
John Estropia	4c78a309bc	deprecated NSFetchedResultsController initializer in favor of static factory method	2016-02-25 15:52:49 +09:00
John Estropia	9055daa58c	Merge branch 'develop'	2016-02-25 15:11:40 +09:00
John Estropia	3905423038	fix compile error	2016-02-25 15:05:27 +09:00
John Estropia	15353268e2	Allow unsafe transactions to save synchronously	2016-02-25 15:04:05 +09:00
John Estropia	c12331f403	Merge pull request #53 from mpurbo/patch-1 added missing closing bracket on sample code.	2016-02-22 22:26:38 +09:00
Mamad Purbo	a55a8d389c	added missing closing bracket on sample code.	2016-02-22 11:50:28 +09:00
John Rommel Estropia	6e88b14237	fixed readme build status	2016-02-20 12:30:02 +09:00
John Rommel Estropia	53700a267f	version bump	2016-02-20 12:28:39 +09:00
John Rommel Estropia	6c95b010e9	utility to update an existing ImportableObject from its ImportSource (fixes #52 )	2016-02-20 12:26:23 +09:00
John Rommel Estropia	1af675e8b7	tidy up	2016-02-20 12:05:01 +09:00
John Rommel Estropia	b85f16cf68	Merge branch 'master' into develop	2016-02-20 01:25:40 +09:00
John Estropia	37bf4179c8	renamed "Incremental Migrations" to "Progressive Migrations" to match the common term used by the community	2016-02-17 15:34:33 +09:00
John Estropia	240dda6ad6	Merge pull request #50 from ReadmeCritic/master Correct the spelling of Xcode in README	2016-02-17 10:03:47 +09:00
ReadmeCritic	ffe73d0f66	Correct the spelling of Xcode in README	2016-02-16 11:47:36 -08:00
John Rommel Estropia	43c4998e20	fix podspec	2016-02-17 02:32:39 +09:00
John Rommel Estropia	0c4e55f061	Merge branch 'develop'	2016-02-17 02:06:57 +09:00
John Rommel Estropia	8c8953c507	updated .travis.yml	2016-02-17 01:57:28 +09:00
John Rommel Estropia	66892f22a3	comments cleanup	2016-02-17 01:38:26 +09:00
John Rommel Estropia	def105e73a	added utility to query transactions about pending inserts, updates, and deletes	2016-02-17 00:00:25 +09:00
John Rommel Estropia	57bf123fb2	assert missing classes in model	2016-02-16 07:52:34 +09:00
John Rommel Estropia	8efd6572f0	Refetch monitors when persistent stores are added/removed. Allow unsafe transactions to create their own monitors	2016-02-15 07:56:17 +09:00
John Estropia	405e861907	Merge pull request #47 from ReadmeCritic/master Correct the spelling of CocoaPods in README	2016-02-12 10:37:49 +09:00
ReadmeCritic	74c48c7486	Correct the spelling of CocoaPods in README	2016-02-11 09:45:40 -08:00
John Rommel Estropia	e58b3b0131	fixed some typos in the README	2016-02-11 09:25:32 +09:00
John Rommel Estropia	b8fad66bfa	tidy up: copyright symbol	2016-02-01 01:07:07 +09:00
John Rommel Estropia	ff1155dac3	fix OSX compiler error	2016-01-31 23:27:29 +09:00
John Rommel Estropia	5137649b78	Fix for Swift 2.2 compatibility	2016-01-31 17:23:34 +09:00
John Rommel Estropia	7a95267a9c	updated Readme	2016-01-26 12:34:06 +09:00
John Rommel Estropia	c07435e866	Added utility for re-faulting all objects in a transaction/dataStack	2016-01-26 12:22:30 +09:00
John Rommel Estropia	f5627f0855	fixed demo app framework settings	2016-01-23 01:52:27 +09:00
John Estropia	d3ea655eb9	Merge branch 'master' into develop Conflicts: README.md	2016-01-19 12:26:37 +09:00
John Estropia	fc83180af8	updated README	2016-01-19 12:25:58 +09:00
John Estropia	0c6246475a	update README	2016-01-19 12:24:14 +09:00
John Estropia	087480a3a8	update cartfile	2016-01-19 12:22:14 +09:00
John Estropia	83a04e669e	updated .travis.yml	2016-01-19 11:55:22 +09:00
John Estropia	d05522bb20	tidy up, set default directory to Caches folder on tvOS	2016-01-19 11:38:11 +09:00
Cihat Gündüz	9081b36cca	Add tvOS target + Configure target + Add shared scheme for tvOS	2016-01-17 13:30:45 +01:00
Cihat Gündüz	9322371224	Use tvOS_support feature branch of GCDKit (Carthage + git submodules)	2016-01-17 13:11:58 +01:00