version bump

Merge branch 'develop'
let transaction fetch existing objects from external contexts
2026-01-13 04:40:32 +01:00 · 2015-08-21 08:03:14 +09:00 · 2015-08-21 08:03:01 +09:00 · 2015-08-20 17:20:38 +09:00 · 2015-08-20 14:25:14 +09:00 · 2015-08-20 13:51:14 +09:00
106 changed files with 8078 additions and 1968 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-HardcoreData.xcodeproj/xcuserdata
-HardcoreDataDemo/HardcoreDataDemo.xcodeproj/xcuserdata
-HardcoreDataDemo/HardcoreDataDemo.xcodeproj/project.xcworkspace/xcuserdata
+CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata
+CoreStore.xcodeproj/project.xcworkspace/xcuserdata
+CoreStore.xcodeproj/xcuserdata
+CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata
--- a/CoreStore.podspec
+++ b/CoreStore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = "CoreStore"
-    s.version = "0.1.0"
+    s.version = "1.2.0"
    s.license = "MIT"
    s.summary = "Simple, elegant, and smart Core Data programming with Swift"
    s.homepage = "https://github.com/JohnEstropia/CoreStore"
@@ -12,5 +12,5 @@ Pod::Spec.new do |s|
    s.source_files = "CoreStore", "CoreStore/**/*.{swift}"
    s.frameworks = "Foundation", "UIKit", "CoreData"
    s.requires_arc = true
-    s.dependency "GCDKit", "1.0.1"
+    s.dependency "GCDKit", "1.1.1"
 end
--- a/CoreStore.xcodeproj/project.pbxproj
+++ b/CoreStore.xcodeproj/project.pbxproj
@@ -12,6 +12,14 @@
 		2F03A54D19C5C872005002A5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F03A54C19C5C872005002A5 /* CoreData.framework */; };
 		2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F291E2619C6D3CF007AF63F /* CoreStore.swift */; };
 		B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */; };
+		B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */; };
+		B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007101B3F6BD500A9A8F9 /* Into.swift */; };
+		B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007131B3F6C2800A9A8F9 /* SectionBy.swift */; };
+		B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56007151B4018AB00A9A8F9 /* MigrationChain.swift */; };
+		B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */; };
+		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 */; };
 		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 */; };
@@ -19,6 +27,8 @@
 		B5D39A0419FD00DE000E91BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D39A0319FD00DE000E91BB /* UIKit.framework */; };
 		B5D5E0CF1A4D6AAB006468AF /* TestEntity2.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */; };
 		B5D8080E1A3471A500A44484 /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D808021A34715700A44484 /* GCDKit.framework */; };
+		B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */; };
+		B5E834BB1B7691F3001D3D50 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E834BA1B7691F3001D3D50 /* Functions.swift */; };
 		B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDB1AFF84500064E85B /* DataStack.swift */; };
 		B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EDE1AFF84500064E85B /* PersistentStoreResult.swift */; };
 		B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84EE31AFF84610064E85B /* DefaultLogger.swift */; };
@@ -42,10 +52,10 @@
 		B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */; };
 		B5E84F201AFF84860064E85B /* DataStack+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */; };
 		B5E84F211AFF84860064E85B /* CoreStore+Observing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */; };
-		B5E84F221AFF84860064E85B /* ManagedObjectController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */; };
-		B5E84F231AFF84860064E85B /* ManagedObjectListController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */; };
-		B5E84F241AFF84860064E85B /* ManagedObjectListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ManagedObjectListObserver.swift */; };
-		B5E84F251AFF84860064E85B /* ManagedObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1F1AFF84860064E85B /* ManagedObjectObserver.swift */; };
+		B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */; };
+		B5E84F231AFF84860064E85B /* ListMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1D1AFF84860064E85B /* ListMonitor.swift */; };
+		B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1E1AFF84860064E85B /* ListObserver.swift */; };
+		B5E84F251AFF84860064E85B /* ObjectObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */; };
 		B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */; };
 		B5E84F2E1AFF849C0064E85B /* AssociatedObjects.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */; };
 		B5E84F2F1AFF849C0064E85B /* NotificationObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */; };
@@ -56,6 +66,9 @@
 		B5E84F381AFF85470064E85B /* NSManagedObject+Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */; };
 		B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */; };
 		B5E84F411AFF8CCD0064E85B /* ClauseTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */; };
+		B5FAD6A91B50A4B400714891 /* NSProgress+Convenience.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */; };
+		B5FAD6AC1B51285300714891 /* MigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AB1B51285300714891 /* MigrationManager.swift */; };
+		B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -80,6 +93,13 @@
 			remoteGlobalIDString = 2FBBCAD619A9FE610070E4AB;
 			remoteInfo = GCDKitTests;
 		};
+		B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = B5D806C51A34715700A44484 /* GCDKit.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2FBBCACA19A9FE610070E4AB;
+			remoteInfo = GCDKit;
+		};
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
@@ -92,6 +112,14 @@
 		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>"; };
 		B504D0D51B02362500B2BBB1 /* CoreStore+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Setup.swift"; sourceTree = "<group>"; };
+		B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectModel+Setup.swift"; sourceTree = "<group>"; };
+		B56007101B3F6BD500A9A8F9 /* Into.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Into.swift; sourceTree = "<group>"; };
+		B56007131B3F6C2800A9A8F9 /* SectionBy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionBy.swift; sourceTree = "<group>"; };
+		B56007151B4018AB00A9A8F9 /* MigrationChain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationChain.swift; sourceTree = "<group>"; };
+		B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Migration.swift"; sourceTree = "<group>"; };
+		B56965231B356B820075EE4A /* MigrationResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationResult.swift; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
@@ -100,6 +128,8 @@
 		B5D5E0CE1A4D6AAB006468AF /* TestEntity2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEntity2.swift; sourceTree = "<group>"; };
 		B5D806C51A34715700A44484 /* GCDKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = GCDKit.xcodeproj; sourceTree = "<group>"; };
 		B5D9C8F61B160ED200E64F0E /* CoreStore.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoreStore.podspec; sourceTree = SOURCE_ROOT; };
+		B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BaseDataTransaction+Importing.swift"; sourceTree = "<group>"; };
+		B5E834BA1B7691F3001D3D50 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
 		B5E84ED81AFF82360064E85B /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		B5E84ED91AFF82360064E85B /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
 		B5E84EDB1AFF84500064E85B /* DataStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataStack.swift; sourceTree = "<group>"; };
@@ -125,10 +155,10 @@
 		B5E84F071AFF847B0064E85B /* CoreStore+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Querying.swift"; sourceTree = "<group>"; };
 		B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataStack+Observing.swift"; sourceTree = "<group>"; };
 		B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Observing.swift"; sourceTree = "<group>"; };
-		B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectController.swift; sourceTree = "<group>"; };
-		B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectListController.swift; sourceTree = "<group>"; };
-		B5E84F1E1AFF84860064E85B /* ManagedObjectListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectListObserver.swift; sourceTree = "<group>"; };
-		B5E84F1F1AFF84860064E85B /* ManagedObjectObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagedObjectObserver.swift; sourceTree = "<group>"; };
+		B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectMonitor.swift; sourceTree = "<group>"; };
+		B5E84F1D1AFF84860064E85B /* ListMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListMonitor.swift; sourceTree = "<group>"; };
+		B5E84F1E1AFF84860064E85B /* ListObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserver.swift; sourceTree = "<group>"; };
+		B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserver.swift; sourceTree = "<group>"; };
 		B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Convenience.swift"; sourceTree = "<group>"; };
 		B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssociatedObjects.swift; sourceTree = "<group>"; };
 		B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationObserver.swift; sourceTree = "<group>"; };
@@ -139,6 +169,9 @@
 		B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Transaction.swift"; sourceTree = "<group>"; };
 		B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObjectContext+Querying.swift"; sourceTree = "<group>"; };
 		B5E84F401AFF8CCD0064E85B /* ClauseTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ClauseTypes.swift; sourceTree = "<group>"; };
+		B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSProgress+Convenience.swift"; sourceTree = "<group>"; };
+		B5FAD6AB1B51285300714891 /* MigrationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationManager.swift; sourceTree = "<group>"; };
+		B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CoreStore+Migration.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -192,8 +225,10 @@
 				B5E84EDA1AFF84500064E85B /* Setting Up */,
 				B5E84EE21AFF84610064E85B /* Logging */,
 				B5E84EE91AFF846E0064E85B /* Saving and Processing */,
+				B5E834B61B7630BD001D3D50 /* Importing Data */,
 				B5E84EFD1AFF847B0064E85B /* Fetching and Querying */,
 				B5E84F191AFF84860064E85B /* Observing */,
+				B56964D11B22FF700075EE4A /* Migrating */,
 				B5E84F261AFF84920064E85B /* Convenience Helpers */,
 				B5E84F291AFF849C0064E85B /* Internal */,
 				2F03A53319C5C6DA005002A5 /* Supporting Files */,
@@ -242,6 +277,18 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		B56964D11B22FF700075EE4A /* Migrating */ = {
+			isa = PBXGroup;
+			children = (
+				B56964D31B22FFAD0075EE4A /* DataStack+Migration.swift */,
+				B5FAD6AD1B518DCB00714891 /* CoreStore+Migration.swift */,
+				B56007151B4018AB00A9A8F9 /* MigrationChain.swift */,
+				B5A261201B64BFDB006EB6D3 /* MigrationType.swift */,
+				B56965231B356B820075EE4A /* MigrationResult.swift */,
+			);
+			path = Migrating;
+			sourceTree = "<group>";
+		};
 		B5D806BB1A34715700A44484 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -267,6 +314,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		B5E834B61B7630BD001D3D50 /* Importing Data */ = {
+			isa = PBXGroup;
+			children = (
+				B5E834B81B76311F001D3D50 /* BaseDataTransaction+Importing.swift */,
+			);
+			path = "Importing Data";
+			sourceTree = "<group>";
+		};
 		B5E84EDA1AFF84500064E85B /* Setting Up */ = {
 			isa = PBXGroup;
 			children = (
@@ -290,13 +345,14 @@
 		B5E84EE91AFF846E0064E85B /* Saving and Processing */ = {
 			isa = PBXGroup;
 			children = (
+				B56007101B3F6BD500A9A8F9 /* Into.swift */,
 				B5E84EEB1AFF846E0064E85B /* BaseDataTransaction.swift */,
 				B5E84EEA1AFF846E0064E85B /* AsynchronousDataTransaction.swift */,
-				B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */,
+				B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */,
 				B5E84EED1AFF846E0064E85B /* DetachedDataTransaction.swift */,
+				B5E84EEC1AFF846E0064E85B /* DataStack+Transaction.swift */,
 				B5E84EEE1AFF846E0064E85B /* CoreStore+Transaction.swift */,
 				B5E84EF21AFF846E0064E85B /* SaveResult.swift */,
-				B5E84EF31AFF846E0064E85B /* SynchronousDataTransaction.swift */,
 			);
 			path = "Saving and Processing";
 			sourceTree = "<group>";
@@ -337,12 +393,13 @@
 		B5E84F191AFF84860064E85B /* Observing */ = {
 			isa = PBXGroup;
 			children = (
+				B56007131B3F6C2800A9A8F9 /* SectionBy.swift */,
 				B5E84F1A1AFF84860064E85B /* DataStack+Observing.swift */,
 				B5E84F1B1AFF84860064E85B /* CoreStore+Observing.swift */,
-				B5E84F1C1AFF84860064E85B /* ManagedObjectController.swift */,
-				B5E84F1F1AFF84860064E85B /* ManagedObjectObserver.swift */,
-				B5E84F1D1AFF84860064E85B /* ManagedObjectListController.swift */,
-				B5E84F1E1AFF84860064E85B /* ManagedObjectListObserver.swift */,
+				B5E84F1C1AFF84860064E85B /* ObjectMonitor.swift */,
+				B5E84F1F1AFF84860064E85B /* ObjectObserver.swift */,
+				B5E84F1D1AFF84860064E85B /* ListMonitor.swift */,
+				B5E84F1E1AFF84860064E85B /* ListObserver.swift */,
 			);
 			path = Observing;
 			sourceTree = "<group>";
@@ -351,6 +408,7 @@
 			isa = PBXGroup;
 			children = (
 				B5E84F271AFF84920064E85B /* NSManagedObject+Convenience.swift */,
+				B5FAD6A81B50A4B300714891 /* NSProgress+Convenience.swift */,
 			);
 			path = "Convenience Helpers";
 			sourceTree = "<group>";
@@ -360,12 +418,16 @@
 			children = (
 				B5E84F2A1AFF849C0064E85B /* AssociatedObjects.swift */,
 				B5E84F2B1AFF849C0064E85B /* NotificationObserver.swift */,
+				B5FAD6AB1B51285300714891 /* MigrationManager.swift */,
+				B59D5C211B5BA34B00453479 /* NSFileManager+Setup.swift */,
 				B5E84F341AFF85470064E85B /* NSManagedObject+Transaction.swift */,
 				B5E84F2C1AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift */,
 				B5E84F351AFF85470064E85B /* NSManagedObjectContext+Querying.swift */,
 				B5E84F321AFF85470064E85B /* NSManagedObjectContext+Setup.swift */,
 				B5E84F331AFF85470064E85B /* NSManagedObjectContext+Transaction.swift */,
+				B51BE0691B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift */,
 				B5E84F2D1AFF849C0064E85B /* WeakObject.swift */,
+				B5E834BA1B7691F3001D3D50 /* Functions.swift */,
 			);
 			path = Internal;
 			sourceTree = "<group>";
@@ -396,6 +458,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */,
 			);
 			name = CoreStore;
 			productName = CoreStore;
@@ -426,7 +489,8 @@
 		2F03A52719C5C6DA005002A5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					2F03A52F19C5C6DA005002A5 = {
@@ -501,33 +565,45 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5E84F221AFF84860064E85B /* ManagedObjectController.swift in Sources */,
+				B5E84F221AFF84860064E85B /* ObjectMonitor.swift in Sources */,
 				B504D0D61B02362500B2BBB1 /* CoreStore+Setup.swift in Sources */,
 				B5D1E22C19FA9FBC003B2874 /* NSError+CoreStore.swift in Sources */,
 				B5E84F131AFF847B0064E85B /* Where.swift in Sources */,
+				B5A261211B64BFDB006EB6D3 /* MigrationType.swift in Sources */,
 				B5E84F141AFF847B0064E85B /* DataStack+Querying.swift in Sources */,
+				B56007141B3F6C2800A9A8F9 /* SectionBy.swift in Sources */,
 				B5E84F371AFF85470064E85B /* NSManagedObjectContext+Transaction.swift in Sources */,
+				B56007161B4018AB00A9A8F9 /* MigrationChain.swift in Sources */,
 				B5E84F0E1AFF847B0064E85B /* Tweak.swift in Sources */,
 				B5E84F121AFF847B0064E85B /* OrderBy.swift in Sources */,
 				B5E84F361AFF85470064E85B /* NSManagedObjectContext+Setup.swift in Sources */,
+				B5FAD6AE1B518DCB00714891 /* CoreStore+Migration.swift in Sources */,
 				B5E84EE71AFF84610064E85B /* CoreStore+Logging.swift in Sources */,
+				B56007111B3F6BD500A9A8F9 /* Into.swift in Sources */,
 				B5E84F111AFF847B0064E85B /* Select.swift in Sources */,
 				B5E84EE11AFF84500064E85B /* PersistentStoreResult.swift in Sources */,
-				B5E84F251AFF84860064E85B /* ManagedObjectObserver.swift in Sources */,
+				B5E84F251AFF84860064E85B /* ObjectObserver.swift in Sources */,
 				B5E84F2F1AFF849C0064E85B /* NotificationObserver.swift in Sources */,
 				B5E84F381AFF85470064E85B /* NSManagedObject+Transaction.swift in Sources */,
+				B56965241B356B820075EE4A /* MigrationResult.swift in Sources */,
 				2F291E2719C6D3CF007AF63F /* CoreStore.swift in Sources */,
 				B5E84F411AFF8CCD0064E85B /* ClauseTypes.swift in Sources */,
 				B5E84F0D1AFF847B0064E85B /* BaseDataTransaction+Querying.swift in Sources */,
+				B5FAD6AC1B51285300714891 /* MigrationManager.swift in Sources */,
 				B5E84EF61AFF846E0064E85B /* DataStack+Transaction.swift in Sources */,
 				B5E84EDF1AFF84500064E85B /* DataStack.swift in Sources */,
-				B5E84F231AFF84860064E85B /* ManagedObjectListController.swift in Sources */,
+				B5E834BB1B7691F3001D3D50 /* Functions.swift in Sources */,
+				B5E84F231AFF84860064E85B /* ListMonitor.swift in Sources */,
 				B5E84EF71AFF846E0064E85B /* DetachedDataTransaction.swift in Sources */,
+				B56964D41B22FFAD0075EE4A /* DataStack+Migration.swift in Sources */,
 				B5E84EF51AFF846E0064E85B /* BaseDataTransaction.swift in Sources */,
 				B5E84EFB1AFF846E0064E85B /* SaveResult.swift in Sources */,
 				B5E84F0F1AFF847B0064E85B /* From.swift in Sources */,
+				B59D5C221B5BA34B00453479 /* NSFileManager+Setup.swift in Sources */,
+				B5FAD6A91B50A4B400714891 /* NSProgress+Convenience.swift in Sources */,
 				B5E84EFC1AFF846E0064E85B /* SynchronousDataTransaction.swift in Sources */,
 				B5E84F281AFF84920064E85B /* NSManagedObject+Convenience.swift in Sources */,
+				B51BE06A1B47FC4B0069F532 /* NSManagedObjectModel+Setup.swift in Sources */,
 				B5E84F391AFF85470064E85B /* NSManagedObjectContext+Querying.swift in Sources */,
 				B5E84EE81AFF84610064E85B /* CoreStoreLogger.swift in Sources */,
 				B5E84F311AFF849C0064E85B /* WeakObject.swift in Sources */,
@@ -536,10 +612,11 @@
 				B5E84EF81AFF846E0064E85B /* CoreStore+Transaction.swift in Sources */,
 				B5E84F301AFF849C0064E85B /* NSManagedObjectContext+CoreStore.swift in Sources */,
 				B5E84F211AFF84860064E85B /* CoreStore+Observing.swift in Sources */,
+				B5E834B91B76311F001D3D50 /* BaseDataTransaction+Importing.swift in Sources */,
 				B5E84EE61AFF84610064E85B /* DefaultLogger.swift in Sources */,
 				B5E84EF41AFF846E0064E85B /* AsynchronousDataTransaction.swift in Sources */,
 				B5E84F151AFF847B0064E85B /* CoreStore+Querying.swift in Sources */,
-				B5E84F241AFF84860064E85B /* ManagedObjectListObserver.swift in Sources */,
+				B5E84F241AFF84860064E85B /* ListObserver.swift in Sources */,
 				B5E84F2E1AFF849C0064E85B /* AssociatedObjects.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -563,6 +640,11 @@
 			target = 2F03A52F19C5C6DA005002A5 /* CoreStore */;
 			targetProxy = B5D372871A39CF4D00F583D9 /* PBXContainerItemProxy */;
 		};
+		B5D9C9091B20A87D00E64F0E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = GCDKit;
+			targetProxy = B5D9C9081B20A87D00E64F0E /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */

 /* Begin XCBuildConfiguration section */
@@ -587,6 +669,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -661,18 +744,15 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/PhotoSearch-dzwflhandxxuvngptapvysfpcwdx/Build/Products/Debug-iphoneos",
-				);
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "-D DEBUG";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Debug;
 		};
@@ -685,17 +765,14 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/PhotoSearch-dzwflhandxxuvngptapvysfpcwdx/Build/Products/Debug-iphoneos",
-				);
 				INFOPLIST_FILE = CoreStore/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -713,6 +790,7 @@
 				);
 				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 = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -727,6 +805,7 @@
 				);
 				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 = "$(TARGET_NAME)";
 			};
 			name = Release;
--- a/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout
+++ b/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xccheckout
@@ -22,7 +22,7 @@
 		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
 		<string>../..</string>
 		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../..Libraries/GCDKit/</string>
+		<string>../..Libraries/GCDKit</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>github.com:JohnEstropia/CoreStore.git</string>
--- a/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xcscmblueprint
+++ b/CoreStore.xcodeproj/project.xcworkspace/xcshareddata/CoreStore.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "F347F55F-7F5C-4476-9148-6E902F06E4AD",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStoreLibraries\/GCDKit",
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStore",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStore.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/CoreStore.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/GCDKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
+    }
+  ]
+}
--- a/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme
+++ b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0700"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -22,10 +22,10 @@
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
            buildForProfiling = "NO"
            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "2F03A53A19C5C6DA005002A5"
@@ -37,10 +37,10 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
+      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
            skipped = "NO">
@@ -62,15 +62,18 @@
            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"
-      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -85,10 +88,10 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
+      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
      <MacroExpansion>
         <BuildableReference
--- a/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/CoreStore.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CoreStore.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>2F03A52F19C5C6DA005002A5</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>2F03A53A19C5C6DA005002A5</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
--- a/Helpers/NSManagedObject+Convenience.swift
+++ b/Helpers/NSManagedObject+Convenience.swift
@@ -31,6 +31,12 @@ 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
+    */
    public func accessValueForKVCKey(KVCKey: KeyPath) -> AnyObject? {
        
        self.willAccessValueForKey(KVCKey)
@@ -40,10 +46,32 @@ public extension NSManagedObject {
        return primitiveValue
    }
    
+    /**
+    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)
        self.setPrimitiveValue(value, forKey: KVCKey)
        self.didChangeValueForKey(KVCKey)
    }
+    
+    /**
+    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
+    */
+    public func refreshAndMerge() {
+        
+        self.managedObjectContext?.refreshObject(self, mergeChanges: true)
+    }
 }
--- a/Helpers/NSProgress+Convenience.swift
+++ b/Helpers/NSProgress+Convenience.swift
@@ -0,0 +1,132 @@
+//
+//  NSProgress+Convenience.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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 GCDKit
+
+
+// MARK: - NSProgress
+
+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
+    */
+    public func setProgressHandler(closure: ((progress: NSProgress) -> Void)?) {
+        
+        self.progressObserver.progressHandler = closure
+    }
+    
+    
+    // MARK: Private
+    
+    private struct PropertyKeys {
+        
+        static var progressObserver: Void?
+    }
+    
+    private var progressObserver: ProgressObserver {
+        
+        get {
+            
+            let object: ProgressObserver? = getAssociatedObjectForKey(&PropertyKeys.progressObserver, inObject: self)
+            if let observer = object {
+                
+                return observer
+            }
+            
+            let observer = ProgressObserver(self)
+            setAssociatedRetainedObject(
+                observer,
+                forKey: &PropertyKeys.progressObserver,
+                inObject: self
+            )
+            
+            return observer
+        }
+    }
+}
+
+
+@objc private final class ProgressObserver: NSObject {
+    
+    private unowned let progress: NSProgress
+    private var progressHandler: ((progress: NSProgress) -> Void)? {
+        
+        didSet {
+            
+            let progressHandler = self.progressHandler
+            if (progressHandler == nil) == (oldValue == nil) {
+                
+                return
+            }
+            
+            if let _ = progressHandler {
+                
+                self.progress.addObserver(
+                    self,
+                    forKeyPath: "fractionCompleted",
+                    options: [.Initial, .New],
+                    context: nil
+                )
+            }
+            else {
+                
+                self.progress.removeObserver(self, forKeyPath: "fractionCompleted")
+            }
+        }
+    }
+    
+    private init(_ progress: NSProgress) {
+        
+        self.progress = progress
+        super.init()
+    }
+    
+    deinit {
+        
+        if let _ = self.progressHandler {
+            
+            self.progressHandler = nil
+            self.progress.removeObserver(self, forKeyPath: "fractionCompleted")
+        }
+    }
+    
+    override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
+        
+        guard let progress = object as? NSProgress where progress == self.progress && keyPath == "fractionCompleted" else {
+            
+            return
+        }
+        
+        GCDQueue.Main.async { [weak self] () -> Void in
+            
+            self?.progressHandler?(progress: progress)
+        }
+    }
+}
--- a/CoreStore/CoreStore.swift
+++ b/CoreStore/CoreStore.swift
@@ -27,12 +27,6 @@ import CoreData
 import GCDKit


-/**
-Okay, okay. This one's shorter.
-*/
-public typealias HCD = CoreStore
-
-
 // MARK: - CoreStore

 /**
--- a/Querying/BaseDataTransaction+Querying.swift
+++ b/Querying/BaseDataTransaction+Querying.swift
@@ -33,16 +33,97 @@ 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.
+    */
+    public func fetchExisting<T: NSManagedObject>(object: T) -> T? {
+        
+        do {
+            
+            return (try self.context.existingObjectWithID(object.objectID) as! T)
+        }
+        catch _ {
+            
+            return nil
+        }
+    }
+    
+    /**
+    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.
+    */
+    public func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
+        
+        do {
+            
+            return (try self.context.existingObjectWithID(objectID) as! T)
+        }
+        catch _ {
+            
+            return nil
+        }
+    }
+    
+    /**
+    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
+    */
+    public func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+        
+        var existingObjects = [T]()
+        for object in objects {
+            
+            do {
+                
+                let existingObject = try self.context.existingObjectWithID(object.objectID) as! T
+                existingObjects.append(existingObject)
+            }
+            catch _ { }
+        }
+        return existingObjects
+    }
+    
+    /**
+    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
+    */
+    public func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+        
+        var existingObjects = [T]()
+        for objectID in objectIDs {
+            
+            do {
+                
+                let existingObject = try self.context.existingObjectWithID(objectID) as! T
+                existingObjects.append(existingObject)
+            }
+            catch _ { }
+        }
+        return existingObjects
+    }
+    
    /**
    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchOne(from, fetchClauses)
    }
@@ -50,13 +131,16 @@ public extension BaseDataTransaction {
    /**
    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchOne(from, fetchClauses)
    }
@@ -64,13 +148,16 @@ public extension BaseDataTransaction {
    /**
    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchAll(from, fetchClauses)
    }
@@ -78,41 +165,50 @@ public extension BaseDataTransaction {
    /**
    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchAll(from, fetchClauses)
    }
    
    /**
-    Fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchCount(from, fetchClauses)
    }
    
    /**
-    Fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchCount(from, fetchClauses)
    }
@@ -120,13 +216,16 @@ public extension BaseDataTransaction {
    /**
    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchObjectID(from, fetchClauses)
    }
@@ -134,137 +233,164 @@ public extension BaseDataTransaction {
    /**
    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchObjectID(from, fetchClauses)
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to fetch from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to fetch from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
-    Deletes all `NSManagedObject`'s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: deleteClauses a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: the number of `NSManagedObject`'s deleted
+    - 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(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to delete from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.deleteAll(from, deleteClauses)
    }
    
    /**
-    Deletes all `NSManagedObject`'s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Deletes all `NSManagedObject`s that satisfy the specified `DeleteClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: deleteClauses a series of `DeleteClause` instances for the delete request. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: the number of `NSManagedObject`'s deleted
+    - 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(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to delete from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.deleteAll(from, deleteClauses)
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`'s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to query from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.queryValue(from, selectClause, queryClauses)
    }
    
    /**
-    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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to query from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.queryValue(from, selectClause, queryClauses)
    }
    
    /**
-    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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to query from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.queryAttributes(from, selectClause, queryClauses)
    }
    
    /**
-    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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to query from a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to query from a \(typeName(self)) outside its designated queue."
+        )
        
        return self.context.queryAttributes(from, selectClause, queryClauses)
    }
--- a/Clauses/From.swift
+++ b/Clauses/From.swift
@@ -38,72 +38,110 @@ public struct From<T: NSManagedObject> {
    
    public init(){
        
+        self.entityClass = T.self
        self.findPersistentStores = { _ in nil }
    }
    
    public init(_ entity: T.Type) {
        
+        self.entityClass = entity
        self.findPersistentStores = { _ in nil }
    }
    
-    public init(_ configurations: String...) {
+    public init(_ entityClass: AnyClass) {
        
-        self.init(configurations: configurations)
+        self.entityClass = entityClass
+        self.findPersistentStores = { _ in nil }
    }
    
-    public init(_ configurations: [String]) {
+    public init(_ configurations: String?...) {
        
-        self.init(configurations: configurations)
+        self.init(entityClass: T.self, configurations: configurations)
    }
    
-    public init(_ entity: T.Type, _ configurations: String...) {
+    public init(_ configurations: [String?]) {
        
-        self.init(configurations: configurations)
+        self.init(entityClass: T.self, configurations: configurations)
    }
    
-    public init(_ entity: T.Type, _ configurations: [String]) {
+    public init(_ entity: T.Type, _ configurations: String?...) {
        
-        self.init(configurations: configurations)
+        self.init(entityClass: entity, configurations: configurations)
+    }
+    
+    public init(_ entity: T.Type, _ configurations: [String?]) {
+        
+        self.init(entityClass: entity, configurations: configurations)
+    }
+    
+    public init(_ entityClass: AnyClass, _ configurations: String?...) {
+        
+        self.init(entityClass: entityClass, configurations: configurations)
+    }
+    
+    public init(_ entityClass: AnyClass, _ configurations: [String?]) {
+        
+        self.init(entityClass: entityClass, configurations: configurations)
    }
    
    public init(_ storeURLs: NSURL...) {
        
-        self.init(storeURLs: storeURLs)
+        self.init(entityClass: T.self, storeURLs: storeURLs)
    }
    
    public init(_ storeURLs: [NSURL]) {
        
-        self.init(storeURLs: storeURLs)
+        self.init(entityClass: T.self, storeURLs: storeURLs)
    }
    
    public init(_ entity: T.Type, _ storeURLs: NSURL...) {
        
-        self.init(storeURLs: storeURLs)
+        self.init(entityClass: entity, storeURLs: storeURLs)
    }
    
    public init(_ entity: T.Type, _ storeURLs: [NSURL]) {
        
-        self.init(storeURLs: storeURLs)
+        self.init(entityClass: entity, storeURLs: storeURLs)
+    }
+    
+    public init(_ entityClass: AnyClass, _ storeURLs: NSURL...) {
+        
+        self.init(entityClass: entityClass, storeURLs: storeURLs)
+    }
+    
+    public init(_ entityClass: AnyClass, _ storeURLs: [NSURL]) {
+        
+        self.init(entityClass: entityClass, storeURLs: storeURLs)
    }
    
    public init(_ persistentStores: NSPersistentStore...) {
        
-        self.init(persistentStores: persistentStores)
+        self.init(entityClass: T.self, persistentStores: persistentStores)
    }
    
    public init(_ persistentStores: [NSPersistentStore]) {
        
-        self.init(persistentStores: persistentStores)
+        self.init(entityClass: T.self, persistentStores: persistentStores)
    }
    
    public init(_ entity: T.Type, _ persistentStores: NSPersistentStore...) {
        
-        self.init(persistentStores: persistentStores)
+        self.init(entityClass: entity, persistentStores: persistentStores)
    }
    
    public init(_ entity: T.Type, _ persistentStores: [NSPersistentStore]) {
        
-        self.init(persistentStores: persistentStores)
+        self.init(entityClass: entity, persistentStores: persistentStores)
+    }
+    
+    public init(_ entityClass: AnyClass, _ persistentStores: NSPersistentStore...) {
+        
+        self.init(entityClass: entityClass, persistentStores: persistentStores)
+    }
+    
+    public init(_ entityClass: AnyClass, _ persistentStores: [NSPersistentStore]) {
+        
+        self.init(entityClass: entityClass, persistentStores: persistentStores)
    }
    
    
@@ -111,45 +149,50 @@ public struct From<T: NSManagedObject> {
    
    internal func applyToFetchRequest(fetchRequest: NSFetchRequest, context: NSManagedObjectContext) {
        
-        fetchRequest.entity = context.entityDescriptionForEntityClass(T.self)
+        fetchRequest.entity = context.entityDescriptionForEntityClass(self.entityClass)
        fetchRequest.affectedStores = self.findPersistentStores(context: context)
    }
    
    
    // MARK: Private
    
+    private let entityClass: AnyClass
+    
    private let findPersistentStores: (context: NSManagedObjectContext) -> [NSPersistentStore]?
    
-    private init(configurations: [String]) {
+    private init(entityClass: AnyClass, configurations: [String?]) {
        
-        let configurationsSet = Set(configurations)
+        let configurationsSet = Set(configurations.map { $0 ?? Into.defaultConfigurationName })
+        self.entityClass = entityClass
        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
            
-            return context.parentStack?.persistentStoresForEntityClass(T.self)?.filter {
+            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
                
                return configurationsSet.contains($0.configurationName)
            }
        }
    }
    
-    private init(storeURLs: [NSURL]) {
+    private init(entityClass: AnyClass, storeURLs: [NSURL]) {
        
        let storeURLsSet = Set(storeURLs)
+        self.entityClass = entityClass
        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
            
-            return context.parentStack?.persistentStoresForEntityClass(T.self)?.filter {
+            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
                
                return $0.URL != nil && storeURLsSet.contains($0.URL!)
            }
        }
    }
    
-    private init(persistentStores: [NSPersistentStore]) {
+    private init(entityClass: AnyClass, persistentStores: [NSPersistentStore]) {
        
        let persistentStores = Set(persistentStores)
+        self.entityClass = entityClass
        self.findPersistentStores = { (context: NSManagedObjectContext) -> [NSPersistentStore]? in
            
-            return context.parentStack?.persistentStoresForEntityClass(T.self)?.filter {
+            return context.parentStack?.persistentStoresForEntityClass(entityClass)?.filter {
                
                return persistentStores.contains($0)
            }
--- a/Clauses/GroupBy.swift
+++ b/Clauses/GroupBy.swift
@@ -39,7 +39,7 @@ public struct GroupBy: QueryClause {
    /**
    Initializes a `GroupBy` clause with a list of key path strings
    
-    :param: keyPaths a list of key path strings to group results with
+    - parameter keyPaths: a list of key path strings to group results with
    */
    public init(_ keyPaths: [KeyPath]) {
        
@@ -57,8 +57,8 @@ public struct GroupBy: QueryClause {
    /**
    Initializes a `GroupBy` clause with a list of key path strings
    
-    :param: keyPath a key path string to group results with
-    :param: keyPaths a series of key path strings to group results with
+    - 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...) {
        
@@ -74,7 +74,10 @@ public struct GroupBy: QueryClause {
        
        if fetchRequest.propertiesToGroupBy != nil {
            
-            CoreStore.log(.Warning, message: "An existing \"propertiesToGroupBy\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.")
+            CoreStore.log(
+                .Warning,
+                message: "An existing \"propertiesToGroupBy\" for the \(typeName(NSFetchRequest)) was overwritten by \(typeName(self)) query clause."
+            )
        }
        
        fetchRequest.propertiesToGroupBy = self.keyPaths
--- a/Clauses/OrderBy.swift
+++ b/Clauses/OrderBy.swift
@@ -31,6 +31,11 @@ public func +(left: OrderBy, right: OrderBy) -> OrderBy {
    return OrderBy(left.sortDescriptors + right.sortDescriptors)
 }

+public func +=(inout left: OrderBy, right: OrderBy) {
+    
+    left = left + right
+}
+

 // MARK: - KeyPath
    
@@ -68,7 +73,7 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `OrderBy` clause with a list of sort descriptors
    
-    :param: sortDescriptors a series of `NSSortDescriptor`'s
+    - parameter sortDescriptors: a series of `NSSortDescriptor`s
    */
    public init(_ sortDescriptors: [NSSortDescriptor]) {
        
@@ -86,7 +91,7 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `OrderBy` clause with a single sort descriptor
    
-    :param: sortDescriptor a `NSSortDescriptor`
+    - parameter sortDescriptor: a `NSSortDescriptor`
    */
    public init(_ sortDescriptor: NSSortDescriptor) {
        
@@ -94,16 +99,16 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    }
    
    /**
-    Initializes a `OrderBy` clause with a series of `SortKey`'s
+    Initializes a `OrderBy` clause with a series of `SortKey`s
    
-    :param: sortKey a series of `SortKey`'s
+    - parameter sortKey: a series of `SortKey`s
    */
    public init(_ sortKey: [SortKey]) {
        
        self.init(
-            sortKey.map { SortKey -> NSSortDescriptor in
+            sortKey.map { sortKey -> NSSortDescriptor in
                
-                switch SortKey {
+                switch sortKey {
                    
                case .Ascending(let keyPath):
                    return NSSortDescriptor(key: keyPath, ascending: true)
@@ -116,10 +121,10 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
    }
    
    /**
-    Initializes a `OrderBy` clause with a series of `SortKey`'s
+    Initializes a `OrderBy` clause with a series of `SortKey`s
    
-    :param: sortKey a single `SortKey`
-    :param: sortKeys a series of `SortKey`'s
+    - parameter sortKey: a single `SortKey`
+    - parameter sortKeys: a series of `SortKey`s
    */
    public init(_ sortKey: SortKey, _ sortKeys: SortKey...) {
        
@@ -135,7 +140,10 @@ public struct OrderBy: FetchClause, QueryClause, DeleteClause {
        
        if fetchRequest.sortDescriptors != nil {
            
-            CoreStore.log(.Warning, message: "Existing sortDescriptors for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.")
+            CoreStore.log(
+                .Warning,
+                message: "Existing sortDescriptors for the \(typeName(NSFetchRequest)) was overwritten by \(typeName(self)) query clause."
+            )
        }
        
        fetchRequest.sortDescriptors = self.sortDescriptors
--- a/Clauses/Select.swift
+++ b/Clauses/Select.swift
@@ -83,8 +83,8 @@ public enum SelectTerm: StringLiteralConvertible {
            Where("employeeID", isEqualTo: 1111)
        )
    
-    :param: keyPath the attribute name
-    :returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
+    - parameter keyPath: the attribute name
+    - returns: a `SelectTerm` to a `Select` clause for querying an entity attribute
    */
    public static func Attribute(keyPath: KeyPath) -> SelectTerm {
        
@@ -99,16 +99,17 @@ public enum SelectTerm: StringLiteralConvertible {
            Select<Int>(.Average("age"))
        )
    
-    :param: keyPath the attribute name
-    :param: 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
+    - 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(
            function: "average:",
            keyPath,
-            As: alias ?? "average(\(keyPath))"
+            As: alias ?? "average(\(keyPath))",
+            nativeType: .DecimalAttributeType
        )
    }
    
@@ -120,16 +121,17 @@ public enum SelectTerm: StringLiteralConvertible {
            Select<Int>(.Count("employeeID"))
        )
    
-    :param: keyPath the attribute name
-    :param: 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
+    - 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(
            function: "count:",
            keyPath,
-            As: alias ?? "count(\(keyPath))"
+            As: alias ?? "count(\(keyPath))",
+            nativeType: .Integer64AttributeType
        )
    }
    
@@ -141,37 +143,17 @@ public enum SelectTerm: StringLiteralConvertible {
            Select<Int>(.Maximum("age"))
        )
    
-    :param: keyPath the attribute name
-    :param: 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
+    - 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(
            function: "max:",
            keyPath,
-            As: alias ?? "max(\(keyPath))"
-        )
-    }
-    
-    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the median value for an attribute.
-    
-        let medianAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.Median("age"))
-        )
-    
-    :param: keyPath the attribute name
-    :param: 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 median value for an attribute
-    */
-    public static func Median(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
-        
-        return ._Aggregate(
-            function: "median:",
-            keyPath, As:
-            alias ?? "median(\(keyPath))"
+            As: alias ?? "max(\(keyPath))",
+            nativeType: .UndefinedAttributeType
        )
    }
    
@@ -180,40 +162,20 @@ public enum SelectTerm: StringLiteralConvertible {
    
        let minimumAge = CoreStore.queryValue(
            From(MyPersonEntity),
-            Select<Int>(.Median("age"))
+            Select<Int>(.Minimum("age"))
        )
    
-    :param: keyPath the attribute name
-    :param: 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
+    - 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(
            function: "min:",
            keyPath,
-            As: alias ?? "min(\(keyPath))"
-        )
-    }
-    
-    /**
-    Provides a `SelectTerm` to a `Select` clause for querying the standard deviation value for an attribute.
-    
-        let stddevAge = CoreStore.queryValue(
-            From(MyPersonEntity),
-            Select<Int>(.StandardDeviation("age"))
-        )
-    
-    :param: keyPath the attribute name
-    :param: 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 "stddev(<attributeName>)" is used
-    :returns: a `SelectTerm` to a `Select` clause for querying the standard deviation value for an attribute
-    */
-    public static func StandardDeviation(keyPath: KeyPath, As alias: KeyPath? = nil) -> SelectTerm {
-        
-        return ._Aggregate(
-            function: "stddev:",
-            keyPath,
-            As: alias ?? "stddev(\(keyPath))"
+            As: alias ?? "min(\(keyPath))",
+            nativeType: .UndefinedAttributeType
        )
    }
    
@@ -225,16 +187,17 @@ public enum SelectTerm: StringLiteralConvertible {
            Select<Int>(.Sum("age"))
        )
    
-    :param: keyPath the attribute name
-    :param: 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
+    - 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(
            function: "sum:",
            keyPath,
-            As: alias ?? "sum(\(keyPath))"
+            As: alias ?? "sum(\(keyPath))",
+            nativeType: .DecimalAttributeType
        )
    }
    
@@ -260,7 +223,7 @@ public enum SelectTerm: StringLiteralConvertible {
    // MARK: Internal
    
    case _Attribute(KeyPath)
-    case _Aggregate(function: String, KeyPath, As: String)
+    case _Aggregate(function: String, KeyPath, As: String, nativeType: NSAttributeType)
 }


@@ -304,7 +267,7 @@ Valid return types depend on the query:
 - for `queryAttributes(...)` methods:
    - `NSDictionary`

-:param: sortDescriptors a series of `NSSortDescriptor`'s
+- parameter sortDescriptors: a series of `NSSortDescriptor`s
 */
 public struct Select<T: SelectResultType> {
    
@@ -316,10 +279,10 @@ public struct Select<T: SelectResultType> {
    public typealias ReturnType = T
    
    /**
-    Initializes a `Select` clause with a list of `SelectTerm`'s
+    Initializes a `Select` clause with a list of `SelectTerm`s
    
-    :param: selectTerm a `SelectTerm`
-    :param: selectTerms a series of `SelectTerm`'s
+    - parameter selectTerm: a `SelectTerm`
+    - parameter selectTerms: a series of `SelectTerm`s
    */
    public init(_ selectTerm: SelectTerm, _ selectTerms: SelectTerm...) {
        
@@ -333,7 +296,10 @@ public struct Select<T: SelectResultType> {
        
        if fetchRequest.propertiesToFetch != nil {
            
-            CoreStore.log(.Warning, message: "An existing \"propertiesToFetch\" for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.")
+            CoreStore.log(
+                .Warning,
+                message: "An existing \"propertiesToFetch\" for the \(typeName(NSFetchRequest)) was overwritten by \(typeName(self)) query clause."
+            )
        }
        
        fetchRequest.includesPendingChanges = false
@@ -349,21 +315,31 @@ public struct Select<T: SelectResultType> {
            switch term {
                
            case ._Attribute(let keyPath):
-                if let propertyDescription = propertiesByName[keyPath] as? NSPropertyDescription {
+                if let propertyDescription = propertiesByName[keyPath] {
                    
                    propertiesToFetch.append(propertyDescription)
                }
                else {
                    
-                    CoreStore.log(.Warning, message: "The property \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.")
+                    CoreStore.log(
+                        .Warning,
+                        message: "The property \"\(keyPath)\" does not exist in entity \(typeName(entityDescription.managedObjectClassName)) and will be ignored by \(typeName(self)) query clause."
+                    )
                }
                
-            case ._Aggregate(let function, let keyPath, let alias):
-                if let attributeDescription = attributesByName[keyPath] as? NSAttributeDescription {
+            case ._Aggregate(let function, let keyPath, let alias, let nativeType):
+                if let attributeDescription = attributesByName[keyPath] {
                    
                    let expressionDescription = NSExpressionDescription()
                    expressionDescription.name = alias
-                    expressionDescription.expressionResultType = attributeDescription.attributeType
+                    if nativeType == .UndefinedAttributeType {
+                        
+                        expressionDescription.expressionResultType = attributeDescription.attributeType
+                    }
+                    else {
+                        
+                        expressionDescription.expressionResultType = nativeType
+                    }
                    expressionDescription.expression = NSExpression(
                        forFunction: function,
                        arguments: [NSExpression(forKeyPath: keyPath)]
@@ -373,7 +349,10 @@ public struct Select<T: SelectResultType> {
                }
                else {
                    
-                    CoreStore.log(.Warning, message: "The attribute \"\(keyPath)\" does not exist in entity <\(entityDescription.managedObjectClassName)> and will be ignored by \(typeName(self)) query clause.")
+                    CoreStore.log(
+                        .Warning,
+                        message: "The attribute \"\(keyPath)\" does not exist in entity \(typeName(entityDescription.managedObjectClassName)) and will be ignored by \(typeName(self)) query clause."
+                    )
                }
            }
        }
@@ -388,7 +367,7 @@ public struct Select<T: SelectResultType> {
        case ._Attribute(let keyPath):
            return keyPath
            
-        case ._Aggregate(_, _, let alias):
+        case ._Aggregate(_, _, let alias, _):
            return alias
        }
    }
@@ -602,7 +581,7 @@ extension NSString: SelectValueResultType {

 // MARK: - NSDecimalNumber: SelectValueResultType

-extension NSDecimalNumber: SelectValueResultType {
+extension NSDecimalNumber {
    
    public override class var attributeType: NSAttributeType {
        
--- a/Clauses/Tweak.swift
+++ b/Clauses/Tweak.swift
@@ -49,7 +49,7 @@ public struct Tweak: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Tweak` clause with a closure where the `NSFetchRequest` may be configured.
    
-    :param: customization a list of key path strings to group results with
+    - parameter customization: a list of key path strings to group results with
    */
    public init(_ customization: (fetchRequest: NSFetchRequest) -> Void) {
        
--- a/Clauses/Where.swift
+++ b/Clauses/Where.swift
@@ -54,7 +54,7 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Where` clause with an `NSPredicate`
    
-    :param: predicate the `NSPredicate` for the fetch or query
+    - parameter predicate: the `NSPredicate` for the fetch or query
    */
    public init(_ predicate: NSPredicate) {
        
@@ -72,7 +72,7 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Where` clause with a predicate that always evaluates to the specified boolean value
    
-    :param: value the boolean value for the predicate
+    - parameter value: the boolean value for the predicate
    */
    public init(_ value: Bool) {
        
@@ -82,8 +82,8 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Where` clause with a predicate using the specified string format and arguments
    
-    :param: format the format string for the predicate
-    :param: args the arguments for `format`
+    - parameter format: the format string for the predicate
+    - parameter args: the arguments for `format`
    */
    public init(_ format: String, _ args: NSObject...) {
        
@@ -93,8 +93,8 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Where` clause with a predicate using the specified string format and arguments
    
-    :param: format the format string for the predicate
-    :param: argumentArray the arguments for `format`
+    - parameter format: the format string for the predicate
+    - parameter argumentArray: the arguments for `format`
    */
    public init(_ format: String, argumentArray: [NSObject]?) {
        
@@ -104,8 +104,8 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
    /**
    Initializes a `Where` clause with a predicate using the specified string format and arguments
    
-    :param: format the format string for the predicate
-    :param: argumentArray the arguments for `format`
+    - parameter format: the format string for the predicate
+    - parameter argumentArray: the arguments for `format`
    */
    public init(_ keyPath: KeyPath, isEqualTo value: NSObject?) {
        
@@ -123,7 +123,10 @@ public struct Where: FetchClause, QueryClause, DeleteClause {
        
        if fetchRequest.predicate != nil {
            
-            CoreStore.log(.Warning, message: "An existing predicate for the <\(NSFetchRequest.self)> was overwritten by \(typeName(self)) query clause.")
+            CoreStore.log(
+                .Warning,
+                message: "An existing predicate for the \(typeName(NSFetchRequest)) was overwritten by \(typeName(self)) query clause."
+            )
        }
        
        fetchRequest.predicate = self.predicate
--- a/Querying/CoreStore+Querying.swift
+++ b/Querying/CoreStore+Querying.swift
@@ -31,12 +31,56 @@ 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.
+    */
+    public static func fetchExisting<T: NSManagedObject>(object: T) -> T? {
+        
+        return self.defaultStack.fetchExisting(object)
+    }
+    
+    /**
+    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.
+    */
+    public static func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
+        
+        return self.defaultStack.fetchExisting(objectID)
+    }
+    
+    /**
+    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`
+    */
+    public static func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+        
+        return self.defaultStack.fetchExisting(objects)
+    }
+    
+    /**
+    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`
+    */
+    public static func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+        
+        return self.defaultStack.fetchExisting(objectIDs)
+    }
+    
    /**
    Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
@@ -46,9 +90,9 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
@@ -58,9 +102,9 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
@@ -70,9 +114,9 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
@@ -80,11 +124,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
@@ -92,11 +136,11 @@ public extension CoreStore {
    }
    
    /**
-    Using the `defaultStack`, fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Using the `defaultStack`, fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
@@ -106,9 +150,9 @@ 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
@@ -118,9 +162,9 @@ 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
@@ -128,11 +172,11 @@ 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.
+    Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
@@ -140,11 +184,11 @@ 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.
+    Using the `defaultStack`, fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public static func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
@@ -152,14 +196,14 @@ 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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public static func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
@@ -167,14 +211,14 @@ 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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public static func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
@@ -182,14 +226,14 @@ 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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public static func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
@@ -197,14 +241,14 @@ 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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    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
@@ -34,16 +34,97 @@ 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.
+    */
+    public func fetchExisting<T: NSManagedObject>(object: T) -> T? {
+        
+        do {
+            
+            return (try self.mainContext.existingObjectWithID(object.objectID) as! T)
+        }
+        catch _ {
+            
+            return nil
+        }
+    }
+    
+    /**
+    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.
+    */
+    public func fetchExisting<T: NSManagedObject>(objectID: NSManagedObjectID) -> T? {
+        
+        do {
+            
+            return (try self.mainContext.existingObjectWithID(objectID) as! T)
+        }
+        catch _ {
+            
+            return nil
+        }
+    }
+    
+    /**
+    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`
+    */
+    public func fetchExisting<T: NSManagedObject>(objects: [T]) -> [T] {
+        
+        var existingObjects = [T]()
+        for object in objects {
+            
+            do {
+                
+                let existingObject = try self.mainContext.existingObjectWithID(object.objectID) as! T
+                existingObjects.append(existingObject)
+            }
+            catch _ { }
+        }
+        return existingObjects
+    }
+    
+    /**
+    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`
+    */
+    public func fetchExisting<T: NSManagedObject>(objectIDs: [NSManagedObjectID]) -> [T] {
+        
+        var existingObjects = [T]()
+        for objectID in objectIDs {
+            
+            do {
+                
+                let existingObject = try self.mainContext.existingObjectWithID(objectID) as! T
+                existingObjects.append(existingObject)
+            }
+            catch _ { }
+        }
+        return existingObjects
+    }
+    
    /**
    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> T? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchOne(from, fetchClauses)
    }
@@ -51,13 +132,16 @@ public extension DataStack {
    /**
    Fetches the first `NSManagedObject` instance that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchOne<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> T? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchOne(from, fetchClauses)
    }
@@ -65,13 +149,16 @@ public extension DataStack {
    /**
    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [T]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchAll(from, fetchClauses)
    }
@@ -79,41 +166,50 @@ public extension DataStack {
    /**
    Fetches all `NSManagedObject` instances that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchAll<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [T]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchAll(from, fetchClauses)
    }
    
    /**
-    Fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> Int? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchCount(from, fetchClauses)
    }
    
    /**
-    Fetches the number of `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the number of `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchCount<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> Int? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchCount(from, fetchClauses)
    }
@@ -121,13 +217,16 @@ public extension DataStack {
    /**
    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> NSManagedObjectID? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchObjectID(from, fetchClauses)
    }
@@ -135,109 +234,130 @@ public extension DataStack {
    /**
    Fetches the `NSManagedObjectID` for the first `NSManagedObject` that satisfies the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectID<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> NSManagedObjectID? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchObjectID(from, fetchClauses)
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> [NSManagedObjectID]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
-    Fetches the `NSManagedObjectID` for all `NSManagedObject`'s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
+    Fetches the `NSManagedObjectID` for all `NSManagedObject`s that satisfy the specified `FetchClause`s. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
    
-    :param: from a `From` clause indicating the entity type
-    :param: 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
+    - 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
    */
    public func fetchObjectIDs<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> [NSManagedObjectID]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to fetch from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to fetch from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.fetchObjectIDs(from, fetchClauses)
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`'s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: QueryClause...) -> U? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to query from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.queryValue(from, selectClause, queryClauses)
    }
    
    /**
-    Queries aggregate values as specified by the `QueryClause`'s. Requires at least a `Select` clause, and optional `Where`, `OrderBy`, `GroupBy`, and `Tweak` clauses.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryValue<T: NSManagedObject, U: SelectValueResultType>(from: From<T>, _ selectClause: Select<U>, _ queryClauses: [QueryClause]) -> U? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to query from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.queryValue(from, selectClause, queryClauses)
    }
    
    /**
-    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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: QueryClause...) -> [[NSString: AnyObject]]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to query from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.queryAttributes(from, selectClause, queryClauses)
    }
    
    /**
-    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.
+    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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: selectClause a `Select<U>` clause indicating the properties to fetch, and with the generic type indicating the return type.
-    :param: 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.
+    - 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.
    */
    public func queryAttributes<T: NSManagedObject>(from: From<T>, _ selectClause: Select<NSDictionary>, _ queryClauses: [QueryClause]) -> [[NSString: AnyObject]]? {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to query from a \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to query from a \(typeName(self)) outside the main thread."
+        )
        
        return self.mainContext.queryAttributes(from, selectClause, queryClauses)
    }
--- a/Data/BaseDataTransaction+Importing.swift
+++ b/Data/BaseDataTransaction+Importing.swift
@@ -0,0 +1,289 @@
+//
+//  BaseDataTransaction+Importing.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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
+
+
+public protocol ImportableObject: class {
+    
+    typealias ImportSource
+    
+    static func shouldImportFromSource(source: ImportSource) -> Bool
+    
+    func didInsertFromImportSource(source: ImportSource) throws
+    
+    func updateFromImportSource(source: ImportSource) throws
+}
+
+public extension ImportableObject {
+    
+    static func shouldImportFromSource(source: ImportSource) -> Bool {
+        
+        return true
+    }
+}
+
+
+public protocol ImportableUniqueObject: ImportableObject {
+    
+    typealias UniqueIDType: NSObject
+    
+    static var uniqueIDKeyPath: String { get }
+    
+    var uniqueIDValue: UniqueIDType { get set }
+    
+    static func uniqueIDFromImportSource(source: ImportSource) throws -> UniqueIDType
+}
+
+
+public extension BaseDataTransaction {
+    
+    func importObject<T where T: NSManagedObject, T: ImportableObject>(
+        into: Into<T>,
+        source: T.ImportSource) throws -> T? {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            return try autoreleasepool {
+                
+                if !T.shouldImportFromSource(source) {
+                    
+                    return nil
+                }
+                
+                let object = self.create(into)
+                try object.didInsertFromImportSource(source)
+                return object
+            }
+    }
+    
+    func importObjects<T where T: NSManagedObject, T: ImportableObject>(
+        into: Into<T>,
+        sourceArray: [T.ImportSource]) throws {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            try autoreleasepool {
+                
+                for source in sourceArray {
+                    
+                    try autoreleasepool {
+                        
+                        let object = self.create(into)
+                        try object.didInsertFromImportSource(source)
+                    }
+                }
+            }
+    }
+    
+    func importObjects<T where T: NSManagedObject, T: ImportableObject>(
+        into: Into<T>,
+        sourceArray: [T.ImportSource],
+        postProcess: (sorted: [T]) -> Void) throws {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            try autoreleasepool {
+                
+                var objects = [T]()
+                for source in sourceArray {
+                    
+                    try autoreleasepool {
+                        
+                        let object = self.create(into)
+                        try object.didInsertFromImportSource(source)
+                        
+                        objects.append(object)
+                    }
+                }
+                postProcess(sorted: objects)
+            }
+    }
+    
+    func importUniqueObject<T where T: NSManagedObject, T: ImportableUniqueObject>(
+        into: Into<T>,
+        source: T.ImportSource) throws -> T?  {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            return try autoreleasepool {
+                
+                if !T.shouldImportFromSource(source) {
+                    
+                    return nil
+                }
+                
+                let uniqueIDKeyPath = T.uniqueIDKeyPath
+                let uniqueIDValue = try T.uniqueIDFromImportSource(source)
+                
+                if let object = self.fetchOne(From(T), Where(uniqueIDKeyPath, isEqualTo: uniqueIDValue)) {
+                    
+                    try object.updateFromImportSource(source)
+                    return object
+                }
+                else {
+                    
+                    let object = self.create(into)
+                    object.uniqueIDValue = uniqueIDValue
+                    try object.didInsertFromImportSource(source)
+                    return object
+                }
+            }
+    }
+    
+    func importUniqueObjects<T where T: NSManagedObject, T: ImportableUniqueObject>(
+        into: Into<T>,
+        sourceArray: [T.ImportSource],
+        preProcess: ((mapping: [T.UniqueIDType: T.ImportSource]) throws -> Void)? = nil) throws {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            try autoreleasepool {
+                
+                var mapping = Dictionary<T.UniqueIDType, T.ImportSource>()
+                for source in sourceArray {
+                    
+                    try autoreleasepool {
+                        
+                        if !T.shouldImportFromSource(source) {
+                            
+                            return
+                        }
+                        
+                        let uniqueIDValue = try T.uniqueIDFromImportSource(source)
+                        mapping[uniqueIDValue] = source
+                    }
+                }
+                
+                if let preProcess = preProcess {
+                    
+                    try autoreleasepool {
+                        
+                        try preProcess(mapping: mapping)
+                    }
+                }
+                
+                for object in self.fetchAll(From(T), Where("%K IN %@", T.uniqueIDKeyPath, mapping.keys.array)) ?? [] {
+                    
+                    try autoreleasepool {
+                        
+                        let uniqueIDValue = object.uniqueIDValue
+                        try object.updateFromImportSource(mapping.removeValueForKey(uniqueIDValue)!)
+                    }
+                }
+                
+                for (uniqueIDValue, source) in mapping {
+                    
+                    try autoreleasepool {
+                        
+                        let object = self.create(into)
+                        object.uniqueIDValue = uniqueIDValue
+                        try object.didInsertFromImportSource(source)
+                    }
+                }
+            }
+    }
+    
+    func importUniqueObjects<T where T: NSManagedObject, T: ImportableUniqueObject>(
+        into: Into<T>,
+        sourceArray: [T.ImportSource],
+        preProcess: ((mapping: [T.UniqueIDType: T.ImportSource]) throws -> Void)? = nil,
+        postProcess: (sorted: [T]) -> Void) throws {
+            
+            CoreStore.assert(
+                self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+                "Attempted to import an object of type \(typeName(into.entityClass)) outside the transaction's designated queue."
+            )
+            
+            try autoreleasepool {
+                
+                var sortedIDs = Array<T.UniqueIDType>()
+                var mapping = Dictionary<T.UniqueIDType, T.ImportSource>()
+                for source in sourceArray {
+                    
+                    try autoreleasepool {
+                        
+                        if !T.shouldImportFromSource(source) {
+                            
+                            return
+                        }
+
+                        let uniqueIDValue = try T.uniqueIDFromImportSource(source)
+                        mapping[uniqueIDValue] = source
+                        sortedIDs.append(uniqueIDValue)
+                    }
+                }
+                
+                if let preProcess = preProcess {
+                    
+                    try autoreleasepool {
+                        
+                        try preProcess(mapping: mapping)
+                    }
+                }
+                
+                var objects = Dictionary<T.UniqueIDType, T>()
+                for object in self.fetchAll(From(T), Where("%K IN %@", T.uniqueIDKeyPath, mapping.keys.array)) ?? [] {
+                    
+                    try autoreleasepool {
+                        
+                        let uniqueIDValue = object.uniqueIDValue
+                        try object.updateFromImportSource(mapping.removeValueForKey(uniqueIDValue)!)
+                        objects[uniqueIDValue] = object
+                    }
+                }
+                
+                for (uniqueIDValue, source) in mapping {
+                    
+                    try autoreleasepool {
+                        
+                        let object = self.create(into)
+                        object.uniqueIDValue = uniqueIDValue
+                        try object.didInsertFromImportSource(source)
+                        
+                        objects[uniqueIDValue] = object
+                    }
+                }
+                
+                postProcess(sorted: sortedIDs.flatMap { objects[$0] })
+            }
+    }
+}
--- a/CoreStore/Info.plist
+++ b/CoreStore/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.johnestropia.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
--- a/CoreStore/Internal/AssociatedObjects.swift
+++ b/CoreStore/Internal/AssociatedObjects.swift
@@ -42,27 +42,27 @@ internal func getAssociatedObjectForKey<T: AnyObject>(key: UnsafePointer<Void>,

 internal func setAssociatedRetainedObject<T: AnyObject>(associatedObject: T?, forKey key: UnsafePointer<Void>, inObject object: AnyObject) {
    
-    objc_setAssociatedObject(object, key, associatedObject, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+    objc_setAssociatedObject(object, key, associatedObject, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
 }

 internal func setAssociatedCopiedObject<T: AnyObject>(associatedObject: T?, forKey key: UnsafePointer<Void>, inObject object: AnyObject) {
    
-    objc_setAssociatedObject(object, key, associatedObject, UInt(OBJC_ASSOCIATION_COPY_NONATOMIC))
+    objc_setAssociatedObject(object, key, associatedObject, .OBJC_ASSOCIATION_COPY_NONATOMIC)
 }

 internal func setAssociatedAssignedObject<T: AnyObject>(associatedObject: T?, forKey key: UnsafePointer<Void>, inObject object: AnyObject) {
    
-    objc_setAssociatedObject(object, key, associatedObject, UInt(OBJC_ASSOCIATION_ASSIGN))
+    objc_setAssociatedObject(object, key, associatedObject, .OBJC_ASSOCIATION_ASSIGN)
 }

 internal func setAssociatedWeakObject<T: AnyObject>(associatedObject: T?, forKey key: UnsafePointer<Void>, inObject object: AnyObject) {
    
    if let associatedObject = associatedObject {
        
-        objc_setAssociatedObject(object, key, WeakObject(associatedObject), UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+        objc_setAssociatedObject(object, key, WeakObject(associatedObject), .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
    }
    else {
        
-        objc_setAssociatedObject(object, key, nil, UInt(OBJC_ASSOCIATION_RETAIN_NONATOMIC))
+        objc_setAssociatedObject(object, key, nil, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
    }
 }
--- a/CoreStore/Internal/Functions.swift
+++ b/CoreStore/Internal/Functions.swift
@@ -0,0 +1,81 @@
+//
+//  Functions.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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
+
+internal func autoreleasepool<T>(@noescape closure: () -> T?) -> T? {
+    
+    var closureValue: T?
+    ObjectiveC.autoreleasepool {
+        
+        closureValue = closure()
+    }
+    
+    return closureValue
+}
+
+internal func autoreleasepool<T>(@noescape closure: () throws -> T?) throws -> T? {
+    
+    var closureValue: T?
+    var closureError: ErrorType?
+    ObjectiveC.autoreleasepool {
+        
+        do {
+            
+            closureValue = try closure()
+        }
+        catch {
+            
+            closureError = error
+        }
+    }
+    
+    if let closureError = closureError {
+        
+        throw closureError
+    }
+    return closureValue
+}
+
+internal func autoreleasepool(@noescape closure: () throws -> Void) throws {
+    
+    var closureError: ErrorType?
+    ObjectiveC.autoreleasepool {
+        
+        do {
+            
+            try closure()
+        }
+        catch {
+            
+            closureError = error
+        }
+    }
+    
+    if let closureError = closureError {
+        
+        throw closureError
+    }
+}
--- a/CoreStore/Internal/MigrationManager.swift
+++ b/CoreStore/Internal/MigrationManager.swift
@@ -0,0 +1,61 @@
+//
+//  MigrationManager.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - MigrationManager
+
+internal final class MigrationManager: NSMigrationManager, NSProgressReporting {
+    
+    // MARK: NSObject
+    
+    override func didChangeValueForKey(key: String) {
+        
+        super.didChangeValueForKey(key)
+        
+        if key == "migrationProgress" {
+            
+            let progress = self.progress
+            progress.completedUnitCount = Int64(Float(progress.totalUnitCount) * self.migrationProgress)
+        }
+    }
+    
+    
+    // MARK: NSMigrationManager
+
+    init(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, progress: NSProgress) {
+        
+        self.progress = progress
+        
+        super.init(sourceModel: sourceModel, destinationModel: destinationModel)
+    }
+    
+
+    // MARK: NSProgressReporting
+    
+    let progress: NSProgress
+}
--- a/CoreStore/Internal/NSFileManager+Setup.swift
+++ b/CoreStore/Internal/NSFileManager+Setup.swift
@@ -0,0 +1,38 @@
+//
+//  NSFileManager+Setup.swift
+//  CoreStore
+//
+//  Created by John Rommel Estropia on 2015/07/19.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+
+
+// MARK: - NSFileManager
+
+internal extension NSFileManager {
+    
+    // MARK: Internal
+    
+    internal func removeSQLiteStoreAtURL(fileURL: NSURL) {
+        
+        do {
+            
+            try self.removeItemAtURL(fileURL)
+        }
+        catch _ { }
+        
+        do {
+            
+            try self.removeItemAtPath(fileURL.path!.stringByAppendingString("-shm"))
+        }
+        catch _ { }
+        
+        do {
+            
+            try self.removeItemAtPath(fileURL.path!.stringByAppendingString("-wal"))
+        }
+        catch _ { }
+    }
+}
--- a/CoreStore/Internal/NSManagedObject+Transaction.swift
+++ b/CoreStore/Internal/NSManagedObject+Transaction.swift
@@ -33,14 +33,19 @@ internal extension NSManagedObject {
    
    // MARK: Internal
    
-    internal class func createInContext(context: NSManagedObjectContext) -> Self {
+    internal dynamic class func createInContext(context: NSManagedObjectContext) -> Self {
        
-        return self(
-            entity: context.entityDescriptionForEntityClass(self)!,
+        return self.init(
+            entity: context.entityDescriptionForEntityType(self)!,
            insertIntoManagedObjectContext: context
        )
    }
    
+    internal dynamic class func inContext(context: NSManagedObjectContext, withObjectID objectID: NSManagedObjectID) -> Self? {
+        
+        return self.typedObjectInContext(context, objectID: objectID)
+    }
+    
    internal func inContext(context: NSManagedObjectContext) -> Self? {
        
        return self.typedObjectInContext(context)
@@ -54,34 +59,64 @@ internal extension NSManagedObject {
    
    // MARK: Private
    
+    private class func typedObjectInContext<T: NSManagedObject>(context: NSManagedObjectContext, objectID: NSManagedObjectID) -> T? {
+        
+        do {
+            
+            let existingObject = try context.existingObjectWithID(objectID)
+            return (existingObject as! T)
+        }
+        catch {
+            
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to load existing \(typeName(self)) in context."
+            )
+            return nil
+        }
+    }
+    
    private func typedObjectInContext<T: NSManagedObject>(context: NSManagedObjectContext) -> T? {
        
        let objectID = self.objectID
        if objectID.temporaryID {

-            var error: NSError?
-            let didSucceed = withExtendedLifetime(self.managedObjectContext) {
+            var objectIDError: NSError?
+            let didSucceed = withExtendedLifetime(self.managedObjectContext) { (context: NSManagedObjectContext?) -> Bool in
                
-                return $0?.obtainPermanentIDsForObjects([self], error: &error)
+                do {
+                    
+                    try context?.obtainPermanentIDsForObjects([self])
+                    return true
+                }
+                catch {
+                    
+                    objectIDError = error as NSError
+                    return false
+                }
            }
            if didSucceed != true {
                
                CoreStore.handleError(
-                    error ?? NSError(coreStoreErrorCode: .UnknownError),
-                    "Failed to obtain permanent ID for object.")
+                    objectIDError ?? NSError(coreStoreErrorCode: .UnknownError),
+                    "Failed to obtain permanent ID for object."
+                )
                return nil
            }
        }

-        var error: NSError?
-        if let existingObject = context.existingObjectWithID(objectID, error: &error) {
+        do {
            
+            let existingObject = try context.existingObjectWithID(objectID)
            return (existingObject as! T)
        }
-        
-        CoreStore.handleError(
-            error ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed to load existing \(typeName(self)) in context.")
-        return nil;
+        catch {
+            
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to load existing \(typeName(self)) in context."
+            )
+            return nil
+        }
    }
 }
--- a/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+CoreStore.swift
@@ -54,7 +54,12 @@ internal extension NSManagedObjectContext {
        }
    }
    
-    internal func entityDescriptionForEntityClass(entity: NSManagedObject.Type) -> NSEntityDescription? {
+    internal func entityDescriptionForEntityType(entity: NSManagedObject.Type) -> NSEntityDescription? {
+        
+        return self.entityDescriptionForEntityClass(entity)
+    }
+    
+    internal func entityDescriptionForEntityClass(entity: AnyClass) -> NSEntityDescription? {
        
        if let entityName = self.parentStack?.entityNameForEntityClass(entity) {

@@ -68,10 +73,7 @@ internal extension NSManagedObjectContext {
    
    internal func setupForCoreStoreWithContextName(contextName: String) {
        
-        if self.respondsToSelector("setName:") {
-            
-            self.name = contextName
-        }
+        self.name = contextName
        
        self.observerForWillSaveNotification = NotificationObserver(
            notificationName: NSManagedObjectContextWillSaveNotification,
@@ -86,16 +88,18 @@ internal extension NSManagedObjectContext {
                    return
                }
                
-                var error: NSError?
-                if context.obtainPermanentIDsForObjects(Array(insertedObjects), error: &error) {
+                do {
                    
+                    try context.obtainPermanentIDsForObjects(Array(insertedObjects))
                    return
                }
-                
-                CoreStore.handleError(
-                    error ?? NSError(coreStoreErrorCode: .UnknownError),
-                    "Failed to obtain permanent ID(s) for \(numberOfInsertedObjects) inserted object(s)."
-                )
+                catch {
+                    
+                    CoreStore.handleError(
+                        error as NSError,
+                        "Failed to obtain permanent ID(s) for \(numberOfInsertedObjects) inserted object(s)."
+                    )
+                }
            }
        )
    }
--- a/CoreStore/Internal/NSManagedObjectContext+Querying.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Querying.swift
@@ -52,16 +52,24 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [T]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error) as? [T]
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest) as? [T]
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if fetchResults == nil {
            
            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -87,16 +95,24 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [T]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error) as? [T]
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest) as? [T]
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if fetchResults == nil {
            
            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -128,7 +144,8 @@ internal extension NSManagedObjectContext {
            
            CoreStore.handleError(
                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -154,16 +171,24 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [NSManagedObjectID]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error) as? [NSManagedObjectID]
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest) as? [NSManagedObjectID]
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if fetchResults == nil {
            
            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -189,16 +214,24 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [NSManagedObjectID]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error) as? [NSManagedObjectID]
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest) as? [NSManagedObjectID]
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if fetchResults == nil {
            
            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -218,6 +251,7 @@ internal extension NSManagedObjectContext {
        fetchRequest.fetchLimit = 0
        fetchRequest.resultType = .ManagedObjectResultType
        fetchRequest.returnsObjectsAsFaults = true
+        fetchRequest.includesPropertyValues = false
        
        for clause in deleteClauses {
            
@@ -225,26 +259,32 @@ internal extension NSManagedObjectContext {
        }
        
        var numberOfDeletedObjects: Int?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
            autoreleasepool {
                
-                if let fetchResults = self.executeFetchRequest(fetchRequest, error: &error) as? [T] {
+                do {
                    
-                    numberOfDeletedObjects = fetchResults.count
+                    let fetchResults = try self.executeFetchRequest(fetchRequest) as? [T] ?? []
                    for object in fetchResults {
                        
                        self.deleteObject(object)
                    }
+                    numberOfDeletedObjects = fetchResults.count
+                }
+                catch {
+                    
+                    fetchError = error as NSError
                }
            }
        }
        if numberOfDeletedObjects == nil {
            
            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed executing fetch request.")
+                fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+                "Failed executing fetch request."
+            )
            return nil
        }
        
@@ -271,10 +311,17 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [AnyObject]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error)
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest)
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if let fetchResults = fetchResults {
            
@@ -287,8 +334,9 @@ internal extension NSManagedObjectContext {
        }
        
        CoreStore.handleError(
-            error ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed executing fetch request.")
+            fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+            "Failed executing fetch request."
+        )
        return nil
    }
    
@@ -312,10 +360,17 @@ internal extension NSManagedObjectContext {
        }
        
        var fetchResults: [AnyObject]?
-        var error: NSError?
+        var fetchError: NSError?
        self.performBlockAndWait {
            
-            fetchResults = self.executeFetchRequest(fetchRequest, error: &error)
+            do {
+                
+                fetchResults = try self.executeFetchRequest(fetchRequest)
+            }
+            catch {
+                
+                fetchError = error as NSError
+            }
        }
        if let fetchResults = fetchResults {
            
@@ -323,8 +378,9 @@ internal extension NSManagedObjectContext {
        }
        
        CoreStore.handleError(
-            error ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed executing fetch request.")
+            fetchError ?? NSError(coreStoreErrorCode: .UnknownError),
+            "Failed executing fetch request."
+        )
        return nil
    }
 }
--- a/CoreStore/Internal/NSManagedObjectContext+Setup.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Setup.swift
@@ -74,7 +74,7 @@ internal extension NSManagedObjectContext {
        
        let context = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
        context.parentContext = rootContext
-        context.shouldCascadeSavesToParent = true
+        context.mergePolicy = NSRollbackMergePolicy
        context.undoManager = nil
        context.setupForCoreStoreWithContextName("com.corestore.maincontext")
        context.observerForDidSaveNotification = NotificationObserver(
@@ -82,11 +82,10 @@ internal extension NSManagedObjectContext {
            object: rootContext,
            closure: { [weak context] (note) -> Void in
                
-                context?.performBlockAndWait { () -> Void in
+                context?.performBlock { () -> Void in
                    
                    context?.mergeChangesFromContextDidSaveNotification(note)
                }
-                return
            }
        )
        
--- a/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
+++ b/CoreStore/Internal/NSManagedObjectContext+Transaction.swift
@@ -68,44 +68,43 @@ internal extension NSManagedObjectContext {
    internal func saveSynchronously() -> SaveResult {
        
        var result = SaveResult(hasChanges: false)
-        self.performBlockAndWait {
-            [unowned self] () -> Void in
+        
+        self.performBlockAndWait { [unowned self] () -> Void in
            
            if !self.hasChanges {
                
                return
            }
            
-            var saveError: NSError?
-            if self.save(&saveError) {
+            do {
                
-                if self.shouldCascadeSavesToParent {
-                    
-                    if let parentContext = self.parentContext {
-                        
-                        switch parentContext.saveSynchronously() {
-                            
-                        case .Success(let hasChanges):
-                            result = SaveResult(hasChanges: true)
-                        case .Failure(let error):
-                            result = SaveResult(error)
-                        }
-                        return
-                    }
-                }
-                
-                result = SaveResult(hasChanges: true)
+                try self.save()
            }
-            else if let error = saveError {
+            catch {
                
+                let saveError = error as NSError
                CoreStore.handleError(
-                    error,
-                    "Failed to save <\(NSManagedObjectContext.self)>.")
-                result = SaveResult(error)
+                    saveError,
+                    "Failed to save \(typeName(NSManagedObjectContext))."
+                )
+                result = SaveResult(saveError)
+                return
+            }
+            
+            if let parentContext = self.parentContext where self.shouldCascadeSavesToParent {
+                
+                switch parentContext.saveSynchronously() {
+                    
+                case .Success:
+                    result = SaveResult(hasChanges: true)
+                    
+                case .Failure(let error):
+                    result = SaveResult(error)
+                }
            }
            else {
                
-                result = SaveResult(hasChanges: false)
+                result = SaveResult(hasChanges: true)
            }
        }
        
@@ -128,51 +127,36 @@ internal extension NSManagedObjectContext {
                return
            }
            
-            var saveError: NSError?
-            if self.save(&saveError) {
+            do {
                
-                if self.shouldCascadeSavesToParent {
-                    
-                    if let parentContext = self.parentContext {
-                        
-                        let result = parentContext.saveSynchronously()
-                        if let completion = completion {
-                            
-                            GCDQueue.Main.async {
-                                
-                                completion(result: result)
-                            }
-                        }
-                        return
-                    }
-                }
-                
-                if let completion = completion {
-                    
-                    GCDQueue.Main.async {
-                        
-                        completion(result: SaveResult(hasChanges: true))
-                    }
-                }
+                try self.save()
            }
-            else if let error = saveError {
+            catch {
                
+                let saveError = error as NSError
                CoreStore.handleError(
-                    error,
-                    "Failed to save <\(NSManagedObjectContext.self)>.")
+                    saveError,
+                    "Failed to save \(typeName(NSManagedObjectContext))."
+                )
                if let completion = completion {
                    
                    GCDQueue.Main.async {
                        
-                        completion(result: SaveResult(error))
+                        completion(result: SaveResult(saveError))
                    }
                }
+                return
+            }
+            
+            if let parentContext = self.parentContext where self.shouldCascadeSavesToParent {
+                
+                parentContext.saveAsynchronouslyWithCompletion(completion)
            }
            else if let completion = completion {
                
                GCDQueue.Main.async {
                    
-                    completion(result: SaveResult(hasChanges: false))
+                    completion(result: SaveResult(hasChanges: true))
                }
            }
        }
--- a/CoreStore/Internal/NSManagedObjectModel+Setup.swift
+++ b/CoreStore/Internal/NSManagedObjectModel+Setup.swift
@@ -0,0 +1,275 @@
+//
+//  NSManagedObjectModel+Setup.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - NSManagedObjectModel
+
+internal extension NSManagedObjectModel {
+    
+    // MARK: Internal
+    
+    @nonobjc internal class func fromBundle(bundle: NSBundle, modelName: String, modelVersionHints: Set<String> = []) -> NSManagedObjectModel {
+        
+        guard let modelFilePath = bundle.pathForResource(modelName, ofType: "momd") else {
+            
+            fatalError("Could not find \"\(modelName).momd\" from the bundle. \(bundle)")
+        }
+        
+        let modelFileURL = NSURL(fileURLWithPath: modelFilePath)
+        let versionInfoPlistURL = modelFileURL.URLByAppendingPathComponent("VersionInfo.plist", isDirectory: false)
+        
+        guard let versionInfo = NSDictionary(contentsOfURL: versionInfoPlistURL),
+            let versionHashes = versionInfo["NSManagedObjectModel_VersionHashes"] as? [String: AnyObject] else {
+                
+                fatalError("Could not load \(typeName(NSManagedObjectModel)) metadata from path \"\(versionInfoPlistURL)\".")
+        }
+        
+        let modelVersions = Set(versionHashes.keys)
+        let currentModelVersion: String
+        if let plistModelVersion = versionInfo["NSManagedObjectModel_CurrentVersionName"] as? String where modelVersionHints.isEmpty || modelVersionHints.contains(plistModelVersion) {
+            
+            currentModelVersion = plistModelVersion
+        }
+        else if let resolvedVersion = modelVersions.intersect(modelVersionHints).first {
+            
+            CoreStore.log(
+                .Warning,
+                message: "The MigrationChain leaf versions do not include the model file's current version. Resolving to version \"\(resolvedVersion)\"."
+            )
+            currentModelVersion = resolvedVersion
+        }
+        else if let resolvedVersion = modelVersions.first ?? modelVersionHints.first {
+            
+            CoreStore.log(
+                .Warning,
+                message: "The MigrationChain leaf versions do not include any of the model file's embedded versions. Resolving to version \"\(resolvedVersion)\"."
+            )
+            currentModelVersion = resolvedVersion
+        }
+        else {
+            
+            fatalError("No model files were found in URL \"\(modelFileURL)\".")
+        }
+        
+        var modelVersionFileURL: NSURL?
+        for modelVersion in modelVersions {
+            
+            let fileURL = modelFileURL.URLByAppendingPathComponent("\(modelVersion).mom", isDirectory: false)
+            
+            if modelVersion == currentModelVersion {
+                
+                modelVersionFileURL = fileURL
+                continue
+            }
+            
+            precondition(
+                NSManagedObjectModel(contentsOfURL: fileURL) != nil,
+                "Could not find the \"\(modelVersion).mom\" version file for the model at URL \"\(modelFileURL)\"."
+            )
+        }
+        
+        if let modelVersionFileURL = modelVersionFileURL,
+            let rootModel = NSManagedObjectModel(contentsOfURL: modelVersionFileURL) {
+                
+                rootModel.modelVersionFileURL = modelVersionFileURL
+                rootModel.modelVersions = modelVersions
+                rootModel.currentModelVersion = currentModelVersion
+                return rootModel
+        }
+        
+        fatalError("Could not create an \(typeName(NSManagedObjectModel)) from the model at URL \"\(modelFileURL)\".")
+    }
+    
+    @nonobjc private(set) internal var currentModelVersion: String? {
+        
+        get {
+            
+            let value: NSString? = getAssociatedObjectForKey(
+                &PropertyKeys.currentModelVersion,
+                inObject: self
+            )
+            return value as? String
+        }
+        set {
+            
+            setAssociatedCopiedObject(
+                newValue == nil ? nil : (newValue! as NSString),
+                forKey: &PropertyKeys.currentModelVersion,
+                inObject: self
+            )
+        }
+    }
+    
+    @nonobjc private(set) internal var modelVersions: Set<String>? {
+        
+        get {
+            
+            let value: NSSet? = getAssociatedObjectForKey(
+                &PropertyKeys.modelVersions,
+                inObject: self
+            )
+            return value as? Set<String>
+        }
+        set {
+            
+            setAssociatedCopiedObject(
+                newValue == nil ? nil : (newValue! as NSSet),
+                forKey: &PropertyKeys.modelVersions,
+                inObject: self
+            )
+        }
+    }
+    
+    @nonobjc internal func entityNameForClass(entityClass: AnyClass) -> String {
+        
+        return self.entityNameMapping[NSStringFromClass(entityClass)]!
+    }
+    
+    @nonobjc internal func entityMapping() -> [String: NSManagedObject.Type] {
+    
+        return self.entityNameMapping.reduce([:]) { (var mapping, pair) in
+            
+            mapping[pair.0] = (NSClassFromString(pair.1)! as! NSManagedObject.Type)
+            return mapping
+        }
+    }
+    
+    @nonobjc internal func mergedModels() -> [NSManagedObjectModel] {
+        
+        return self.modelVersions?.map { self[$0] }.flatMap { $0 == nil ? [] : [$0!] } ?? [self]
+    }
+    
+    @nonobjc internal subscript(modelVersion: String) -> NSManagedObjectModel? {
+        
+        if modelVersion == self.currentModelVersion {
+            
+            return self
+        }
+        
+        guard let modelFileURL = self.modelFileURL,
+            let modelVersions = self.modelVersions
+            where modelVersions.contains(modelVersion) else {
+                
+                return nil
+        }
+        
+        let versionModelFileURL = modelFileURL.URLByAppendingPathComponent("\(modelVersion).mom", isDirectory: false)
+        guard let model = NSManagedObjectModel(contentsOfURL: versionModelFileURL) else {
+            
+            return nil
+        }
+        
+        model.currentModelVersion = modelVersion
+        model.modelVersionFileURL = versionModelFileURL
+        model.modelVersions = modelVersions
+        return model
+    }
+    
+    @nonobjc internal subscript(metadata: [String: AnyObject]) -> NSManagedObjectModel? {
+        
+        if let modelHashes = metadata[NSStoreModelVersionHashesKey] as? [String : NSData] {
+            
+            for modelVersion in self.modelVersions ?? [] {
+                
+                if let versionModel = self[modelVersion] where modelHashes == versionModel.entityVersionHashesByName {
+                    
+                    return versionModel
+                }
+            }
+        }
+        return nil
+    }
+    
+    
+    // MARK: Private
+    
+    private var modelFileURL: NSURL? {
+        
+        get {
+            
+            return self.modelVersionFileURL?.URLByDeletingLastPathComponent
+        }
+    }
+    
+    private var modelVersionFileURL: NSURL? {
+        
+        get {
+            
+            let value: NSURL? = getAssociatedObjectForKey(
+                &PropertyKeys.modelVersionFileURL,
+                inObject: self
+            )
+            return value
+        }
+        set {
+            
+            setAssociatedCopiedObject(
+                newValue,
+                forKey: &PropertyKeys.modelVersionFileURL,
+                inObject: self
+            )
+        }
+    }
+    
+    private var entityNameMapping: [String: String] {
+        
+        get {
+            
+            if let mapping: NSDictionary = getAssociatedObjectForKey(&PropertyKeys.entityNameMapping, inObject: self) {
+                
+                return mapping as! [String: String]
+            }
+            
+            let mapping = self.entities.reduce([String: String]()) {
+                (var mapping, entityDescription) -> [String: String] in
+                
+                if let entityName = entityDescription.name {
+                    
+                    let className = entityDescription.managedObjectClassName
+                    mapping[className] = entityName
+                }
+                return mapping
+            }
+            setAssociatedCopiedObject(
+                mapping as NSDictionary,
+                forKey: &PropertyKeys.entityNameMapping,
+                inObject: self
+            )
+            return mapping
+        }
+    }
+    
+    private struct PropertyKeys {
+        
+        static var entityNameMapping: Void?
+        
+        static var modelVersionFileURL: Void?
+        static var modelVersions: Void?
+        static var currentModelVersion: Void?
+    }
+}
--- a/CoreStore/Internal/NotificationObserver.swift
+++ b/CoreStore/Internal/NotificationObserver.swift
@@ -36,7 +36,7 @@ internal final class NotificationObserver {
    let object: AnyObject?
    let observer: NSObjectProtocol
    
-    init(notificationName: String, object: AnyObject?, closure: (note: NSNotification!) -> Void) {
+    init(notificationName: String, object: AnyObject?, closure: (note: NSNotification) -> Void) {
        
        self.notificationName = notificationName
        self.object = object
--- a/CoreStore/Logging/CoreStore+Logging.swift
+++ b/CoreStore/Logging/CoreStore+Logging.swift
@@ -46,10 +46,8 @@ public extension CoreStore {
            level: level,
            message: message,
            fileName: fileName,
-            lineNumber:
-            lineNumber,
-            functionName:
-            functionName
+            lineNumber: lineNumber,
+            functionName: functionName
        )
    }
    
@@ -60,7 +58,8 @@ public extension CoreStore {
            message: message,
            fileName: fileName,
            lineNumber: lineNumber,
-            functionName: functionName)
+            functionName: functionName
+        )
    }
    
    internal static func assert(@autoclosure condition: () -> Bool, _ message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
@@ -70,6 +69,7 @@ public extension CoreStore {
            message: message,
            fileName: fileName,
            lineNumber: lineNumber,
-            functionName: functionName)
+            functionName: functionName
+        )
    }
 }
--- a/CoreStore/Logging/CoreStoreLogger.swift
+++ b/CoreStore/Logging/CoreStoreLogger.swift
@@ -56,7 +56,7 @@ public protocol CoreStoreLogger {
    :lineNumber: the source line number
    :functionName: the source function name
    */
-    func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
    
    /**
    Handles errors sent by the `CoreStore` framework.
@@ -67,7 +67,7 @@ public protocol CoreStoreLogger {
    :lineNumber: the source line number
    :functionName: the source function name
    */
-    func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
    
    /**
    Handles assertions made throughout the `CoreStore` framework.
@@ -86,5 +86,21 @@ public protocol CoreStoreLogger {

 internal func typeName<T>(value: T) -> String {
    
-    return "<\(_stdlib_getDemangledTypeName(value))>"
+    return "'\(_stdlib_getDemangledTypeName(value))'"
+}
+
+internal func typeName<T>(value: T.Type) -> String {
+    
+    return "'\(value)'"
+}
+
+internal func typeName(value: AnyClass) -> String {
+    
+    return "'\(value)'"
+}
+
+internal func typeName(name: String?) -> String {
+    
+    let typeName = name ?? "unknown"
+    return "<\(typeName)>"
 }
--- a/CoreStore/Logging/DefaultLogger.swift
+++ b/CoreStore/Logging/DefaultLogger.swift
@@ -31,37 +31,57 @@ import Foundation
 /**
 The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol.

- The `log(...)` method calls `println(...)` to print the level, source file name, line number, function name, and the log message.
- The `handleError(...)` method calls `println(...)` to print the source file name, line number, function name, and the error message.
+- 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() { }
   
-    public func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
        
        #if DEBUG
+            let icon: String
            let levelString: String
            switch level {
-            case .Trace: levelString = "Trace"
-            case .Notice: levelString = "Notice"
-            case .Warning: levelString = "Warning"
-            case .Fatal: levelString = "Fatal"
+                
+            case .Trace:
+                icon = "🔹"
+                levelString = "Trace"
+                
+            case .Notice:
+                icon = "🔸"
+                levelString = "Notice"
+                
+            case .Warning:
+                icon = "⚠️"
+                levelString = "Warning"
+                
+            case .Fatal:
+                icon = "❗"
+                levelString = "Fatal"
            }
-            Swift.println("[CoreStore:\(levelString)] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
+            Swift.print("\(icon) [CoreStore: \(levelString)] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
        #endif
    }
    
-    public func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
        
        #if DEBUG
-            Swift.println("[CoreStore:Error] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message): \(error)\n")
+            Swift.print("⚠️ [CoreStore: Error] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n    \(error)\n")
        #endif
    }
    
    public func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
        
        #if DEBUG
-            Swift.assert(condition, message, file: fileName, line: numericCast(lineNumber))
+            if condition() {
+                
+                return
+            }
+            Swift.print("❗ [CoreStore: Assertion Failure] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
+            Swift.fatalError()
        #endif
    }
 }
--- a/CoreStore/Migrating/CoreStore+Migration.swift
+++ b/CoreStore/Migrating/CoreStore+Migration.swift
@@ -0,0 +1,148 @@
+//
+//  CoreStore+Migration.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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
+import GCDKit
+
+
+// MARK: - CoreStore
+
+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
+    */
+    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(
+            fileName: fileName,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
+            completion: completion
+        )
+    }
+    
+    /**
+    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
+    */
+    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(
+            fileURL: fileURL,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
+            completion: completion
+        )
+    }
+    
+    /**
+    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
+    */
+    public static func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
+        
+        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
+            fileName: fileName,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            completion: completion
+        )
+    }
+    
+    /**
+    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
+    */
+    public static func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
+        
+        return try self.defaultStack.upgradeSQLiteStoreIfNeeded(
+            fileURL: fileURL,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            completion: completion
+        )
+    }
+    
+    /**
+    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.
+    */
+    public static func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
+        
+        return try self.defaultStack.requiredMigrationsForSQLiteStore(
+            fileName: fileName,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles
+        )
+    }
+    
+    /**
+    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.
+    */
+    public static func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
+        
+        return try self.defaultStack.requiredMigrationsForSQLiteStore(
+            fileURL: fileURL,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles
+        )
+    }
+}
--- a/CoreStore/Migrating/DataStack+Migration.swift
+++ b/CoreStore/Migrating/DataStack+Migration.swift
@@ -0,0 +1,632 @@
+//
+//  DataStack+Migration.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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
+import GCDKit
+
+
+// MARK: - DataStack
+
+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.
+    */
+    public func addInMemoryStore(configuration configuration: String? = nil, completion: (PersistentStoreResult) -> Void) {
+        
+        self.coordinator.performBlock {
+            
+            do {
+                
+                let store = try self.coordinator.addPersistentStoreWithType(
+                    NSInMemoryStoreType,
+                    configuration: configuration,
+                    URL: nil,
+                    options: nil
+                )
+                self.updateMetadataForPersistentStore(store)
+                
+                GCDQueue.Main.async {
+                    
+                    completion(PersistentStoreResult(store))
+                }
+            }
+            catch {
+                
+                let storeError = error as NSError
+                CoreStore.handleError(
+                    storeError,
+                    "Failed to add in-memory \(typeName(NSPersistentStore)) to the stack."
+                )
+                
+                GCDQueue.Main.async {
+                    
+                    completion(PersistentStoreResult(storeError))
+                }
+            }
+        }
+    }
+    
+    /**
+    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
+    */
+    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(
+                fileName,
+                isDirectory: false
+            ),
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch,
+            completion: completion
+        )
+    }
+    
+    /**
+    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
+    */
+    public func addSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = NSBundle.allBundles(), resetStoreOnModelMismatch: Bool = false, completion: (PersistentStoreResult) -> Void) throws -> NSProgress? {
+        
+        CoreStore.assert(
+            fileURL.fileURL,
+            "The specified file URL for the SQLite store is invalid: \"\(fileURL)\""
+        )
+        
+        let coordinator = self.coordinator;
+        if let store = coordinator.persistentStoreForURL(fileURL) {
+            
+            if store.type == NSSQLiteStoreType
+                && store.configurationName == (configuration ?? Into.defaultConfigurationName) {
+                    
+                    GCDQueue.Main.async {
+                        
+                        completion(PersistentStoreResult(store))
+                    }
+                    return nil
+            }
+            
+            let error = NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL)
+            CoreStore.handleError(
+                error,
+                "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\" because a different \(typeName(NSPersistentStore)) at that URL already exists."
+            )
+            throw error
+        }
+        
+        let fileManager = NSFileManager.defaultManager()
+        do {
+            
+            try fileManager.createDirectoryAtURL(
+                fileURL.URLByDeletingLastPathComponent!,
+                withIntermediateDirectories: true,
+                attributes: nil
+            )
+        }
+        catch _ { }
+        
+        do {
+            
+            let metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
+                NSSQLiteStoreType,
+                URL: fileURL
+            )
+            
+            return self.upgradeSQLiteStoreIfNeeded(
+                fileURL: fileURL,
+                metadata: metadata,
+                configuration: configuration,
+                mappingModelBundles: mappingModelBundles,
+                completion: { (result) -> Void in
+                    
+                    if case .Failure(let error) = result {
+                        
+                        if resetStoreOnModelMismatch && error.isCoreDataMigrationError {
+                            
+                            fileManager.removeSQLiteStoreAtURL(fileURL)
+                            do {
+                                
+                                let store = try self.addSQLiteStoreAndWait(
+                                    fileURL: fileURL,
+                                    configuration: configuration,
+                                    resetStoreOnModelMismatch: false
+                                )
+                                
+                                GCDQueue.Main.async {
+                                    
+                                    completion(PersistentStoreResult(store))
+                                }
+                            }
+                            catch {
+                                
+                                completion(PersistentStoreResult(error as NSError))
+                            }
+                            return
+                        }
+                        
+                        completion(PersistentStoreResult(error))
+                        return
+                    }
+                    
+                    do {
+                        
+                        let store = try self.addSQLiteStoreAndWait(
+                            fileURL: fileURL,
+                            configuration: configuration,
+                            resetStoreOnModelMismatch: false
+                        )
+                        
+                        completion(PersistentStoreResult(store))
+                    }
+                    catch {
+                        
+                        completion(PersistentStoreResult(error as NSError))
+                    }
+                }
+            )
+        }
+        catch let error as NSError
+            where error.code == NSFileReadNoSuchFileError && error.domain == NSCocoaErrorDomain {
+                
+                let store = try self.addSQLiteStoreAndWait(
+                    fileURL: fileURL,
+                    configuration: configuration,
+                    resetStoreOnModelMismatch: false
+                )
+                
+                GCDQueue.Main.async {
+                    
+                    completion(PersistentStoreResult(store))
+                }
+                return nil
+        }
+        catch {
+            
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
+            )
+            throw error
+        }
+    }
+    
+    /**
+    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
+    */
+    public func upgradeSQLiteStoreIfNeeded(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
+        
+        return try self.upgradeSQLiteStoreIfNeeded(
+            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+                fileName,
+                isDirectory: false
+            ),
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            completion: completion
+        )
+    }
+    
+    /**
+    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
+    */
+    public func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil, completion: (MigrationResult) -> Void) throws -> NSProgress? {
+        
+        let metadata: [String: AnyObject]
+        do {
+            
+            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
+                NSSQLiteStoreType,
+                URL: fileURL
+            )
+        }
+        catch {
+            
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
+            )
+            throw error
+        }
+        
+        return self.upgradeSQLiteStoreIfNeeded(
+            fileURL: fileURL,
+            metadata: metadata,
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles,
+            completion: completion
+        )
+    }
+    
+    /**
+    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.
+    */
+    public func requiredMigrationsForSQLiteStore(fileName fileName: String, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
+        
+        return try requiredMigrationsForSQLiteStore(
+            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
+                fileName,
+                isDirectory: false
+            ),
+            configuration: configuration,
+            mappingModelBundles: mappingModelBundles
+        )
+    }
+    
+    /**
+    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.
+    */
+    public func requiredMigrationsForSQLiteStore(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, mappingModelBundles: [NSBundle] = NSBundle.allBundles() as [NSBundle]) throws -> [MigrationType] {
+        
+        let metadata: [String : AnyObject]
+        do {
+            
+            metadata = try NSPersistentStoreCoordinator.metadataForPersistentStoreOfType(
+                NSSQLiteStoreType,
+                URL: fileURL
+            )
+        }
+        catch {
+            
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to load SQLite \(typeName(NSPersistentStore)) metadata."
+            )
+            throw error
+        }
+        
+        guard let migrationSteps = self.computeMigrationFromStoreMetadata(metadata, configuration: configuration, mappingModelBundles: mappingModelBundles) else {
+            
+            let error = NSError(coreStoreErrorCode: .MappingModelNotFound)
+            CoreStore.handleError(
+                error,
+                "Failed to find migration steps from the store at URL \"\(fileURL)\" to version model \"\(self.modelVersion)\"."
+            )
+            throw error
+        }
+        
+        return migrationSteps.map { $0.migrationType }
+    }
+    
+    
+    // MARK: Private
+    
+    private func upgradeSQLiteStoreIfNeeded(fileURL fileURL: NSURL, metadata: [String: AnyObject], configuration: String?, mappingModelBundles: [NSBundle]?, completion: (MigrationResult) -> Void) -> NSProgress? {
+        
+        guard let migrationSteps = self.computeMigrationFromStoreMetadata(metadata, configuration: configuration, mappingModelBundles: mappingModelBundles) else {
+            
+            CoreStore.handleError(
+                NSError(coreStoreErrorCode: .MappingModelNotFound),
+                "Failed to find migration steps from the store at URL \"\(fileURL)\" to version model \"\(model)\"."
+            )
+            
+            GCDQueue.Main.async {
+                
+                completion(MigrationResult(.MappingModelNotFound))
+            }
+            return nil
+        }
+        
+        let numberOfMigrations: Int64 = Int64(migrationSteps.count)
+        if numberOfMigrations == 0 {
+            
+            GCDQueue.Main.async {
+                
+                completion(MigrationResult([]))
+                return
+            }
+            return nil
+        }
+        
+        let migrationTypes = migrationSteps.map { $0.migrationType }
+        var migrationResult: MigrationResult?
+        var operations = [NSOperation]()
+        var cancelled = false
+        
+        let progress = NSProgress(parent: nil, userInfo: nil)
+        progress.totalUnitCount = numberOfMigrations
+        
+        // todo nsprogress crashing sometimes
+        for (sourceModel, destinationModel, mappingModel, _) in migrationSteps {
+            
+            progress.becomeCurrentWithPendingUnitCount(1)
+            
+            let childProgress = NSProgress(parent: progress, userInfo: nil)
+            childProgress.totalUnitCount = 100
+            
+            operations.append(
+                NSBlockOperation { [weak self] in
+                    
+                    guard let strongSelf = self where !cancelled else {
+                        
+                        return
+                    }
+                    
+                    autoreleasepool {
+                        
+                        do {
+                            
+                            try strongSelf.startMigrationForSQLiteStore(
+                                fileURL: fileURL,
+                                sourceModel: sourceModel,
+                                destinationModel: destinationModel,
+                                mappingModel: mappingModel,
+                                progress: childProgress
+                            )
+                        }
+                        catch {
+                            
+                            migrationResult = MigrationResult(error as NSError)
+                            cancelled = true
+                        }
+                    }
+                    
+                    GCDQueue.Main.async {
+                        
+                        withExtendedLifetime(childProgress) { (_: NSProgress) -> Void in }
+                        return
+                    }
+                }
+            )
+            
+            progress.resignCurrent()
+        }
+        
+        let migrationOperation = NSBlockOperation()
+        migrationOperation.qualityOfService = .Utility
+        operations.map { migrationOperation.addDependency($0) }
+        migrationOperation.addExecutionBlock { () -> Void in
+            
+            GCDQueue.Main.async {
+                
+                progress.setProgressHandler(nil)
+                completion(migrationResult ?? MigrationResult(migrationTypes))
+                return
+            }
+        }
+        
+        operations.append(migrationOperation)
+        
+        self.migrationQueue.addOperations(operations, waitUntilFinished: false)
+        
+        return progress
+    }
+    
+    private func computeMigrationFromStoreMetadata(metadata: [String: AnyObject], configuration: String? = nil, mappingModelBundles: [NSBundle]? = nil) -> [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]? {
+        
+        let model = self.model
+        if model.isConfiguration(configuration, compatibleWithStoreMetadata: metadata) {
+            
+            return []
+        }
+        
+        guard let initialModel = model[metadata],
+            var currentVersion = initialModel.currentModelVersion else {
+                
+                return nil
+        }
+        
+        let migrationChain: MigrationChain = self.migrationChain.empty
+            ? [currentVersion: model.currentModelVersion!]
+            : self.migrationChain
+        
+        var migrationSteps = [(sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, migrationType: MigrationType)]()
+        
+        while let nextVersion = migrationChain.nextVersionFrom(currentVersion),
+            let sourceModel = model[currentVersion],
+            let destinationModel = model[nextVersion] where sourceModel != model {
+                
+                if let mappingModel = NSMappingModel(
+                    fromBundles: mappingModelBundles,
+                    forSourceModel: sourceModel,
+                    destinationModel: destinationModel) {
+                        
+                        migrationSteps.append(
+                            (
+                                sourceModel: sourceModel,
+                                destinationModel: destinationModel,
+                                mappingModel: mappingModel,
+                                migrationType: .Heavyweight(
+                                    sourceVersion: currentVersion,
+                                    destinationVersion: nextVersion
+                                )
+                            )
+                        )
+                }
+                else {
+                    
+                    do {
+                        
+                        let mappingModel = try NSMappingModel.inferredMappingModelForSourceModel(
+                            sourceModel,
+                            destinationModel: destinationModel
+                        )
+                        
+                        migrationSteps.append(
+                            (
+                                sourceModel: sourceModel,
+                                destinationModel: destinationModel,
+                                mappingModel: mappingModel,
+                                migrationType: .Lightweight(
+                                    sourceVersion: currentVersion,
+                                    destinationVersion: nextVersion
+                                )
+                            )
+                        )
+                    }
+                    catch {
+                        
+                        return nil
+                    }
+                }
+                currentVersion = nextVersion
+        }
+        
+        if migrationSteps.last?.destinationModel == model {
+            
+            return migrationSteps
+        }
+        
+        return nil
+    }
+    
+    private func startMigrationForSQLiteStore(fileURL fileURL: NSURL, sourceModel: NSManagedObjectModel, destinationModel: NSManagedObjectModel, mappingModel: NSMappingModel, progress: NSProgress) throws {
+        
+        autoreleasepool {
+            
+            let journalUpdatingCoordinator = NSPersistentStoreCoordinator(managedObjectModel: sourceModel)
+            let store = try! journalUpdatingCoordinator.addPersistentStoreWithType(
+                NSSQLiteStoreType,
+                configuration: nil,
+                URL: fileURL,
+                options: [NSSQLitePragmasOption: ["journal_mode": "DELETE"]]
+            )
+            try! journalUpdatingCoordinator.removePersistentStore(store)
+        }
+        
+        let migrationManager = MigrationManager(
+            sourceModel: sourceModel,
+            destinationModel: destinationModel,
+            progress: progress
+        )
+        
+        let temporaryDirectoryURL = NSURL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).URLByAppendingPathComponent(NSProcessInfo().globallyUniqueString)
+        
+        let fileManager = NSFileManager.defaultManager()
+        try! fileManager.createDirectoryAtURL(
+            temporaryDirectoryURL,
+            withIntermediateDirectories: true,
+            attributes: nil
+        )
+        
+        let temporaryFileURL = temporaryDirectoryURL.URLByAppendingPathComponent(fileURL.lastPathComponent!, isDirectory: false)
+        
+        do {
+            
+            try migrationManager.migrateStoreFromURL(
+                fileURL,
+                type: NSSQLiteStoreType,
+                options: nil,
+                withMappingModel: mappingModel,
+                toDestinationURL: temporaryFileURL,
+                destinationType: NSSQLiteStoreType,
+                destinationOptions: nil
+            )
+        }
+        catch {
+            
+            do {
+                
+                try fileManager.removeItemAtURL(temporaryDirectoryURL)
+            }
+            catch _ { }
+            
+            let sourceVersion = migrationManager.sourceModel.currentModelVersion ?? "???"
+            let destinationVersion = migrationManager.destinationModel.currentModelVersion ?? "???"
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to migrate from version model \"\(sourceVersion)\" to version model \"\(destinationVersion)\"."
+            )
+            
+            throw error
+        }
+        
+        do {
+            
+            try fileManager.replaceItemAtURL(
+                fileURL,
+                withItemAtURL: temporaryFileURL,
+                backupItemName: nil,
+                options: [],
+                resultingItemURL: nil
+            )
+            
+            progress.completedUnitCount = progress.totalUnitCount
+            
+            do {
+                
+                try fileManager.removeItemAtPath(fileURL.path! + "-shm")
+            }
+            catch _ { }
+        }
+        catch {
+            
+            do {
+                
+                try fileManager.removeItemAtURL(temporaryDirectoryURL)
+            }
+            catch _ { }
+            
+            let sourceVersion = migrationManager.sourceModel.currentModelVersion ?? "???"
+            let destinationVersion = migrationManager.destinationModel.currentModelVersion ?? "???"
+            CoreStore.handleError(
+                error as NSError,
+                "Failed to save store after migrating from version model \"\(sourceVersion)\" to version model \"\(destinationVersion)\"."
+            )
+            
+            throw error
+        }
+    }
+}
--- a/CoreStore/Migrating/MigrationChain.swift
+++ b/CoreStore/Migrating/MigrationChain.swift
@@ -0,0 +1,245 @@
+//
+//  MigrationChain.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - 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
+*/
+public struct MigrationChain: NilLiteralConvertible, StringLiteralConvertible, DictionaryLiteralConvertible, ArrayLiteralConvertible {
+    
+    // MARK: NilLiteralConvertible
+    
+    public init(nilLiteral: ()) {
+        
+        self.versionTree = [:]
+        self.rootVersions = []
+        self.leafVersions = []
+        self.valid = true
+    }
+    
+    
+    // MARK: StringLiteralConvertible
+    
+    public init(stringLiteral value: String) {
+        
+        self.versionTree = [:]
+        self.rootVersions = [value]
+        self.leafVersions = [value]
+        self.valid = true
+    }
+    
+    
+    // MARK: ExtendedGraphemeClusterLiteralConvertible
+    
+    public init(extendedGraphemeClusterLiteral value: String) {
+        
+        self.versionTree = [:]
+        self.rootVersions = [value]
+        self.leafVersions = [value]
+        self.valid = true
+    }
+    
+    
+    // MARK: UnicodeScalarLiteralConvertible
+    
+    public init(unicodeScalarLiteral value: String) {
+        
+        self.versionTree = [:]
+        self.rootVersions = [value]
+        self.leafVersions = [value]
+        self.valid = true
+    }
+    
+    
+    // MARK: DictionaryLiteralConvertible
+    
+    public init(dictionaryLiteral elements: (String, String)...) {
+        
+        var valid = true
+        let versionTree = elements.reduce([String: String]()) { (var versionTree, tuple: (String, String)) -> [String: String] in
+            
+            if let _ = versionTree.updateValue(tuple.1, forKey: tuple.0) {
+                
+                CoreStore.assert(false, "\(typeName(MigrationChain))'s migration chain could not be created due to ambiguous version paths.")
+                
+                valid = false
+            }
+            return versionTree
+        }
+        let leafVersions = Set(
+            elements.filter { (tuple: (String, String)) -> Bool in
+                
+                return versionTree[tuple.1] == nil
+                
+            }.map { $1 }
+        )
+        
+        let isVersionAmbiguous = { (start: String) -> Bool in
+            
+            var checklist: Set<String> = [start]
+            var version = start
+            while let nextVersion = versionTree[version] where nextVersion != version {
+                
+                if checklist.contains(nextVersion) {
+                    
+                    CoreStore.assert(false, "\(typeName(MigrationChain))'s migration chain could not be created due to looping version paths.")
+                    
+                    return true
+                }
+                checklist.insert(nextVersion)
+                version = nextVersion
+            }
+            
+            return false
+        }
+        
+        self.versionTree = versionTree
+        self.rootVersions = Set(versionTree.keys).subtract(versionTree.values)
+        self.leafVersions = leafVersions
+        self.valid = valid && Set(versionTree.keys).union(versionTree.values).filter { isVersionAmbiguous($0) }.count <= 0
+    }
+    
+    
+    // MARK: ArrayLiteralConvertible
+    
+    public init(arrayLiteral elements: String...) {
+        
+        CoreStore.assert(Set(elements).count == elements.count, "\(typeName(MigrationChain))'s migration chain could not be created due to duplicate version strings.")
+        
+        var lastVersion: String?
+        var versionTree = [String: String]()
+        var valid = true
+        for version in elements {
+            
+            if let lastVersion = lastVersion {
+                
+                if let _ = versionTree.updateValue(version, forKey: lastVersion) {
+                    
+                    valid = false
+                }
+            }
+            lastVersion = version
+        }
+        
+        self.versionTree = versionTree
+        self.rootVersions = Set([elements.first].flatMap { $0 == nil ? [] : [$0!] })
+        self.leafVersions = Set([elements.last].flatMap { $0 == nil ? [] : [$0!] })
+        self.valid = valid
+    }
+    
+    
+    // MARK: Internal
+    
+    internal let rootVersions: Set<String>
+    internal let leafVersions: Set<String>
+    internal let valid: Bool
+    
+    internal var empty: Bool {
+        
+        return self.versionTree.count <= 0
+    }
+    
+    internal func contains(version: String) -> Bool {
+        
+        return self.rootVersions.contains(version)
+            || self.leafVersions.contains(version)
+            || self.versionTree[version] != nil
+    }
+    
+    internal func nextVersionFrom(version: String) -> String? {
+        
+        if let nextVersion = self.versionTree[version] where nextVersion != version {
+            
+            return nextVersion
+        }
+        return nil
+    }
+    
+    
+    // MARK: Private
+    
+    private let versionTree: [String: String]
+}
+
+
+// MARK: - MigrationChain: CustomDebugStringConvertible
+
+extension MigrationChain: CustomDebugStringConvertible {
+    
+    public var debugDescription: String {
+        
+        guard self.valid else {
+            
+            return "<invalid migration chain>"
+        }
+        
+        var paths = [String]()
+        for var version in self.rootVersions {
+            
+            var steps = [version]
+            while let nextVersion = self.nextVersionFrom(version) {
+                
+                steps.append(nextVersion)
+                version = nextVersion
+            }
+            paths.append(" → ".join(steps))
+        }
+        
+        return "[" + "], [".join(paths) + "]"
+    }
+}
--- a/CoreStore/Migrating/MigrationResult.swift
+++ b/CoreStore/Migrating/MigrationResult.swift
@@ -0,0 +1,110 @@
+//
+//  MigrationResult.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - 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
+        }
+    }
+```
+*/
+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.
+    */
+    case Success([MigrationType])
+    
+    /**
+    `SaveResult.Failure` indicates that the migration failed. The associated object for this value is the related `NSError` instance.
+    */
+    case Failure(NSError)
+    
+    
+    // MARK: Internal
+    
+    internal init(_ migrationTypes: [MigrationType]) {
+        
+        self = .Success(migrationTypes)
+    }
+    
+    internal init(_ error: NSError) {
+        
+        self = .Failure(error)
+    }
+    
+    internal init(_ errorCode: CoreStoreErrorCode) {
+        
+        self.init(errorCode, userInfo: nil)
+    }
+    
+    internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) {
+        
+        self.init(NSError(coreStoreErrorCode: errorCode, userInfo: userInfo))
+    }
+}
+
+
+// MARK: - MigrationResult: BooleanType
+
+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
@@ -0,0 +1,125 @@
+//
+//  MigrationType.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+
+import Foundation
+
+
+// MARK: - MigrationType
+
+/**
+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
+    */
+    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
+    */
+    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
+    */
+    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`.
+    */
+    public var sourceVersion: String {
+        
+        switch self {
+            
+        case .None(let version):
+            return version
+            
+        case .Lightweight(let sourceVersion, _):
+            return sourceVersion
+            
+        case .Heavyweight(let sourceVersion, _):
+            return 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 {
+            
+        case .None(let version):
+            return version
+            
+        case .Lightweight(_, let destinationVersion):
+            return destinationVersion
+            
+        case .Heavyweight(_, let destinationVersion):
+            return destinationVersion
+        }
+    }
+    
+    /**
+    Returns `true` if the `MigrationType` is a lightweight migration. Used as syntactic sugar.
+    */
+    public var isLightweightMigration: Bool {
+        
+        if case .Lightweight = self {
+            
+            return true
+        }
+        return false
+    }
+    
+    /**
+    Returns `true` if the `MigrationType` is a heavyweight migration. Used as syntactic sugar.
+    */
+    public var isHeavyweightMigration: Bool {
+        
+        if case .Heavyweight = self {
+            
+            return true
+        }
+        return false
+    }
+    
+    
+    // MARK: BooleanType
+    
+    public var boolValue: Bool {
+        
+        switch self {
+            
+        case .None:         return false
+        case .Lightweight:  return true
+        case .Heavyweight:  return true
+        }
+    }
+}
--- a/CoreStore/NSError+CoreStore.swift
+++ b/CoreStore/NSError+CoreStore.swift
@@ -44,6 +44,16 @@ public enum CoreStoreErrorCode: Int {
    The `NSPersistentStore` could note be initialized because another store existed at the specified `NSURL`.
    */
    case DifferentPersistentStoreExistsAtURL
+    
+    /**
+    The `NSPersistentStore` specified could not be found.
+    */
+    case PersistentStoreNotFound
+    
+    /**
+    An `NSMappingModel` could not be found for a specific source and destination model versions.
+    */
+    case MappingModelNotFound
 }


@@ -76,4 +86,13 @@ public extension NSError {
            code: coreStoreErrorCode.rawValue,
            userInfo: userInfo)
    }
+    
+    internal var isCoreDataMigrationError: Bool {
+        
+        let code = self.code
+        return (code == NSPersistentStoreIncompatibleVersionHashError
+            || code == NSMigrationMissingSourceModelError
+            || code == NSMigrationError)
+            && self.domain == NSCocoaErrorDomain
+    }
 }
--- a/CoreStore/Observing/CoreStore+Observing.swift
+++ b/CoreStore/Observing/CoreStore+Observing.swift
@@ -34,63 +34,63 @@ public extension CoreStore {
    // MARK: Public
    
    /**
-    Using the `defaultStack`, creates a `ManagedObjectController` for the specified `NSManagedObject`. Multiple `ManagedObjectObserver`'s may then register themselves to be notified when changes are made to the `NSManagedObject`.
+    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`.
    
-    :param: object the `NSManagedObject` to observe changes from
-    :returns: a `ManagedObjectController` that monitors changes to `object`
+    - parameter object: the `NSManagedObject` to observe changes from
+    - returns: a `ObjectMonitor` that monitors changes to `object`
    */
-    public static func observeObject<T: NSManagedObject>(object: T) -> ManagedObjectController<T> {
+    public static func monitorObject<T: NSManagedObject>(object: T) -> ObjectMonitor<T> {
        
-        return self.defaultStack.observeObject(object)
+        return self.defaultStack.monitorObject(object)
    }
    
    /**
-    Using the `defaultStack`, creates a `ManagedObjectListController` for a list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public static func observeObjectList<T: NSManagedObject>(from: From<T>, _ groupBy: GroupBy? = nil, _ queryClauses: FetchClause...) -> ManagedObjectListController<T> {
+    public static func monitorList<T: NSManagedObject>(from: From<T>, _ queryClauses: FetchClause...) -> ListMonitor<T> {
        
-        return self.defaultStack.observeObjectList(from, queryClauses)
+        return self.defaultStack.monitorList(from, queryClauses)
    }
    
    /**
-    Using the `defaultStack`, creates a `ManagedObjectListController` for a list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public static func observeObjectList<T: NSManagedObject>(from: From<T>, _ groupBy: GroupBy? = nil, _ queryClauses: [FetchClause]) -> ManagedObjectListController<T> {
+    public static func monitorList<T: NSManagedObject>(from: From<T>, _ queryClauses: [FetchClause]) -> ListMonitor<T> {
        
-        return self.defaultStack.observeObjectList(from, queryClauses)
+        return self.defaultStack.monitorList(from, queryClauses)
    }
    
    /**
-    Using the `defaultStack`, creates a `ManagedObjectListController` for a sectioned list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: sectionedBy a `SectionedBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public static func observeSectionedList<T: NSManagedObject>(from: From<T>, _ sectionedBy: SectionedBy, _ fetchClauses: FetchClause...) -> ManagedObjectListController<T> {
+    public static func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
        
-        return self.defaultStack.observeSectionedList(from, sectionedBy, fetchClauses)
+        return self.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
    }
    
    /**
-    Using the `defaultStack`, creates a `ManagedObjectListController` for a sectioned list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: sectionedBy a `SectionedBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public static func observeSectionedList<T: NSManagedObject>(from: From<T>, _ sectionedBy: SectionedBy, _ fetchClauses: [FetchClause]) -> ManagedObjectListController<T> {
+    public static func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
        
-        return self.defaultStack.observeSectionedList(from, sectionedBy, fetchClauses)
+        return self.defaultStack.monitorSectionedList(from, sectionBy, fetchClauses)
    }
 }
--- a/CoreStore/Observing/DataStack+Observing.swift
+++ b/CoreStore/Observing/DataStack+Observing.swift
@@ -35,81 +35,98 @@ public extension DataStack {
    // MARK: Public
    
    /**
-    Creates a `ManagedObjectController` for the specified `NSManagedObject`. Multiple `ManagedObjectObserver`'s may then register themselves to be notified when changes are made to the `NSManagedObject`.
+    Creates a `ObjectMonitor` for the specified `NSManagedObject`. Multiple `ObjectObserver`s may then register themselves to be notified when changes are made to the `NSManagedObject`.
    
-    :param: object the `NSManagedObject` to observe changes from
-    :returns: a `ManagedObjectController` that monitors changes to `object`
+    - parameter object: the `NSManagedObject` to observe changes from
+    - returns: a `ObjectMonitor` that monitors changes to `object`
    */
-    public func observeObject<T: NSManagedObject>(object: T) -> ManagedObjectController<T> {
+    public func monitorObject<T: NSManagedObject>(object: T) -> ObjectMonitor<T> {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
        
-        return ManagedObjectController(
+        return ObjectMonitor(
            dataStack: self,
            object: object
        )
    }
    
    /**
-    Creates a `ManagedObjectListController` for a list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public func observeObjectList<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> ManagedObjectListController<T> {
+    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
        
-        return self.observeObjectList(from, fetchClauses)
+        return self.monitorList(from, fetchClauses)
    }
    
    /**
-    Creates a `ManagedObjectListController` for a list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public func observeObjectList<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> ManagedObjectListController<T> {
+    public func monitorList<T: NSManagedObject>(from: From<T>, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
        
-        return ManagedObjectListController(
+        return ListMonitor(
            dataStack: self,
            from: from,
-            sectionedBy: nil,
+            sectionBy: nil,
            fetchClauses: fetchClauses
        )
    }
    
    /**
-    Creates a `ManagedObjectListController` for a sectioned list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: sectionedBy a `SectionedBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public func observeSectionedList<T: NSManagedObject>(from: From<T>, _ sectionedBy: SectionedBy, _ fetchClauses: FetchClause...) -> ManagedObjectListController<T> {
+    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: FetchClause...) -> ListMonitor<T> {
     
-        return self.observeSectionedList(from, sectionedBy, fetchClauses)
+        return self.monitorSectionedList(from, sectionBy, fetchClauses)
    }
    
    /**
-    Creates a `ManagedObjectListController` for a sectioned list of `NSManagedObject`'s that satisfy the specified fetch clauses. Multiple `ManagedObjectListObserver`'s may then register themselves to be notified when changes are made 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.
    
-    :param: from a `From` clause indicating the entity type
-    :param: sectionedBy a `SectionedBy` clause indicating the keyPath for the attribute to use when sorting the list into sections.
-    :param: fetchClauses a series of `FetchClause` instances for fetching the object list. Accepts `Where`, `OrderBy`, and `Tweak` clauses.
-    :returns: a `ManagedObjectListController` instance that monitors changes 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
    */
-    public func observeSectionedList<T: NSManagedObject>(from: From<T>, _ sectionedBy: SectionedBy, _ fetchClauses: [FetchClause]) -> ManagedObjectListController<T> {
+    public func monitorSectionedList<T: NSManagedObject>(from: From<T>, _ sectionBy: SectionBy, _ fetchClauses: [FetchClause]) -> ListMonitor<T> {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to observe objects from \(typeName(self)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to observe objects from \(typeName(self)) outside the main thread."
+        )
+        CoreStore.assert(
+            fetchClauses.filter { $0 is OrderBy }.count > 0,
+            "A ListMonitor requires an OrderBy clause."
+        )
        
-        return ManagedObjectListController(
+        return ListMonitor(
            dataStack: self,
            from: from,
-            sectionedBy: sectionedBy,
+            sectionBy: sectionBy,
            fetchClauses: fetchClauses
        )
    }
--- a/CoreStore/Observing/ManagedObjectListController.swift
+++ b/CoreStore/Observing/ManagedObjectListController.swift
@@ -1,5 +1,5 @@
 //
-//  ManagedObjectListController.swift
+//  ListMonitor.swift
 //  CoreStore
 //
 //  Copyright (c) 2015 John Rommel Estropia
@@ -28,108 +28,111 @@ import CoreData
 import GCDKit


-// MARK: - SectionedBy
+// MARK: - ListMonitor

 /**
-The `SectionedBy` clause indicates the key path to use to group the `ManagedObjectListController` objects into sections. An optional closure can also be provided to transform the value into an appropriate section name:
+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 listController = CoreStore.observeSectionedList(
-        From(MyPersonEntity),
-        SectionedBy("age") { "Age \($0)" },
-        OrderBy(.Ascending("lastName"))
-    )
-*/
-public struct SectionedBy {
-    
-    // MARK: Public
-    
-    /**
-    Initializes a `SectionedBy` clause with the key path to use to group `ManagedObjectListController` objects into sections
-    
-    :param: sectionKeyPath the key path to use to group the objects into sections
-    */
-    public init(_ sectionKeyPath: KeyPath) {
-        
-        self.init(sectionKeyPath, { $0 })
-    }
-    
-    /**
-    Initializes a `SectionedBy` clause with the key path to use to group `ManagedObjectListController` objects into sections, and a closure to transform the value for the key path to an appropriate section name
-    
-    :param: sectionKeyPath the key path to use to group the objects into sections
-    :param: 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
-        self.sectionIndexTransformer = sectionIndexTransformer
-    }
-    
-    
-    // MARK: Internal
-    
-    internal let sectionKeyPath: KeyPath
-    internal let sectionIndexTransformer: (sectionName: KeyPath?) -> String?
-}
-
-
-// MARK: - ManagedObjectListController
-
-/**
-The `ManagedObjectListController` monitors changes to a list of `NSManagedObject` instances. Observers that implement the `ManagedObjectListChangeObserver` protocol may then register themselves to the `ManagedObjectListController`'s `addObserver(_:)` method:
-
-    let listController = CoreStore.observeObjectList(
+    let monitor = CoreStore.monitorList(
        From(MyPersonEntity),
        Where("title", isEqualTo: "Engineer"),
        OrderBy(.Ascending("lastName"))
    )
-    listController.addObserver(self)
+    monitor.addObserver(self)

-The `ManagedObjectListController` instance needs to be held on (retained) for as long as the list needs to be observed.
-Observers registered via `addObserver(_:)` are not retained. `ManagedObjectListController` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+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 `observeObjectList(...)` keep a single-section list of objects, where each object can be accessed by index:
+Lists created with `monitorList(...)` keep a single-section list of objects, where each object can be accessed by index:

-    let firstPerson: MyPersonEntity = listController[0]
+    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 `observeSectionedList(...)` method:
+Creating a sectioned-list is also possible with the `monitorSectionedList(...)` method:

-    let listController = CoreStore.observeSectionedList(
+    let monitor = CoreStore.monitorSectionedList(
        From(MyPersonEntity),
-        SectionedBy("age") { "Age \($0)" },
+        SectionBy("age") { "Age \($0)" },
        Where("title", isEqualTo: "Engineer"),
        OrderBy(.Ascending("lastName"))
    )
-    listController.addObserver(self)
+    monitor.addObserver(self)

-Objects from `ManagedObjectListController`'s created this way can be accessed either by an `NSIndexPath` or a tuple:
+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 = listController[indexPath]
-    let person2 = listController[2, 3]
+    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.
 */
-public final class ManagedObjectListController<T: NSManagedObject> {
+public final class ListMonitor<T: NSManagedObject> {
    
    // MARK: Public
    
    /**
-    Accesses the object at the given index within the first section. This subscript indexer is typically used for `ManagedObjectListController`'s created with `addObserver(_:)`.
+    Returns the object at the given index within the first section. This subscript indexer is typically used for `ListMonitor`s created with `monitorList(_:)`.
    
-    :param: index the index of the object. Using an index above the valid range will throw an exception.
+    - 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.fetchedResultsController.objectAtIndexPath(NSIndexPath(forItem: index, inSection: 0)) as! T
+        return self[0, index]
    }
    
    /**
-    Accesses the object at the given `NSIndexPath`. This subscript indexer is typically used for `ManagedObjectListController`'s created with `observeSectionedList(_:)`.
+    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(_:)`.
    
-    :param: indexPath the `NSIndexPath` for the object. Using an `indexPath` with an invalid range will throw an exception.
+    - 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
+    */
+    public subscript(sectionIndex: Int, itemIndex: Int) -> T {
+        
+        return self[NSIndexPath(forItem: itemIndex, inSection: sectionIndex)]
+    }
+    
+    /**
+    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? {
+        
+        guard let sections = self.fetchedResultsController.sections
+            where sectionIndex < sections.count else {
+                
+                return nil
+        }
+        
+        let section = sections[sectionIndex]
+        guard itemIndex < section.numberOfObjects else {
+            
+            return nil
+        }
+        return sections[sectionIndex].objects?[itemIndex] as? T
+    }
+    
+    /**
+    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 {
        
@@ -137,139 +140,240 @@ public final class ManagedObjectListController<T: NSManagedObject> {
    }
    
    /**
-    Accesses the object at the given `sectionIndex` and `itemIndex`. This subscript indexer is typically used for `ManagedObjectListController`'s created with `observeSectionedList(_:)`.
+    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(_:)`.
    
-    :param: sectionIndex the section index for the object. Using a `sectionIndex` with an invalid range will throw an exception.
-    :param: itemIndex the index for the object within the section. Using an `itemIndex` with an invalid range will throw an exception.
+    - 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(sectionIndex: Int, itemIndex: Int) -> T {
+    public subscript(safeIndexPath indexPath: NSIndexPath) -> T? {
        
-        return self.fetchedResultsController.objectAtIndexPath(NSIndexPath(forItem: itemIndex, inSection: sectionIndex)) as! T
+        return self[safeSectionIndex: indexPath.section, safeItemIndex: indexPath.item]
+    }
+    
+    /**
+    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
+    */
+    public func hasObjects() -> Bool {
+        
+        return self.numberOfObjects() > 0
+    }
+    
+    /**
+    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
+    */
+    public func hasObjectsInSection(section: Int) -> Bool {
+        
+        return self.numberOfObjectsInSection(safeSectionIndex: section) > 0
+    }
+    
+    /**
+    Returns all objects in all sections
+    
+    - returns: all objects in all sections
+    */
+    public func objectsInAllSections() -> [T] {
+        
+        return (self.fetchedResultsController.fetchedObjects as? [T]) ?? []
+    }
+    
+    /**
+    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
+    */
+    public func objectsInSection(section: Int) -> [T] {
+        
+        return (self.fetchedResultsController.sections?[section].objects as? [T]) ?? []
+    }
+    
+    /**
+    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
+    */
+    public func objectsInSection(safeSectionIndex section: Int) -> [T]? {
+        
+        return (self.fetchedResultsController.sections?[section].objects as? [T]) ?? []
    }
    
    /**
    Returns the number of sections
+    
+    - returns: the number of sections
    */
    public func numberOfSections() -> Int {
        
        return self.fetchedResultsController.sections?.count ?? 0
    }
    
+    /**
+    Returns the number of objects in all sections
+    
+    - returns: the number of objects in all sections
+    */
+    public func numberOfObjects() -> Int {
+        
+        return self.fetchedResultsController.fetchedObjects?.count ?? 0
+    }
+    
    /**
    Returns the number of objects in the specified section
    
-    :param: section the section index
+    - 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
    */
    public func numberOfObjectsInSection(section: Int) -> Int {
        
-        return (self.fetchedResultsController.sections?[section] as? NSFetchedResultsSectionInfo)?.numberOfObjects ?? 0
+        return self.sectionInfoAtIndex(section).numberOfObjects
+    }
+    
+    /**
+    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
+    */
+    public func numberOfObjectsInSection(safeSectionIndex section: Int) -> Int? {
+        
+        return self.sectionInfoAtIndex(safeSectionIndex: section)?.numberOfObjects
    }
    
    /**
    Returns the `NSFetchedResultsSectionInfo` for the specified section
    
-    :param: section the section index
+    - parameter section: the section index. Using an index outside the valid range will throw an exception.
+    - returns: the `NSFetchedResultsSectionInfo` for the specified section
    */
    public func sectionInfoAtIndex(section: Int) -> NSFetchedResultsSectionInfo {
        
-        return self.fetchedResultsController.sections![section] as! NSFetchedResultsSectionInfo
+        return self.fetchedResultsController.sections![section]
    }
    
    /**
-    Registers a `ManagedObjectListChangeObserver` to be notified when changes to the receiver's list occur.
+    Returns the `NSFetchedResultsSectionInfo` for the specified section, or `nil` if out of bounds.
    
-    To prevent retain-cycles, `ManagedObjectListController` only keeps `weak` references to its observers.
+    - 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.
+    */
+    public func sectionInfoAtIndex(safeSectionIndex section: Int) -> NSFetchedResultsSectionInfo? {
+        
+        guard let sections = self.fetchedResultsController.sections
+            where section < sections.count else {
+                
+                return nil
+        }
+        
+        return sections[section]
+    }
+    
+    /**
+    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 `ManagedObjectListController` unregisters previous notifications to the observer before re-registering them.
+    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
    
-    :param: observer a `ManagedObjectListChangeObserver` to send change notifications to
+    - parameter observer: a `ListObserver` to send change notifications to
    */
-    public func addObserver<U: ManagedObjectListChangeObserver where U.EntityType == T>(observer: U) {
+    public func addObserver<U: ListObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to add an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        self.removeObserver(observer)
        
        self.registerChangeNotification(
            &NotificationKey.willChangeList,
-            name: ManagedObjectListControllerWillChangeListNotification,
+            name: ListMonitorWillChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListWillChange(listController)
+                    observer.listMonitorWillChange(monitor)
                }
            }
        )
        self.registerChangeNotification(
            &NotificationKey.didChangeList,
-            name: ManagedObjectListControllerDidChangeListNotification,
+            name: ListMonitorDidChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListDidChange(listController)
+                    observer.listMonitorDidChange(monitor)
                }
            }
        )
    }
    
    /**
-    Registers a `ManagedObjectListObjectObserver` to be notified when changes to the receiver's list occur.
+    Registers a `ListObjectObserver` to be notified when changes to the receiver's list occur.
    
-    To prevent retain-cycles, `ManagedObjectListController` only keeps `weak` references to its observers.
+    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 `ManagedObjectListController` unregisters previous notifications to the observer before re-registering them.
+    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
    
-    :param: observer a `ManagedObjectListObjectObserver` to send change notifications to
+    - parameter observer: a `ListObjectObserver` to send change notifications to
    */
-    public func addObserver<U: ManagedObjectListObjectObserver where U.EntityType == T>(observer: U) {
+    public func addObserver<U: ListObjectObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to add an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        self.removeObserver(observer)
        
        self.registerChangeNotification(
            &NotificationKey.willChangeList,
-            name: ManagedObjectListControllerWillChangeListNotification,
+            name: ListMonitorWillChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListWillChange(listController)
+                    observer.listMonitorWillChange(monitor)
                }
            }
        )
        self.registerChangeNotification(
            &NotificationKey.didChangeList,
-            name: ManagedObjectListControllerDidChangeListNotification,
+            name: ListMonitorDidChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListDidChange(listController)
+                    observer.listMonitorDidChange(monitor)
                }
            }
        )
        
        self.registerObjectNotification(
            &NotificationKey.didInsertObject,
-            name: ManagedObjectListControllerDidInsertObjectNotification,
+            name: ListMonitorDidInsertObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didInsertObject: object,
                        toIndexPath: newIndexPath!
                    )
@@ -278,14 +382,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didDeleteObject,
-            name: ManagedObjectListControllerDidDeleteObjectNotification,
+            name: ListMonitorDidDeleteObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didDeleteObject: object,
                        fromIndexPath: indexPath!
                    )
@@ -294,14 +398,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didUpdateObject,
-            name: ManagedObjectListControllerDidUpdateObjectNotification,
+            name: ListMonitorDidUpdateObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didUpdateObject: object,
                        atIndexPath: indexPath!
                    )
@@ -310,14 +414,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didMoveObject,
-            name: ManagedObjectListControllerDidMoveObjectNotification,
+            name: ListMonitorDidMoveObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didMoveObject: object,
                        fromIndexPath: indexPath!,
                        toIndexPath: newIndexPath!
@@ -328,57 +432,60 @@ public final class ManagedObjectListController<T: NSManagedObject> {
    }
    
    /**
-    Registers a `ManagedObjectListSectionObserver` to be notified when changes to the receiver's list occur.
+    Registers a `ListSectionObserver` to be notified when changes to the receiver's list occur.
    
-    To prevent retain-cycles, `ManagedObjectListController` only keeps `weak` references to its observers.
+    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 `ManagedObjectListController` unregisters previous notifications to the observer before re-registering them.
+    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ListMonitor` unregisters previous notifications to the observer before re-registering them.
    
-    :param: observer a `ManagedObjectListSectionObserver` to send change notifications to
+    - parameter observer: a `ListSectionObserver` to send change notifications to
    */
-    public func addObserver<U: ManagedObjectListSectionObserver where U.EntityType == T>(observer: U) {
+    public func addObserver<U: ListSectionObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to add an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        self.removeObserver(observer)
        
        self.registerChangeNotification(
            &NotificationKey.willChangeList,
-            name: ManagedObjectListControllerWillChangeListNotification,
+            name: ListMonitorWillChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListWillChange(listController)
+                    observer.listMonitorWillChange(monitor)
                }
            }
        )
        self.registerChangeNotification(
            &NotificationKey.didChangeList,
-            name: ManagedObjectListControllerDidChangeListNotification,
+            name: ListMonitorDidChangeListNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectListDidChange(listController)
+                    observer.listMonitorDidChange(monitor)
                }
            }
        )
        
        self.registerObjectNotification(
            &NotificationKey.didInsertObject,
-            name: ManagedObjectListControllerDidInsertObjectNotification,
+            name: ListMonitorDidInsertObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didInsertObject: object,
                        toIndexPath: newIndexPath!
                    )
@@ -387,14 +494,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didDeleteObject,
-            name: ManagedObjectListControllerDidDeleteObjectNotification,
+            name: ListMonitorDidDeleteObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didDeleteObject: object,
                        fromIndexPath: indexPath!
                    )
@@ -403,14 +510,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didUpdateObject,
-            name: ManagedObjectListControllerDidUpdateObjectNotification,
+            name: ListMonitorDidUpdateObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didUpdateObject: object,
                        atIndexPath: indexPath!
                    )
@@ -419,14 +526,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerObjectNotification(
            &NotificationKey.didMoveObject,
-            name: ManagedObjectListControllerDidMoveObjectNotification,
+            name: ListMonitorDidMoveObjectNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, object, indexPath, newIndexPath) -> Void in
+            callback: { [weak observer] (monitor, object, indexPath, newIndexPath) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didMoveObject: object,
                        fromIndexPath: indexPath!,
                        toIndexPath: newIndexPath!
@@ -437,14 +544,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        
        self.registerSectionNotification(
            &NotificationKey.didInsertSection,
-            name: ManagedObjectListControllerDidInsertSectionNotification,
+            name: ListMonitorDidInsertSectionNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, sectionInfo, sectionIndex) -> Void in
+            callback: { [weak observer] (monitor, sectionInfo, sectionIndex) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didInsertSection: sectionInfo,
                        toSectionIndex: sectionIndex
                    )
@@ -453,14 +560,14 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
        self.registerSectionNotification(
            &NotificationKey.didDeleteSection,
-            name: ManagedObjectListControllerDidDeleteSectionNotification,
+            name: ListMonitorDidDeleteSectionNotification,
            toObserver: observer,
-            callback: { [weak observer] (listController, sectionInfo, sectionIndex) -> Void in
+            callback: { [weak observer] (monitor, sectionInfo, sectionIndex) -> Void in
                
                if let observer = observer {
                    
-                    observer.managedObjectList(
-                        listController,
+                    observer.listMonitor(
+                        monitor,
                        didDeleteSection: sectionInfo,
                        fromSectionIndex: sectionIndex
                    )
@@ -470,15 +577,18 @@ public final class ManagedObjectListController<T: NSManagedObject> {
    }
    
    /**
-    Unregisters a `ManagedObjectListChangeObserver` from receiving notifications for changes to the receiver's list.
+    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.
    
-    :param: observer a `ManagedObjectListChangeObserver` to unregister notifications to
+    - parameter observer: a `ListObserver` to unregister notifications to
    */
-    public func removeObserver<U: ManagedObjectListChangeObserver where U.EntityType == T>(observer: U) {
+    public func removeObserver<U: ListObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to remove an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        let nilValue: AnyObject? = nil
        setAssociatedRetainedObject(nilValue, forKey: &NotificationKey.willChangeList, inObject: observer)
@@ -496,7 +606,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
    
    // MARK: Internal
    
-    internal init(dataStack: DataStack, from: From<T>, sectionedBy: SectionedBy?, fetchClauses: [FetchClause]) {
+    internal init(dataStack: DataStack, from: From<T>, sectionBy: SectionBy?, fetchClauses: [FetchClause]) {
        
        let context = dataStack.mainContext
        
@@ -514,7 +624,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        let fetchedResultsController = NSFetchedResultsController(
            fetchRequest: fetchRequest,
            managedObjectContext: context,
-            sectionNameKeyPath: sectionedBy?.sectionKeyPath,
+            sectionNameKeyPath: sectionBy?.sectionKeyPath,
            cacheName: nil
        )
        
@@ -524,7 +634,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        self.fetchedResultsControllerDelegate = fetchedResultsControllerDelegate
        self.parentStack = dataStack
        
-        if let sectionIndexTransformer = sectionedBy?.sectionIndexTransformer {
+        if let sectionIndexTransformer = sectionBy?.sectionIndexTransformer {
            
            self.sectionIndexTransformer = sectionIndexTransformer
        }
@@ -533,17 +643,9 @@ public final class ManagedObjectListController<T: NSManagedObject> {
            self.sectionIndexTransformer = { $0 }
        }
        
-        
        fetchedResultsControllerDelegate.handler = self
        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
-        
-        var error: NSError?
-        if !fetchedResultsController.performFetch(&error) {
-            
-            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed to perform fetch on <\(NSFetchedResultsController.self)>.")
-        }
+        try! fetchedResultsController.performFetch()
    }
    
    
@@ -554,7 +656,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
    private let sectionIndexTransformer: (sectionName: KeyPath?) -> String?
    private weak var parentStack: DataStack?
    
-    private func registerChangeNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (listController: ManagedObjectListController<T>) -> Void) {
+    private func registerChangeNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (monitor: ListMonitor<T>) -> Void) {
        
        setAssociatedRetainedObject(
            NotificationObserver(
@@ -564,7 +666,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
                    
                    if let strongSelf = self {
                        
-                        callback(listController: strongSelf)
+                        callback(monitor: strongSelf)
                    }
                }
            ),
@@ -573,7 +675,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
    }
    
-    private func registerObjectNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (listController: ManagedObjectListController<T>, object: T, indexPath: NSIndexPath?, newIndexPath: NSIndexPath?) -> Void) {
+    private func registerObjectNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (monitor: ListMonitor<T>, object: T, indexPath: NSIndexPath?, newIndexPath: NSIndexPath?) -> Void) {
        
        setAssociatedRetainedObject(
            NotificationObserver(
@@ -586,7 +688,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
                        let object = userInfo[UserInfoKeyObject] as? T {
                            
                            callback(
-                                listController: strongSelf,
+                                monitor: strongSelf,
                                object: object,
                                indexPath: userInfo[UserInfoKeyIndexPath] as? NSIndexPath,
                                newIndexPath: userInfo[UserInfoKeyNewIndexPath] as? NSIndexPath
@@ -599,7 +701,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
        )
    }
    
-    private func registerSectionNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (listController: ManagedObjectListController<T>, sectionInfo: NSFetchedResultsSectionInfo, sectionIndex: Int) -> Void) {
+    private func registerSectionNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (monitor: ListMonitor<T>, sectionInfo: NSFetchedResultsSectionInfo, sectionIndex: Int) -> Void) {
        
        setAssociatedRetainedObject(
            NotificationObserver(
@@ -613,7 +715,7 @@ public final class ManagedObjectListController<T: NSManagedObject> {
                        let sectionIndex = (userInfo[UserInfoKeySectionIndex] as? NSNumber)?.integerValue {
                            
                            callback(
-                                listController: strongSelf,
+                                monitor: strongSelf,
                                sectionInfo: sectionInfo,
                                sectionIndex: sectionIndex
                            )
@@ -627,9 +729,19 @@ public final class ManagedObjectListController<T: NSManagedObject> {
 }


-// MARK: - ManagedObjectListController: FetchedResultsControllerHandler
+// MARK: - ListMonitor: Equatable

-extension ManagedObjectListController: FetchedResultsControllerHandler {
+public func ==<T: NSManagedObject>(lhs: ListMonitor<T>, rhs: ListMonitor<T>) -> Bool {
+    
+    return lhs === rhs
+}
+
+extension ListMonitor: Equatable { }
+
+
+// MARK: - ListMonitor: FetchedResultsControllerHandler
+
+extension ListMonitor: FetchedResultsControllerHandler {
    
    // MARK: FetchedResultsControllerHandler
    
@@ -639,7 +751,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Insert:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidInsertObjectNotification,
+                ListMonitorDidInsertObjectNotification,
                object: self,
                userInfo: [
                    UserInfoKeyObject: anObject,
@@ -649,7 +761,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Delete:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidDeleteObjectNotification,
+                ListMonitorDidDeleteObjectNotification,
                object: self,
                userInfo: [
                    UserInfoKeyObject: anObject,
@@ -659,7 +771,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Update:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidUpdateObjectNotification,
+                ListMonitorDidUpdateObjectNotification,
                object: self,
                userInfo: [
                    UserInfoKeyObject: anObject,
@@ -669,7 +781,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Move:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidMoveObjectNotification,
+                ListMonitorDidMoveObjectNotification,
                object: self,
                userInfo: [
                    UserInfoKeyObject: anObject,
@@ -686,7 +798,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Insert:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidInsertSectionNotification,
+                ListMonitorDidInsertSectionNotification,
                object: self,
                userInfo: [
                    UserInfoKeySectionInfo: sectionInfo,
@@ -696,7 +808,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
            
        case .Delete:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidDeleteSectionNotification,
+                ListMonitorDidDeleteSectionNotification,
                object: self,
                userInfo: [
                    UserInfoKeySectionInfo: sectionInfo,
@@ -712,7 +824,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
    private func controllerWillChangeContent(controller: NSFetchedResultsController) {
        
        NSNotificationCenter.defaultCenter().postNotificationName(
-            ManagedObjectListControllerWillChangeListNotification,
+            ListMonitorWillChangeListNotification,
            object: self
        )
    }
@@ -720,7 +832,7 @@ extension ManagedObjectListController: FetchedResultsControllerHandler {
    private func controllerDidChangeContent(controller: NSFetchedResultsController) {
        
        NSNotificationCenter.defaultCenter().postNotificationName(
-            ManagedObjectListControllerDidChangeListNotification,
+            ListMonitorDidChangeListNotification,
            object: self
        )
    }
@@ -750,31 +862,31 @@ private protocol FetchedResultsControllerHandler: class {

 // MARK: - FetchedResultsControllerDelegate

-private final class FetchedResultsControllerDelegate: NSFetchedResultsControllerDelegate {
+private final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
    
    // MARK: NSFetchedResultsControllerDelegate
    
-    @objc func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    @objc dynamic func controllerWillChangeContent(controller: NSFetchedResultsController) {
        
        self.handler?.controllerWillChangeContent(controller)
    }
    
-    @objc func controllerDidChangeContent(controller: NSFetchedResultsController) {
+    @objc dynamic func controllerDidChangeContent(controller: NSFetchedResultsController) {
        
        self.handler?.controllerDidChangeContent(controller)
    }
    
-    @objc func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    @objc dynamic func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
        
        self.handler?.controller(controller, didChangeObject: anObject, atIndexPath: indexPath, forChangeType: type, newIndexPath: newIndexPath)
    }
    
-    @objc func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
+    @objc dynamic func controller(controller: NSFetchedResultsController, didChangeSection sectionInfo: NSFetchedResultsSectionInfo, atIndex sectionIndex: Int, forChangeType type: NSFetchedResultsChangeType) {
        
        self.handler?.controller(controller, didChangeSection: sectionInfo, atIndex: sectionIndex, forChangeType: type)
    }
    
-    @objc func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String?) -> String? {
+    @objc dynamic func controller(controller: NSFetchedResultsController, sectionIndexTitleForSectionName sectionName: String) -> String? {
        
        return self.handler?.controller(controller, sectionIndexTitleForSectionName: sectionName)
    }
@@ -799,16 +911,16 @@ private final class FetchedResultsControllerDelegate: NSFetchedResultsController
 }


-private let ManagedObjectListControllerWillChangeListNotification = "ManagedObjectListControllerWillChangeListNotification"
-private let ManagedObjectListControllerDidChangeListNotification = "ManagedObjectListControllerDidChangeListNotification"
+private let ListMonitorWillChangeListNotification = "ListMonitorWillChangeListNotification"
+private let ListMonitorDidChangeListNotification = "ListMonitorDidChangeListNotification"

-private let ManagedObjectListControllerDidInsertObjectNotification = "ManagedObjectListControllerDidInsertObjectNotification"
-private let ManagedObjectListControllerDidDeleteObjectNotification = "ManagedObjectListControllerDidDeleteObjectNotification"
-private let ManagedObjectListControllerDidUpdateObjectNotification = "ManagedObjectListControllerDidUpdateObjectNotification"
-private let ManagedObjectListControllerDidMoveObjectNotification = "ManagedObjectListControllerDidMoveObjectNotification"
+private let ListMonitorDidInsertObjectNotification = "ListMonitorDidInsertObjectNotification"
+private let ListMonitorDidDeleteObjectNotification = "ListMonitorDidDeleteObjectNotification"
+private let ListMonitorDidUpdateObjectNotification = "ListMonitorDidUpdateObjectNotification"
+private let ListMonitorDidMoveObjectNotification = "ListMonitorDidMoveObjectNotification"

-private let ManagedObjectListControllerDidInsertSectionNotification = "ManagedObjectListControllerDidInsertSectionNotification"
-private let ManagedObjectListControllerDidDeleteSectionNotification = "ManagedObjectListControllerDidDeleteSectionNotification"
+private let ListMonitorDidInsertSectionNotification = "ListMonitorDidInsertSectionNotification"
+private let ListMonitorDidDeleteSectionNotification = "ListMonitorDidDeleteSectionNotification"

 private let UserInfoKeyObject = "UserInfoKeyObject"
 private let UserInfoKeyIndexPath = "UserInfoKeyIndexPath"
--- a/CoreStore/Observing/ListObserver.swift
+++ b/CoreStore/Observing/ListObserver.swift
@@ -0,0 +1,196 @@
+//
+//  ListObserver.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - 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)
+*/
+public protocol ListObserver: class {
+    
+    /**
+    The `NSManagedObject` type for the observed list
+    */
+    typealias EntityType: NSManagedObject
+    
+    /**
+    Handles processing just before a change to the observed list occurs
+    
+    - parameter monitor: the `ListMonitor` monitoring the list being observed
+    */
+    func listMonitorWillChange(monitor: ListMonitor<EntityType>)
+    
+    /**
+    Handles processing right after a change to the observed list occurs
+    
+    - parameter monitor: the `ListMonitor` monitoring the object being observed
+    */
+    func listMonitorDidChange(monitor: ListMonitor<EntityType>)
+}
+
+public extension ListObserver {
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitorWillChange(monitor: ListMonitor<EntityType>) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitorDidChange(monitor: ListMonitor<EntityType>) { }
+}
+
+
+// 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)
+*/
+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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didInsertObject object: EntityType, 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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didDeleteObject object: EntityType, 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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didUpdateObject object: EntityType, 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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didMoveObject object: EntityType, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath)
+}
+
+public extension ListObjectObserver {
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didInsertObject object: EntityType, toIndexPath indexPath: NSIndexPath) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didDeleteObject object: EntityType, fromIndexPath indexPath: NSIndexPath) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didUpdateObject object: EntityType, atIndexPath indexPath: NSIndexPath) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didMoveObject object: EntityType, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) { }
+}
+
+
+// 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)
+*/
+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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, 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
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int)
+}
+
+public extension ListSectionObserver {
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func listMonitor(monitor: ListMonitor<EntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) { }
+}
--- a/CoreStore/Observing/ManagedObjectListObserver.swift
+++ b/CoreStore/Observing/ManagedObjectListObserver.swift
@@ -1,147 +0,0 @@
-//
-//  ManagedObjectListObserver.swift
-//  CoreStore
-//
-//  Copyright (c) 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
-//  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: - ManagedObjectListChangeObserver
-
-/**
-Implement the `ManagedObjectListChangeObserver` protocol to observe changes to a list of `NSManagedObject`'s. `ManagedObjectListChangeObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method:
-
-    let listController = CoreStore.observeObjectList(
-        From(MyPersonEntity),
-        OrderBy(.Ascending("lastName"))
-    )
-    listController.addObserver(self)
-*/
-public protocol ManagedObjectListChangeObserver: class {
-    
-    /**
-    The `NSManagedObject` type for the observed list
-    */
-    typealias EntityType: NSManagedObject
-    
-    /**
-    Handles processing just before a change to the observed list occurs
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    */
-    func managedObjectListWillChange(listController: ManagedObjectListController<EntityType>)
-    
-    /**
-    Handles processing right after a change to the observed list occurs
-    
-    :param: listController the `ManagedObjectListController` monitoring the object being observed
-    */
-    func managedObjectListDidChange(listController: ManagedObjectListController<EntityType>)
-}
-
-
-// MARK: - ManagedObjectListObjectObserver
-
-/**
-Implement the `ManagedObjectListObjectObserver` protocol to observe detailed changes to a list's object. `ManagedObjectListObjectObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method:
-
-    let listController = CoreStore.observeObjectList(
-        From(MyPersonEntity),
-        OrderBy(.Ascending("lastName"))
-    )
-    listController.addObserver(self)
-*/
-public protocol ManagedObjectListObjectObserver: ManagedObjectListChangeObserver {
-    
-    /**
-    Notifies that an object was inserted to the specified `NSIndexPath` in the list
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: object the entity type for the inserted object
-    :param: indexPath the new `NSIndexPath` for the inserted object
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didInsertObject object: EntityType, toIndexPath indexPath: NSIndexPath)
-    
-    /**
-    Notifies that an object was deleted from the specified `NSIndexPath` in the list
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: object the entity type for the deleted object
-    :param: indexPath the `NSIndexPath` for the deleted object
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didDeleteObject object: EntityType, fromIndexPath indexPath: NSIndexPath)
-    
-    /**
-    Notifies that an object at the specified `NSIndexPath` was updated
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: object the entity type for the updated object
-    :param: indexPath the `NSIndexPath` for the updated object
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didUpdateObject object: EntityType, atIndexPath indexPath: NSIndexPath)
-    
-    /**
-    Notifies that an object's index changed
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: object the entity type for the moved object
-    :param: fromIndexPath the previous `NSIndexPath` for the moved object
-    :param: toIndexPath the new `NSIndexPath` for the moved object
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didMoveObject object: EntityType, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath)
-}
-
-
-// MARK: - ManagedObjectListSectionObserver
-
-/**
-Implement the `ManagedObjectListSectionObserver` protocol to observe changes to a list's section info. `ManagedObjectListSectionObserver`'s may register themselves to a `ManagedObjectListController`'s `addObserver(_:)` method:
-
-    let listController = CoreStore.observeSectionedList(
-        From(MyPersonEntity),
-        SectionedBy("age") { "Age \($0)" },
-        OrderBy(.Ascending("lastName"))
-    )
-    listController.addObserver(self)
-*/
-public protocol ManagedObjectListSectionObserver: ManagedObjectListObjectObserver {
-    
-    /**
-    Notifies that a section was inserted at the specified index
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: sectionInfo the `NSFetchedResultsSectionInfo` for the inserted section
-    :param: sectionIndex the new section index for the new section
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int)
-    
-    /**
-    Notifies that a section was inserted at the specified index
-    
-    :param: listController the `ManagedObjectListController` monitoring the list being observed
-    :param: sectionInfo the `NSFetchedResultsSectionInfo` for the deleted section
-    :param: sectionIndex the previous section index for the deleted section
-    */
-    func managedObjectList(listController: ManagedObjectListController<EntityType>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int)
-}
--- a/CoreStore/Observing/ManagedObjectObserver.swift
+++ b/CoreStore/Observing/ManagedObjectObserver.swift
@@ -1,69 +0,0 @@
-//
-//  ManagedObjectObserver.swift
-//  CoreStore
-//
-//  Copyright (c) 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
-//  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: - ManagedObjectObserver
-
-/**
-Implement the `ManagedObjectObserver` protocol to observe changes to a single `NSManagedObject` instance. `ManagedObjectObserver`'s may register themselves to a `ManagedObjectController`'s `addObserver(_:)` method:
-
-    let objectController = CoreStore.observeObject(object)
-    objectController.addObserver(self)
-*/
-public protocol ManagedObjectObserver: class {
-    
-    /**
-    The `NSManagedObject` type for the observed object
-    */
-    typealias EntityType: NSManagedObject
-    
-    /**
-    Handles processing just before a change to the observed `object` occurs
-    
-    :param: objectController the `ManagedObjectController` monitoring the object being observed
-    :param: object the `NSManagedObject` instance being observed
-    */
-    func managedObjectWillUpdate(objectController: ManagedObjectController<EntityType>, object: EntityType)
-    
-    /**
-    Handles processing right after a change to the observed `object` occurs
-    
-    :param: objectController the `ManagedObjectController` monitoring the object being observed
-    :param: object the `NSManagedObject` instance being observed
-    :param: 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 managedObjectWasUpdated(objectController: ManagedObjectController<EntityType>, object: EntityType, changedPersistentKeys: Set<KeyPath>)
-    
-    /**
-    Handles processing right after `object` is deleted
-    
-    :param: objectController the `ManagedObjectController` monitoring the object being observed
-    :param: object the `NSManagedObject` instance being observed
-    */
-    func managedObjectWasDeleted(objectController: ManagedObjectController<EntityType>, object: EntityType)
-}
--- a/CoreStore/Observing/ManagedObjectController.swift
+++ b/CoreStore/Observing/ManagedObjectController.swift
@@ -1,5 +1,5 @@
 //
-//  ManagedObjectController.swift
+//  ObjectMonitor.swift
 //  CoreStore
 //
 //  Copyright (c) 2015 John Rommel Estropia
@@ -28,9 +28,9 @@ import CoreData
 import GCDKit


-private let ManagedObjectListControllerWillChangeObjectNotification = "ManagedObjectListControllerWillChangeObjectNotification"
-private let ManagedObjectListControllerDidDeleteObjectNotification = "ManagedObjectListControllerDidDeleteObjectNotification"
-private let ManagedObjectListControllerDidUpdateObjectNotification = "ManagedObjectListControllerDidUpdateObjectNotification"
+private let ObjectMonitorWillChangeObjectNotification = "ObjectMonitorWillChangeObjectNotification"
+private let ObjectMonitorDidDeleteObjectNotification = "ObjectMonitorDidDeleteObjectNotification"
+private let ObjectMonitorDidUpdateObjectNotification = "ObjectMonitorDidUpdateObjectNotification"

 private let UserInfoKeyObject = "UserInfoKeyObject"

@@ -42,19 +42,19 @@ private struct NotificationKey {
 }


-// MARK: - ManagedObjectController
+// MARK: - ObjectMonitor

 /**
-The `ManagedObjectController` monitors changes to a single `NSManagedObject` instance. Observers that implement the `ManagedObjectObserver` protocol may then register themselves to the `ManagedObjectController`'s `addObserver(_:)` method:
+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 objectController = CoreStore.observeObject(object)
-    objectController.addObserver(self)
+    let monitor = CoreStore.monitorObject(object)
+    monitor.addObserver(self)

-The created `ManagedObjectController` instance needs to be held on (retained) for as long as the object needs to be observed.
+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. `ManagedObjectController` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
+Observers registered via `addObserver(_:)` are not retained. `ObjectMonitor` only keeps a `weak` reference to all observers, thus keeping itself free from retain-cycles.
 */
-public final class ManagedObjectController<T: NSManagedObject> {
+public final class ObjectMonitor<T: NSManagedObject> {
    
    // MARK: Public
    
@@ -75,70 +75,73 @@ public final class ManagedObjectController<T: NSManagedObject> {
    }
    
    /**
-    Registers a `ManagedObjectObserver` to be notified when changes to the receiver's `object` are made.
+    Registers an `ObjectObserver` to be notified when changes to the receiver's `object` are made.
    
-    To prevent retain-cycles, `ManagedObjectController` only keeps `weak` references to its observers.
+    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 `ManagedObjectController` unregisters previous notifications to the observer before re-registering them.
+    Calling `addObserver(_:)` multiple times on the same observer is safe, as `ObjectMonitor` unregisters previous notifications to the observer before re-registering them.
    
-    :param: observer a `ManagedObjectObserver` to send change notifications to
+    - parameter observer: an `ObjectObserver` to send change notifications to
    */
-    public func addObserver<U: ManagedObjectObserver where U.EntityType == T>(observer: U) {
+    public func addObserver<U: ObjectObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to add an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to add an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        self.removeObserver(observer)
        
        self.registerChangeNotification(
            &NotificationKey.willChangeObject,
-            name: ManagedObjectListControllerWillChangeObjectNotification,
+            name: ObjectMonitorWillChangeObjectNotification,
            toObserver: observer,
-            callback: { [weak self, weak observer] (objectController) -> Void in
+            callback: { [weak observer] (monitor) -> Void in
                
-                if let strongSelf = self, let object = strongSelf.object, let observer = observer {
+                if let object = monitor.object, let observer = observer {
                    
-                    observer.managedObjectWillUpdate(objectController, object: object)
+                    observer.objectMonitor(monitor, willUpdateObject: object)
                }
            }
        )
        self.registerObjectNotification(
            &NotificationKey.didDeleteObject,
-            name: ManagedObjectListControllerDidDeleteObjectNotification,
+            name: ObjectMonitorDidDeleteObjectNotification,
            toObserver: observer,
-            callback: { [weak self, weak observer] (objectController, object) -> Void in
+            callback: { [weak observer] (monitor, object) -> Void in
                
-                if let strongSelf = self, let observer = observer {
+                if let observer = observer {
                    
-                    observer.managedObjectWasDeleted(objectController, object: object)
+                    observer.objectMonitor(monitor, didDeleteObject: object)
                }
            }
        )
        self.registerObjectNotification(
            &NotificationKey.didUpdateObject,
-            name: ManagedObjectListControllerDidUpdateObjectNotification,
+            name: ObjectMonitorDidUpdateObjectNotification,
            toObserver: observer,
-            callback: { [weak self, weak observer] (objectController, object) -> Void in
+            callback: { [weak self, weak observer] (monitor, object) -> Void in
                
                if let strongSelf = self, let observer = observer {
                    
                    let previousCommitedAttributes = strongSelf.lastCommittedAttributes
-                    let currentCommitedAttributes = object.committedValuesForKeys(nil) as! [NSString: NSObject]
+                    let currentCommitedAttributes = object.committedValuesForKeys(nil) as! [String: NSObject]
                    
-                    var changedKeys = Set<String>()
-                    for key in currentCommitedAttributes.keys {
+                    let changedKeys = currentCommitedAttributes.keys.reduce(Set<String>()) { (var changedKeys, key) -> Set<String> in
                        
                        if previousCommitedAttributes[key] != currentCommitedAttributes[key] {
                            
-                            changedKeys.insert(key as String)
+                            changedKeys.insert(key)
                        }
+                        return changedKeys
                    }
                    
                    strongSelf.lastCommittedAttributes = currentCommitedAttributes
-                    observer.managedObjectWasUpdated(
-                        objectController,
-                        object: object,
+                    observer.objectMonitor(
+                        monitor,
+                        didUpdateObject: object,
                        changedPersistentKeys: changedKeys
                    )
                }
@@ -147,15 +150,18 @@ public final class ManagedObjectController<T: NSManagedObject> {
    }
    
    /**
-    Unregisters a `ManagedObjectObserver` from receiving notifications for changes to the receiver's `object`.
+    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.
    
-    :param: observer a `ManagedObjectObserver` to unregister notifications to
+    - parameter observer: an `ObjectObserver` to unregister notifications to
    */
-    public func removeObserver<U: ManagedObjectObserver where U.EntityType == T>(observer: U) {
+    public func removeObserver<U: ObjectObserver where U.EntityType == T>(observer: U) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to remove an observer of type \(typeName(observer)) outside the main thread.")
+        CoreStore.assert(
+            NSThread.isMainThread(),
+            "Attempted to remove an observer of type \(typeName(observer)) outside the main thread."
+        )
        
        let nilValue: AnyObject? = nil
        setAssociatedRetainedObject(nilValue, forKey: &NotificationKey.willChangeObject, inObject: observer)
@@ -171,7 +177,8 @@ public final class ManagedObjectController<T: NSManagedObject> {
        let context = dataStack.mainContext
        
        let fetchRequest = NSFetchRequest()
-        fetchRequest.entity = context.entityDescriptionForEntityClass(T.self)
+        fetchRequest.entity = object.entity
+        
        fetchRequest.fetchLimit = 1
        fetchRequest.resultType = .ManagedObjectResultType
        fetchRequest.sortDescriptors = []
@@ -195,16 +202,9 @@ public final class ManagedObjectController<T: NSManagedObject> {
        
        fetchedResultsControllerDelegate.handler = self
        fetchedResultsControllerDelegate.fetchedResultsController = fetchedResultsController
+        try! fetchedResultsController.performFetch()
        
-        var error: NSError?
-        if !fetchedResultsController.performFetch(&error) {
-            
-            CoreStore.handleError(
-                error ?? NSError(coreStoreErrorCode: .UnknownError),
-                "Failed to perform fetch on <\(NSFetchedResultsController.self)>.")
-        }
-        
-        self.lastCommittedAttributes = (self.object?.committedValuesForKeys(nil) as? [NSString: NSObject]) ?? [:]
+        self.lastCommittedAttributes = (self.object?.committedValuesForKeys(nil) as? [String: NSObject]) ?? [:]
    }
    
    
@@ -213,10 +213,10 @@ public final class ManagedObjectController<T: NSManagedObject> {
    private let originalObjectID: NSManagedObjectID
    private let fetchedResultsController: NSFetchedResultsController
    private let fetchedResultsControllerDelegate: FetchedResultsControllerDelegate
-    private var lastCommittedAttributes = [NSString: NSObject]()
+    private var lastCommittedAttributes = [String: NSObject]()
    private weak var parentStack: DataStack?
    
-    private func registerChangeNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (objectController: ManagedObjectController<T>) -> Void) {
+    private func registerChangeNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (monitor: ObjectMonitor<T>) -> Void) {
        
        setAssociatedRetainedObject(
            NotificationObserver(
@@ -226,7 +226,7 @@ public final class ManagedObjectController<T: NSManagedObject> {
                    
                    if let strongSelf = self {
                        
-                        callback(objectController: strongSelf)
+                        callback(monitor: strongSelf)
                    }
                }
            ),
@@ -235,7 +235,7 @@ public final class ManagedObjectController<T: NSManagedObject> {
        )
    }
    
-    private func registerObjectNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (objectController: ManagedObjectController<T>, object: T) -> Void) {
+    private func registerObjectNotification(notificationKey: UnsafePointer<Void>, name: String, toObserver observer: AnyObject, callback: (monitor: ObjectMonitor<T>, object: T) -> Void) {
        
        setAssociatedRetainedObject(
            NotificationObserver(
@@ -248,7 +248,7 @@ public final class ManagedObjectController<T: NSManagedObject> {
                        let object = userInfo[UserInfoKeyObject] as? T {
                            
                            callback(
-                                objectController: strongSelf,
+                                monitor: strongSelf,
                                object: object
                            )
                    }
@@ -261,9 +261,19 @@ public final class ManagedObjectController<T: NSManagedObject> {
 }


-// MARK: - ManagedObjectController: FetchedResultsControllerHandler
+// MARK: - ObjectMonitor: Equatable

-extension ManagedObjectController: FetchedResultsControllerHandler {
+public func ==<T: NSManagedObject>(lhs: ObjectMonitor<T>, rhs: ObjectMonitor<T>) -> Bool {
+    
+    return lhs === rhs
+}
+
+extension ObjectMonitor: Equatable { }
+
+
+// MARK: - ObjectMonitor: FetchedResultsControllerHandler
+
+extension ObjectMonitor: FetchedResultsControllerHandler {
    
    // MARK: FetchedResultsControllerHandler
    
@@ -273,14 +283,14 @@ extension ManagedObjectController: FetchedResultsControllerHandler {
            
        case .Delete:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidDeleteObjectNotification,
+                ObjectMonitorDidDeleteObjectNotification,
                object: self,
                userInfo: [UserInfoKeyObject: anObject]
            )
            
        case .Update:
            NSNotificationCenter.defaultCenter().postNotificationName(
-                ManagedObjectListControllerDidUpdateObjectNotification,
+                ObjectMonitorDidUpdateObjectNotification,
                object: self,
                userInfo: [UserInfoKeyObject: anObject]
            )
@@ -293,7 +303,7 @@ extension ManagedObjectController: FetchedResultsControllerHandler {
    private func controllerWillChangeContent(controller: NSFetchedResultsController) {
        
        NSNotificationCenter.defaultCenter().postNotificationName(
-            ManagedObjectListControllerWillChangeObjectNotification,
+            ObjectMonitorWillChangeObjectNotification,
            object: self
        )
    }
@@ -312,16 +322,16 @@ private protocol FetchedResultsControllerHandler: class {

 // MARK: - FetchedResultsControllerDelegate

-private final class FetchedResultsControllerDelegate: NSFetchedResultsControllerDelegate {
+private final class FetchedResultsControllerDelegate: NSObject, NSFetchedResultsControllerDelegate {
    
    // MARK: NSFetchedResultsControllerDelegate
    
-    @objc func controllerWillChangeContent(controller: NSFetchedResultsController) {
+    @objc dynamic func controllerWillChangeContent(controller: NSFetchedResultsController) {
        
        self.handler?.controllerWillChangeContent(controller)
    }
    
-    @objc func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
+    @objc dynamic func controller(controller: NSFetchedResultsController, didChangeObject anObject: AnyObject, atIndexPath indexPath: NSIndexPath?, forChangeType type: NSFetchedResultsChangeType, newIndexPath: NSIndexPath?) {
        
        self.handler?.controller(controller, didChangeObject: anObject, atIndexPath: indexPath, forChangeType: type, newIndexPath: newIndexPath)
    }
--- a/CoreStore/Observing/ObjectObserver.swift
+++ b/CoreStore/Observing/ObjectObserver.swift
@@ -0,0 +1,88 @@
+//
+//  ObjectObserver.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - 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)
+*/
+public protocol ObjectObserver: class {
+    
+    /**
+    The `NSManagedObject` type for the observed object
+    */
+    typealias EntityType: 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
+    */
+    func objectMonitor(monitor: ObjectMonitor<EntityType>, willUpdateObject object: EntityType)
+    
+    /**
+    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<EntityType>, didUpdateObject object: EntityType, 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
+    */
+    func objectMonitor(monitor: ObjectMonitor<EntityType>, didDeleteObject object: EntityType)
+}
+
+
+public extension ObjectObserver {
+    
+    /**
+    The default implementation does nothing.
+    */
+    func objectMonitor(monitor: ObjectMonitor<EntityType>, willUpdateObject object: EntityType) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func objectMonitor(monitor: ObjectMonitor<EntityType>, didUpdateObject object: EntityType, changedPersistentKeys: Set<KeyPath>) { }
+    
+    /**
+    The default implementation does nothing.
+    */
+    func objectMonitor(monitor: ObjectMonitor<EntityType>, didDeleteObject object: EntityType) { }
+}
--- a/CoreStore/Observing/SectionBy.swift
+++ b/CoreStore/Observing/SectionBy.swift
@@ -0,0 +1,72 @@
+//
+//  SectionBy.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - 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"))
+    )
+*/
+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
+    */
+    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
+    */
+    public init(_ sectionKeyPath: KeyPath, _ sectionIndexTransformer: (sectionName: String?) -> String?) {
+        
+        self.sectionKeyPath = sectionKeyPath
+        self.sectionIndexTransformer = sectionIndexTransformer
+    }
+    
+    
+    // MARK: Internal
+    
+    internal let sectionKeyPath: KeyPath
+    internal let sectionIndexTransformer: (sectionName: KeyPath?) -> String?
+}
--- a/Processing/AsynchronousDataTransaction.swift
+++ b/Processing/AsynchronousDataTransaction.swift
@@ -38,14 +38,20 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    // MARK: Public
    
    /**
-    Saves the transaction changes asynchronously. This method should not be used after the `commit()` method was already called once.
+    Saves the transaction changes. This method should not be used after the `commit()` method was already called once.
    
-    :param: completion the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
+    - 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) {
+    public func commit(completion: (result: SaveResult) -> Void = { _ in }) {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to commit a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to commit a \(typeName(self)) more than once."
+        )
        
        self.isCommitted = true
        let semaphore = GCDSemaphore(0)
@@ -58,28 +64,22 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
        semaphore.wait()
    }
    
-    /**
-    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() {
-        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.")
-        
-        self.isCommitted = true
-        self.result = self.context.saveSynchronously()
-    }
-    
    /**
    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.
    
-    :param: 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
+    - 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(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to begin a child transaction from an already committed \(typeName(self))."
+        )
        
        return SynchronousDataTransaction(
            mainContext: self.context,
@@ -93,12 +93,15 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
    /**
    Creates a new `NSManagedObject` with the specified entity type.
    
-    :param: into the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    :returns: a new `NSManagedObject` instance of 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(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to create an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
        
        return super.create(into)
    }
@@ -106,34 +109,92 @@ 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.
    
-    :param: object the `NSManagedObject` type to be edited
-    :returns: an editable proxy for the specified `NSManagedObject`.
+    - parameter object: the `NSManagedObject` type to be edited
+    - returns: an editable proxy for the specified `NSManagedObject`.
    */
-    public override func fetch<T: NSManagedObject>(object: T?) -> T? {
+    public override func edit<T: NSManagedObject>(object: T?) -> T? {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
        
-        return super.fetch(object)
+        return super.edit(object)
+    }
+    
+    /**
+    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`.
+    */
+    public override func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
+        
+        return super.edit(into, objectID)
    }
    
    /**
    Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
    
-    :param: object the `NSManagedObject` type to be deleted
+    - parameter object: the `NSManagedObject` type to be deleted
    */
    public override func delete(object: NSManagedObject?) {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
        
        super.delete(object)
    }
    
+    /**
+    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(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
+        
+        super.delete([object1, object2] + objects)
+    }
+    
+    /**
+    Deletes the specified `NSManagedObject`s.
+    
+    - parameter objects: the `NSManagedObject`s type to be deleted
+    */
+    public override func delete(objects: [NSManagedObject?]) {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
+        
+        super.delete(objects)
+    }
+    
    /**
    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.
    */
    public override func rollback() {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to rollback an already committed \(typeName(self))."
+        )
        
        super.rollback()
    }
@@ -155,7 +216,10 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
            self.closure(transaction: self)
            if !self.isCommitted && self.hasChanges {
                
-                CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.")
+                CoreStore.log(
+                    .Warning,
+                    message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded."
+                )
            }
        }
    }
@@ -165,9 +229,13 @@ public final class AsynchronousDataTransaction: BaseDataTransaction {
        self.transactionQueue.sync {
            
            self.closure(transaction: self)
+            
            if !self.isCommitted && self.hasChanges {
                
-                CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.")
+                CoreStore.log(
+                    .Warning,
+                    message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded."
+                )
            }
        }
        return self.result
--- a/Processing/BaseDataTransaction.swift
+++ b/Processing/BaseDataTransaction.swift
@@ -28,86 +28,6 @@ import CoreData
 import GCDKit


-// 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
-*/
-public struct Into<T: NSManagedObject> {
-    
-    // MARK: Public
-    
-    /**
-    Initializes an `Into` clause.
-    Sample Usage:
-    
-        let person = transaction.create(Into<MyPersonEntity>())
-    */
-    public init(){
-        
-        self.configuration = nil
-        self.inferStoreIfPossible = true
-    }
-    
-    /**
-    Initializes an `Into` clause with the specified entity type.
-    Sample Usage:
-    
-        let person = transaction.create(Into(MyPersonEntity))
-    
-    :param: entity the `NSManagedObject` type to be created
-    */
-    public init(_ entity: T.Type) {
-        
-        self.configuration = nil
-        self.inferStoreIfPossible = true
-    }
-    
-    /**
-    Initializes an `Into` clause with the specified configuration.
-    Sample Usage:
-    
-        let person = transaction.create(Into<MyPersonEntity>("Configuration1"))
-    
-    :param: 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
-        self.inferStoreIfPossible = false
-    }
-    
-    /**
-    Initializes an `Into` clause with the specified entity type and configuration.
-    Sample Usage:
-    
-        let person = transaction.create(Into(MyPersonEntity.self, "Configuration1"))
-    
-    :param: entity the `NSManagedObject` type to be created
-    :param: 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
-        self.inferStoreIfPossible = false
-    }
-    
-    
-    // MARK: Internal
-    
-    internal let configuration: String?
-    internal let inferStoreIfPossible: Bool
-}
-
-
 // MARK: - BaseDataTransaction

 /**
@@ -128,77 +48,140 @@ public /*abstract*/ class BaseDataTransaction {
    /**
    Creates a new `NSManagedObject` with the specified entity type.
    
-    :param: into the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    :returns: a new `NSManagedObject` instance of 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(self.transactionQueue.isCurrentExecutionContext(), "Attempted to create an entity of type <\(T.self)> outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to create an entity of type \(typeName(T)) outside its designated queue."
+        )
        
        let context = self.context
-        let object = T.createInContext(context)
-        
+        let entityClass = (into.entityClass as! NSManagedObject.Type)
        if into.inferStoreIfPossible {
            
-            switch context.parentStack!.persistentStoreForEntityClass(T.self, configuration: nil, inferStoreIfPossible: true) {
+            switch context.parentStack!.persistentStoreForEntityClass(entityClass, configuration: nil, inferStoreIfPossible: true) {
                
-            case (.Some(let persistentStore), _):
+            case (let persistentStore?, _):
+                let object = entityClass.createInContext(context) as! T
                context.assignObject(object, toPersistentStore: persistentStore)
+                return object
                
            case (.None, true):
-                CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                fatalError("Attempted to create an entity of type \(typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
                
            default:
-                CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)), but a destination persistent store containing the entity type could not be found.")
+                fatalError("Attempted to create an entity of type \(typeName(entityClass)), but a destination persistent store containing the entity type could not be found.")
            }
        }
        else {
            
-            switch context.parentStack!.persistentStoreForEntityClass(T.self, configuration: into.configuration, inferStoreIfPossible: false) {
+            switch context.parentStack!.persistentStoreForEntityClass(entityClass, configuration: into.configuration, inferStoreIfPossible: false) {
                
-            case (.Some(let persistentStore), _):
+            case (let persistentStore?, _):
+                let object = entityClass.createInContext(context) as! T
                context.assignObject(object, toPersistentStore: persistentStore)
+                return object
                
            default:
                if let configuration = into.configuration {
                    
-                    CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) into the configuration \"\(configuration)\", which it doesn't belong to.")
+                    fatalError("Attempted to create an entity of type \(typeName(entityClass)) into the configuration \"\(configuration)\", which it doesn't belong to.")
                }
                else {
                    
-                    CoreStore.assert(false, "Attempted to create an entity of type \(typeName(object)) into the default configuration, which it doesn't belong to.")
+                    fatalError("Attempted to create an entity of type \(typeName(entityClass)) into the default configuration, which it doesn't belong to.")
                }
            }
        }
-        
-        return object
    }
    
    /**
    Returns an editable proxy of a specified `NSManagedObject`.
    
-    :param: object the `NSManagedObject` type to be edited
-    :returns: an editable proxy for the specified `NSManagedObject`.
+    - parameter object: the `NSManagedObject` type to be edited
+    - returns: an editable proxy for the specified `NSManagedObject`.
    */
-    public func fetch<T: NSManagedObject>(object: T?) -> T? {
+    public func edit<T: NSManagedObject>(object: T?) -> T? {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to update an entity of type \(typeName(object)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to update an entity of type \(typeName(object)) outside its designated queue."
+        )
        
        return object?.inContext(self.context)
    }
    
+    /**
+    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`.
+    */
+    public func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
+        
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to update an entity of type \(typeName(T)) outside its designated queue."
+        )
+        CoreStore.assert(
+            into.inferStoreIfPossible
+                || (into.configuration ?? Into.defaultConfigurationName) == objectID.persistentStore?.configurationName,
+            "Attempted to update an entity of type \(typeName(T)) but the specified persistent store do not match the `NSManagedObjectID`."
+        )
+        
+        return (into.entityClass as! NSManagedObject.Type).inContext(self.context, withObjectID: objectID) as? T
+    }
+    
    /**
    Deletes a specified `NSManagedObject`.
    
-    :param: object the `NSManagedObject` type to be deleted
+    - parameter object: the `NSManagedObject` to be deleted
    */
    public func delete(object: NSManagedObject?) {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to delete an entity of type \(typeName(object)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to delete an entity outside its designated queue."
+        )
        
        object?.inContext(self.context)?.deleteFromContext()
    }
    
+    /**
+    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)
+    }
+    
+    /**
+    Deletes the specified `NSManagedObject`s.
+    
+    - parameter objects: the `NSManagedObject`s to be deleted
+    */
+    public func delete(objects: [NSManagedObject?]) {
+        
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to delete entities outside their designated queue."
+        )
+        
+        let context = self.context
+        for object in objects {
+            
+            object?.inContext(context)?.deleteFromContext()
+        }
+    }
+    
    // MARK: Saving changes
    
    /**
@@ -206,7 +189,10 @@ public /*abstract*/ class BaseDataTransaction {
    */
    public func rollback() {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to rollback a \(typeName(self)) outside its designated queue.")
+        CoreStore.assert(
+            self.bypassesQueueing || self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to rollback a \(typeName(self)) outside its designated queue."
+        )
        
        self.context.reset()
    }
@@ -234,4 +220,9 @@ public /*abstract*/ class BaseDataTransaction {
        
        context.parentTransaction = self
    }
+    
+    internal var bypassesQueueing: Bool {
+        
+        return false
+    }
 }
--- a/Processing/CoreStore+Transaction.swift
+++ b/Processing/CoreStore+Transaction.swift
@@ -35,7 +35,7 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
    
-    :param: 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`.
+    - 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) {
        
@@ -45,8 +45,8 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
    
-    :param: 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
+    - 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 static func beginSynchronous(closure: (transaction: SynchronousDataTransaction) -> Void) -> SaveResult? {
        
@@ -56,7 +56,7 @@ public extension CoreStore {
    /**
    Using the `defaultStack`, begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
    
-    :returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
+    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
    */
    public static func beginDetached() -> DetachedDataTransaction {
        
--- a/Processing/DataStack+Transaction.swift
+++ b/Processing/DataStack+Transaction.swift
@@ -37,12 +37,10 @@ public extension DataStack {
    /**
    Begins a transaction asynchronously where `NSManagedObject` creates, updates, and deletes can be made.
    
-    :param: 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`.
+    - 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) {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.")
-        
        AsynchronousDataTransaction(
            mainContext: self.rootSavingContext,
            queue: self.childTransactionQueue,
@@ -52,13 +50,11 @@ public extension DataStack {
    /**
    Begins a transaction synchronously where `NSManagedObject` creates, updates, and deletes can be made.
    
-    :param: 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
+    - 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(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.")
-        
        return SynchronousDataTransaction(
            mainContext: self.rootSavingContext,
            queue: self.childTransactionQueue,
@@ -66,16 +62,18 @@ public extension DataStack {
    }
    
    /**
-    Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms. A detached transaction object should typically be only used from the main queue.
+    Begins a non-contiguous transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
    
-    :returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
+    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
    */
    public func beginDetached() -> DetachedDataTransaction {
        
-        CoreStore.assert(NSThread.isMainThread(), "Attempted to begin a transaction from a \(typeName(self)) outside the main thread.")
-        
        return DetachedDataTransaction(
            mainContext: self.rootSavingContext,
-            queue: .Main)
+            queue: .createSerial(
+                "com.coreStore.dataStack.detachedTransactionQueue",
+                targetQueue: .UserInitiated
+            )
+        )
    }
 }
--- a/Processing/DetachedDataTransaction.swift
+++ b/Processing/DetachedDataTransaction.swift
@@ -39,17 +39,48 @@ public final class DetachedDataTransaction: BaseDataTransaction {
    /**
    Saves the transaction changes asynchronously. For a `DetachedDataTransaction`, multiple commits are allowed, although it is the developer's responsibility to ensure a reasonable leeway to prevent blocking the main thread.
    
-    :param: completion the block executed after the save completes. Success or failure is reported by the `SaveResult` argument of the block.
+    - 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) {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.")
-        
        self.context.saveAsynchronouslyWithCompletion { (result) -> Void in
            
            self.result = result
            completion(result: result)
        }
    }
+    
+    /**
+    Begins a child transaction where `NSManagedObject` creates, updates, and deletes can be made. This is useful for making temporary changes, such as partially filled forms.
+    
+    - returns: a `DetachedDataTransaction` instance where creates, updates, and deletes can be made.
+    */
+    public func beginDetached() -> DetachedDataTransaction {
+        
+        return DetachedDataTransaction(
+            mainContext: self.context,
+            queue: self.transactionQueue
+        )
+    }
+    
+    /**
+    Returns the `NSManagedObjectContext` for this detached transaction. Use only for cases where external frameworks need an `NSManagedObjectContext` instance to work with.
+    
+    Note that it is the developer's responsibility to ensure the following:
+    - that the `DetachedDataTransaction` that owns this context should be strongly referenced and prevented from being deallocated during the context's lifetime
+    - that all saves will be done either through the `DetachedDataTransaction`'s `commit(...)` method, or by calling `save()` manually on the context, its parent, and all other ancestor contexts if there are any.
+    */
+    public var internalContext: NSManagedObjectContext {
+        
+        return self.context
+    }
+    
+    
+    // MARK: Internal
+    
+    internal override var bypassesQueueing: Bool {
+        
+        return true
+    }
 }

--- a/Processing/Into.swift
+++ b/Processing/Into.swift
@@ -0,0 +1,145 @@
+//
+//  Into.swift
+//  CoreStore
+//
+//  Copyright (c) 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
+//  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: - 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
+*/
+public struct Into<T: NSManagedObject> {
+    
+    // MARK: Public
+    
+    /**
+    Initializes an `Into` clause.
+    Sample Usage:
+    
+    let person = transaction.create(Into<MyPersonEntity>())
+    */
+    public init(){
+        
+        self.configuration = nil
+        self.inferStoreIfPossible = true
+        self.entityClass = T.self
+    }
+    
+    /**
+    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
+        self.inferStoreIfPossible = true
+        self.entityClass = entity
+    }
+    
+    /**
+    Initializes an `Into` clause with the specified entity class.
+    
+    - parameter entityClass: the `NSManagedObject` class type to be created
+    */
+    public init(_ entityClass: AnyClass) {
+        
+        self.configuration = nil
+        self.inferStoreIfPossible = true
+        self.entityClass = entityClass
+    }
+    
+    /**
+    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
+        self.inferStoreIfPossible = false
+        self.entityClass = T.self
+    }
+    
+    /**
+    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
+        self.inferStoreIfPossible = false
+        self.entityClass = entity
+    }
+    
+    /**
+    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
+        self.inferStoreIfPossible = false
+        self.entityClass = entityClass
+    }
+    
+    
+    // MARK: Internal
+    
+    internal static var defaultConfigurationName: String {
+        
+        return "PF_DEFAULT_CONFIGURATION_NAME"
+    }
+    
+    internal let entityClass: AnyClass
+    internal let configuration: String?
+    internal let inferStoreIfPossible: Bool
+}
--- a/Processing/SaveResult.swift
+++ b/Processing/SaveResult.swift
@@ -91,9 +91,7 @@ public enum SaveResult {
    
    internal init(_ errorCode: CoreStoreErrorCode, userInfo: [NSObject: AnyObject]?) {
        
-        self.init(NSError(
-            coreStoreErrorCode: errorCode,
-            userInfo: userInfo))
+        self.init(NSError(coreStoreErrorCode: errorCode, userInfo: userInfo))
    }
 }

--- a/Processing/SynchronousDataTransaction.swift
+++ b/Processing/SynchronousDataTransaction.swift
@@ -42,8 +42,14 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    */
    public func commit() {
        
-        CoreStore.assert(self.transactionQueue.isCurrentExecutionContext(), "Attempted to commit a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to commit a \(typeName(self)) more than once.")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to commit a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to commit a \(typeName(self)) more than once."
+        )
        
        self.isCommitted = true
        self.result = self.context.saveSynchronously()
@@ -52,13 +58,19 @@ public final class SynchronousDataTransaction: 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.
    
-    :param: 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
+    - 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(self.transactionQueue.isCurrentExecutionContext(), "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue.")
-        CoreStore.assert(!self.isCommitted, "Attempted to begin a child transaction from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            self.transactionQueue.isCurrentExecutionContext(),
+            "Attempted to begin a child transaction from a \(typeName(self)) outside its designated queue."
+        )
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to begin a child transaction from an already committed \(typeName(self))."
+        )
        
        return SynchronousDataTransaction(
            mainContext: self.context,
@@ -72,12 +84,15 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
    /**
    Creates a new `NSManagedObject` with the specified entity type.
    
-    :param: into the `Into` clause indicating the destination `NSManagedObject` entity type and the destination configuration
-    :returns: a new `NSManagedObject` instance of 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(!self.isCommitted, "Attempted to create an entity of type <\(T.self)> from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to create an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
        
        return super.create(into)
    }
@@ -85,34 +100,92 @@ 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.
    
-    :param: object the `NSManagedObject` type to be edited
-    :returns: an editable proxy for the specified `NSManagedObject`.
+    - parameter object: the `NSManagedObject` type to be edited
+    - returns: an editable proxy for the specified `NSManagedObject`.
    */
-    public override func fetch<T: NSManagedObject>(object: T?) -> T? {
+    public override func edit<T: NSManagedObject>(object: T?) -> T? {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
        
-        return super.fetch(object)
+        return super.edit(object)
+    }
+    
+    /**
+    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`.
+    */
+    public override func edit<T: NSManagedObject>(into: Into<T>, _ objectID: NSManagedObjectID) -> T? {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to update an entity of type \(typeName(T)) from an already committed \(typeName(self))."
+        )
+        
+        return super.edit(into, objectID)
    }
    
    /**
    Deletes a specified `NSManagedObject`. This method should not be used after the `commit()` method was already called once.
    
-    :param: object the `NSManagedObject` type to be deleted
+    - parameter object: the `NSManagedObject` type to be deleted
    */
    public override func delete(object: NSManagedObject?) {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entity of type \(typeName(object)) from an already committed \(typeName(self))."
+        )
        
        super.delete(object)
    }
    
+    /**
+    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(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
+        
+        super.delete([object1, object2] + objects)
+    }
+    
+    /**
+    Deletes the specified `NSManagedObject`s.
+    
+    - parameter objects: the `NSManagedObject`s to be deleted
+    */
+    public override func delete(objects: [NSManagedObject?]) {
+        
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to delete an entities from an already committed \(typeName(self))."
+        )
+        
+        super.delete(objects)
+    }
+    
    /**
    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.
    */
    public override func rollback() {
        
-        CoreStore.assert(!self.isCommitted, "Attempted to rollback an already committed \(typeName(self)).")
+        CoreStore.assert(
+            !self.isCommitted,
+            "Attempted to rollback an already committed \(typeName(self))."
+        )
        
        super.rollback()
    }
@@ -125,9 +198,13 @@ public final class SynchronousDataTransaction: BaseDataTransaction {
        self.transactionQueue.sync {
            
            self.closure(transaction: self)
+            
            if !self.isCommitted && self.hasChanges {
                
-                CoreStore.log(.Warning, message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded.")
+                CoreStore.log(
+                    .Warning,
+                    message: "The closure for the \(typeName(self)) completed without being committed. All changes made within the transaction were discarded."
+                )
            }
        }
        return self.result
--- a/Up/CoreStore+Setup.swift
+++ b/Up/CoreStore+Setup.swift
@@ -32,53 +32,64 @@ import GCDKit

 public extension CoreStore {
    
+    /**
+    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.
+    */
+    public static var entitiesByName: [String: NSManagedObject.Type] {
+        
+        return self.defaultStack.entitiesByName
+    }
+    
    /**
    Adds an in-memory store to the `defaultStack`.
    
-    :param: configuration an optional configuration name from the model file. If not specified, defaults to nil.
-    :returns: a `PersistentStoreResult` indicating success or failure.
+    - 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 addInMemoryStore(configuration: String? = nil) -> PersistentStoreResult {
+    public static func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
        
-        return self.defaultStack.addInMemoryStore(configuration: configuration)
+        return try self.defaultStack.addInMemoryStoreAndWait(configuration: configuration)
    }
    
    /**
    Adds to the `defaultStack` an SQLite store from the given SQLite file name.
    
-    :param: 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.
-    :param: configuration an optional configuration name from the model file. If not specified, defaults to nil.
-    :param: automigrating Set to true to configure Core Data auto-migration, or false to disable. If not specified, defaults to true.
-    :param: resetStoreOnMigrationFailure Set to true to delete the store on migration failure; 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: a `PersistentStoreResult` indicating success or failure.
+    - 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.
    */
-    public static func addSQLiteStore(fileName: String, configuration: String? = nil, automigrating: Bool = true, resetStoreOnMigrationFailure: Bool = false) -> PersistentStoreResult {
+    public static func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
-        return self.defaultStack.addSQLiteStore(
-            fileName,
+        return try self.defaultStack.addSQLiteStoreAndWait(
+            fileName: fileName,
            configuration: configuration,
-            automigrating: automigrating,
-            resetStoreOnMigrationFailure: resetStoreOnMigrationFailure
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch
        )
    }
    
    /**
    Adds to the `defaultStack` an SQLite store from the given SQLite file URL.
    
-    :param: 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.
-    :param: configuration an optional configuration name from the model file. If not specified, defaults to nil.
-    :param: automigrating Set to true to configure Core Data auto-migration, or false to disable. If not specified, defaults to true.
-    :param: resetStoreOnMigrationFailure Set to true to delete the store on migration failure; 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: a `PersistentStoreResult` indicating success or failure.
+    - 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.
    */
-    public static func addSQLiteStore(fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, automigrating: Bool = true, resetStoreOnMigrationFailure: Bool = false) -> PersistentStoreResult {
+    public static func addSQLiteStoreAndWait(fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
-        return self.defaultStack.addSQLiteStore(
+        return try self.defaultStack.addSQLiteStoreAndWait(
            fileURL: fileURL,
            configuration: configuration,
-            automigrating: automigrating,
-            resetStoreOnMigrationFailure: resetStoreOnMigrationFailure
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch
        )
    }
-    
 }
--- a/Up/DataStack.swift
+++ b/Up/DataStack.swift
@@ -28,11 +28,9 @@ import CoreData
 import GCDKit


-private let defaultConfigurationName = "PF_DEFAULT_CONFIGURATION_NAME"
+internal let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first!

-private let applicationSupportDirectory = NSFileManager.defaultManager().URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask).first as! NSURL
-
-private let applicationName = ((NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as? String) ?? "CoreData")
+internal let applicationName = (NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as? String) ?? "CoreData"

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

@@ -46,262 +44,267 @@ public final class DataStack {
    
    // MARK: Public
    
-    /**
-    Initializes a `DataStack` from a model created by merging all the models found in all bundles.
-    */
-    public convenience init() {
-        
-        let mergedModel: NSManagedObjectModel! = NSManagedObjectModel.mergedModelFromBundles(NSBundle.allBundles())
-        CoreStore.assert(mergedModel != nil, "Could not create a merged <\(NSManagedObjectModel.self)> from all bundles.")
-        
-        self.init(managedObjectModel: mergedModel)
-    }
-    
-    /**
-    Initializes a `DataStack` from the specified model name.
-
-    :param: modelName the name of the (.xcdatamodeld) model file.
-    */
-    public convenience init(modelName: String) {
-        
-        let modelFilePath: String! = NSBundle.mainBundle().pathForResource(modelName, ofType: "momd")
-        CoreStore.assert(modelFilePath != nil, "Could not find a \"momd\" resource from the main bundle.")
-        
-        let managedObjectModel: NSManagedObjectModel! = NSManagedObjectModel(contentsOfURL: NSURL(fileURLWithPath: modelFilePath)!)
-        CoreStore.assert(managedObjectModel != nil, "Could not create an <\(NSManagedObjectModel.self)> from the resource at path \"\(modelFilePath)\".")
-        
-        self.init(managedObjectModel: managedObjectModel)
-    }
-    
    /**
    Initializes a `DataStack` from an `NSManagedObjectModel`.
    
-    :param: managedObjectModel the `NSManagedObjectModel` of the (.xcdatamodeld) model file.
+    - 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.
    */
-    public required init(managedObjectModel: NSManagedObjectModel) {
+    public required init(modelName: String = applicationName, bundle: NSBundle = NSBundle.mainBundle(), migrationChain: MigrationChain = nil) {
        
-        self.coordinator = NSPersistentStoreCoordinator(managedObjectModel: managedObjectModel)
+        CoreStore.assert(
+            migrationChain.valid,
+            "Invalid migration chain passed to the \(typeName(DataStack)). Check that the model versions' order is correct and that no repetitions or ambiguities exist."
+        )
+        
+        let model = NSManagedObjectModel.fromBundle(
+            bundle,
+            modelName: modelName,
+            modelVersionHints: migrationChain.leafVersions
+        )
+        
+        self.coordinator = NSPersistentStoreCoordinator(managedObjectModel: model)
        self.rootSavingContext = NSManagedObjectContext.rootSavingContextForCoordinator(self.coordinator)
        self.mainContext = NSManagedObjectContext.mainContextForRootContext(self.rootSavingContext)
-        
-        var entityNameMapping = [EntityClassNameType: EntityNameType]()
-        var entityConfigurationsMapping = [EntityClassNameType: Set<String>]()
-        for entityDescription in managedObjectModel.entities as! [NSEntityDescription] {
-            
-            let managedObjectClassName = entityDescription.managedObjectClassName
-            entityConfigurationsMapping[managedObjectClassName] = []
-            if let entityName = entityDescription.name {
-                
-                entityNameMapping[managedObjectClassName] = entityName
-            }
-        }
-        self.entityNameMapping = entityNameMapping
-        self.entityConfigurationsMapping = entityConfigurationsMapping
+        self.model = model
+        self.migrationChain = migrationChain
        
        self.rootSavingContext.parentStack = self
    }
    
+    /**
+    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.
+    */
+    public var entitiesByName: [String: NSManagedObject.Type] {
+        
+        return self.model.entityMapping()
+    }
+    
+    /**
+    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.
    
-    :param: configuration an optional configuration name from the model file. If not specified, defaults to nil.
-    :returns: a `PersistentStoreResult` indicating success or failure.
+    - 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 addInMemoryStore(configuration: String? = nil) -> PersistentStoreResult {
+    public func addInMemoryStoreAndWait(configuration configuration: String? = nil) throws -> NSPersistentStore {
        
        let coordinator = self.coordinator;
-        var error: NSError?
        
        var store: NSPersistentStore?
+        var storeError: NSError?
        coordinator.performBlockAndWait {
            
-            store = coordinator.addPersistentStoreWithType(
-                NSInMemoryStoreType,
-                configuration: configuration,
-                URL: nil,
-                options: nil,
-                error: &error)
+            do {
+                
+                store = try coordinator.addPersistentStoreWithType(
+                    NSInMemoryStoreType,
+                    configuration: configuration,
+                    URL: nil,
+                    options: nil
+                )
+            }
+            catch {
+                
+                storeError = error as NSError
+            }
        }
        
        if let store = store {
            
            self.updateMetadataForPersistentStore(store)
-            return PersistentStoreResult(store)
+            return store
        }
        
-        if let error = error {
-            
-            CoreStore.handleError(
-                error,
-                "Failed to add in-memory <\(NSPersistentStore.self)>.")
-            return PersistentStoreResult(error)
-        }
-        else {
-            
-            CoreStore.handleError(
-                NSError(coreStoreErrorCode: .UnknownError),
-                "Failed to add in-memory <\(NSPersistentStore.self)>.")
-            return PersistentStoreResult(.UnknownError)
-        }
+        let error = storeError ?? NSError(coreStoreErrorCode: .UnknownError)
+        CoreStore.handleError(
+            error,
+            "Failed to add in-memory \(typeName(NSPersistentStore)) to the stack."
+        )
+        throw error
    }
    
    /**
    Adds to the stack an SQLite store from the given SQLite file name.
    
-    :param: 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.
-    :param: 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.
-    :param: automigrating Set to true to configure Core Data auto-migration, or false to disable. If not specified, defaults to true.
-    :param: resetStoreOnMigrationFailure Set to true to delete the store on migration failure; 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: a `PersistentStoreResult` indicating success or failure.
+    - 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.
    */
-    public func addSQLiteStore(fileName: String, configuration: String? = nil, automigrating: Bool = true, resetStoreOnMigrationFailure: Bool = false) -> PersistentStoreResult {
+    public func addSQLiteStoreAndWait(fileName fileName: String, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
        
-        return self.addSQLiteStore(
+        return try self.addSQLiteStoreAndWait(
            fileURL: applicationSupportDirectory.URLByAppendingPathComponent(
                fileName,
                isDirectory: false
            ),
            configuration: configuration,
-            automigrating: automigrating,
-            resetStoreOnMigrationFailure: resetStoreOnMigrationFailure
+            resetStoreOnModelMismatch: resetStoreOnModelMismatch
        )
    }
    
    /**
    Adds to the stack an SQLite store from the given SQLite file URL.
    
-    :param: 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.
-    :param: 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.
-    :param: automigrating Set to true to configure Core Data auto-migration, or false to disable. If not specified, defaults to true.
-    :param: resetStoreOnMigrationFailure Set to true to delete the store on migration failure; 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: a `PersistentStoreResult` indicating success or failure.
+    - 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.
    */
-    public func addSQLiteStore(fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, automigrating: Bool = true, resetStoreOnMigrationFailure: Bool = false) -> PersistentStoreResult {
+    public func addSQLiteStoreAndWait(fileURL fileURL: NSURL = defaultSQLiteStoreURL, configuration: String? = nil, resetStoreOnModelMismatch: Bool = false) throws -> NSPersistentStore {
+        
+        CoreStore.assert(
+            fileURL.fileURL,
+            "The specified file URL for the SQLite store is invalid: \"\(fileURL)\""
+        )
        
        let coordinator = self.coordinator;
        if let store = coordinator.persistentStoreForURL(fileURL) {
            
-            let isExistingStoreAutomigrating = ((store.options?[NSMigratePersistentStoresAutomaticallyOption] as? Bool) ?? false)
-            
            if store.type == NSSQLiteStoreType
-                && isExistingStoreAutomigrating == automigrating
-                && store.configurationName == (configuration ?? defaultConfigurationName) {
+                && store.configurationName == (configuration ?? Into.defaultConfigurationName) {
                    
-                    return PersistentStoreResult(store)
+                    return store
            }
            
+            let error = NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL)
            CoreStore.handleError(
-                NSError(coreStoreErrorCode: .DifferentPersistentStoreExistsAtURL),
-                "Failed to add SQLite <\(NSPersistentStore.self)> at \"\(fileURL)\" because a different <\(NSPersistentStore.self)> at that URL already exists.")
+                error,
+                "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\" because a different \(typeName(NSPersistentStore)) at that URL already exists."
+            )
            
-            return PersistentStoreResult(.DifferentPersistentStoreExistsAtURL)
+            throw error
        }
        
        let fileManager = NSFileManager.defaultManager()
-        var directoryError: NSError?
-        if !fileManager.createDirectoryAtURL(
-            fileURL.URLByDeletingLastPathComponent!,
-            withIntermediateDirectories: true,
-            attributes: nil,
-            error: &directoryError) {
-                
-                CoreStore.handleError(
-                    directoryError ?? NSError(coreStoreErrorCode: .UnknownError),
-                    "Failed to create directory for SQLite store at \"\(fileURL)\".")
-                return PersistentStoreResult(directoryError!)
+        do {
+            
+            try fileManager.createDirectoryAtURL(
+                fileURL.URLByDeletingLastPathComponent!,
+                withIntermediateDirectories: true,
+                attributes: nil
+            )
        }
+        catch _ { }
        
        var store: NSPersistentStore?
-        var persistentStoreError: NSError?
+        var storeError: NSError?
        coordinator.performBlockAndWait {
            
-            store = coordinator.addPersistentStoreWithType(
-                NSSQLiteStoreType,
-                configuration: configuration,
-                URL: fileURL,
-                options: [NSSQLitePragmasOption: ["WAL": "journal_mode"],
-                    NSInferMappingModelAutomaticallyOption: true,
-                    NSMigratePersistentStoresAutomaticallyOption: automigrating],
-                error: &persistentStoreError)
+            do {
+                
+                store = try coordinator.addPersistentStoreWithType(
+                    NSSQLiteStoreType,
+                    configuration: configuration,
+                    URL: fileURL,
+                    options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+                )
+            }
+            catch {
+                
+                storeError = error as NSError
+            }
        }
        
        if let store = store {
            
            self.updateMetadataForPersistentStore(store)
-            return PersistentStoreResult(store)
+            return store
        }
        
-        if let error = persistentStoreError
-            where (
-                resetStoreOnMigrationFailure
-                    && (error.code == NSPersistentStoreIncompatibleVersionHashError
-                        || error.code == NSMigrationMissingSourceModelError
-                        || error.code == NSMigrationError)
-                    && error.domain == NSCocoaErrorDomain
-            ) {
+        if let error = storeError
+            where (resetStoreOnModelMismatch && error.isCoreDataMigrationError) {
                
-                fileManager.removeItemAtURL(fileURL, error: nil)
-                fileManager.removeItemAtPath(
-                    fileURL.path!.stringByAppendingString("-shm"),
-                    error: nil)
-                fileManager.removeItemAtPath(
-                    fileURL.path!.stringByAppendingString("-wal"),
-                    error: nil)
+                fileManager.removeSQLiteStoreAtURL(fileURL)
                
                var store: NSPersistentStore?
                coordinator.performBlockAndWait {
                    
-                    store = coordinator.addPersistentStoreWithType(
-                        NSSQLiteStoreType,
-                        configuration: configuration,
-                        URL: fileURL,
-                        options: [NSSQLitePragmasOption: ["WAL": "journal_mode"],
-                            NSInferMappingModelAutomaticallyOption: true,
-                            NSMigratePersistentStoresAutomaticallyOption: automigrating],
-                        error: &persistentStoreError)
+                    do {
+                        
+                        store = try coordinator.addPersistentStoreWithType(
+                            NSSQLiteStoreType,
+                            configuration: configuration,
+                            URL: fileURL,
+                            options: [NSSQLitePragmasOption: ["journal_mode": "WAL"]]
+                        )
+                    }
+                    catch {
+                        
+                        storeError = error as NSError
+                    }
                }
                
                if let store = store {
                    
                    self.updateMetadataForPersistentStore(store)
-                    return PersistentStoreResult(store)
+                    return store
                }
        }
        
+        let error = storeError ?? NSError(coreStoreErrorCode: .UnknownError)
        CoreStore.handleError(
-            persistentStoreError ?? NSError(coreStoreErrorCode: .UnknownError),
-            "Failed to add SQLite <\(NSPersistentStore.self)> at \"\(fileURL)\".")
-        
-        return PersistentStoreResult(.UnknownError)
+            error,
+            "Failed to add SQLite \(typeName(NSPersistentStore)) at \"\(fileURL)\"."
+        )
+        throw error
    }
    
    
    // MARK: Internal
    
+    internal let coordinator: NSPersistentStoreCoordinator
    internal let rootSavingContext: NSManagedObjectContext
    internal let mainContext: NSManagedObjectContext
-    internal let childTransactionQueue: GCDQueue = .createSerial("com.corestore.datastack.childtransactionqueue")
-    
-    internal func entityNameForEntityClass(entityClass: NSManagedObject.Type) -> String? {
+    internal let model: NSManagedObjectModel
+    internal let migrationChain: MigrationChain
+    internal let childTransactionQueue: GCDQueue = .createSerial("com.coreStore.dataStack.childTransactionQueue")
+    internal let migrationQueue: NSOperationQueue = {
        
-        return self.entityNameMapping[NSStringFromClass(entityClass)]
+        let migrationQueue = NSOperationQueue()
+        migrationQueue.maxConcurrentOperationCount = 1
+        migrationQueue.name = "com.coreStore.migrationOperationQueue"
+        migrationQueue.qualityOfService = .Utility
+        migrationQueue.underlyingQueue = dispatch_queue_create("com.coreStore.migrationQueue", DISPATCH_QUEUE_SERIAL)
+        return migrationQueue
+    }()
+    
+    internal func entityNameForEntityClass(entityClass: AnyClass) -> String? {
+        
+        return self.model.entityNameForClass(entityClass)
    }
    
-    internal func persistentStoresForEntityClass(entityClass: NSManagedObject.Type) -> [NSPersistentStore]? {
+    internal func persistentStoresForEntityClass(entityClass: AnyClass) -> [NSPersistentStore]? {
        
        var returnValue: [NSPersistentStore]? = nil
        self.storeMetadataUpdateQueue.barrierSync {
            
-            let configurationsForEntity = self.entityConfigurationsMapping[NSStringFromClass(entityClass)] ?? []
-            returnValue = map(configurationsForEntity) {
+            returnValue = self.entityConfigurationsMapping[NSStringFromClass(entityClass)]?.map {
                
                return self.configurationStoreMapping[$0]!
-            }
+            } ?? []
        }
        return returnValue
    }
    
-    internal func persistentStoreForEntityClass(entityClass: NSManagedObject.Type, configuration: String?, inferStoreIfPossible: Bool) -> (store: NSPersistentStore?, isAmbiguous: Bool) {
+    internal func persistentStoreForEntityClass(entityClass: AnyClass, configuration: String?, inferStoreIfPossible: Bool) -> (store: NSPersistentStore?, isAmbiguous: Bool) {
        
        var returnValue: (store: NSPersistentStore?, isAmbiguous: Bool) = (store: nil, isAmbiguous: false)
        self.storeMetadataUpdateQueue.barrierSync {
@@ -335,29 +338,39 @@ public final class DataStack {
        return returnValue
    }
    
-    
-    // MARK: Private
-    
-    private typealias EntityClassNameType = String
-    private typealias EntityNameType = String
-    private typealias ConfigurationNameType = String
-    
-    private let coordinator: NSPersistentStoreCoordinator
-    private let entityNameMapping: [EntityClassNameType: EntityNameType]
-    private let storeMetadataUpdateQueue = GCDQueue.createConcurrent("com.coreStore.persistentStoreBarrierQueue")
-    private var configurationStoreMapping = [ConfigurationNameType: NSPersistentStore]()
-    private var entityConfigurationsMapping = [EntityClassNameType: Set<String>]()
-    
-    private func updateMetadataForPersistentStore(persistentStore: NSPersistentStore) {
+    internal func updateMetadataForPersistentStore(persistentStore: NSPersistentStore) {
        
        self.storeMetadataUpdateQueue.barrierAsync {
            
            let configurationName = persistentStore.configurationName
            self.configurationStoreMapping[configurationName] = persistentStore
-            for entityDescription in (self.coordinator.managedObjectModel.entitiesForConfiguration(configurationName) as? [NSEntityDescription] ?? []) {
+            for entityDescription in (self.coordinator.managedObjectModel.entitiesForConfiguration(configurationName) ?? []) {
                
+                if self.entityConfigurationsMapping[entityDescription.managedObjectClassName] == nil {
+                    
+                    self.entityConfigurationsMapping[entityDescription.managedObjectClassName] = []
+                }
                self.entityConfigurationsMapping[entityDescription.managedObjectClassName]?.insert(configurationName)
            }
        }
    }
+    
+    
+    // MARK: Private
+    
+    private let storeMetadataUpdateQueue = GCDQueue.createConcurrent("com.coreStore.persistentStoreBarrierQueue")
+    private var configurationStoreMapping = [String: NSPersistentStore]()
+    private var entityConfigurationsMapping = [String: Set<String>]()
+    
+    deinit {
+        
+        for store in self.coordinator.persistentStores {
+            
+            do {
+                
+                try self.coordinator.removePersistentStore(store)
+            }
+            catch _ { }
+        }
+    }
 }
--- a/Up/PersistentStoreResult.swift
+++ b/Up/PersistentStoreResult.swift
@@ -30,26 +30,28 @@ import CoreData
 // MARK: - PersistentStoreResult

 /**
-The `PersistentStoreResult` indicates the result of initializing the persistent store.
+The `PersistentStoreResult` indicates the result of an asynchronous initialization of a persistent store.
 The `PersistentStoreResult` can be treated as a boolean:

-    let result = CoreStore.addSQLiteStore()
-    if result {
-    	// succeeded
-    }
-    else {
-    	// failed
-    }
+    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:

-    let result = CoreStore.addSQLiteStore()
-    switch result {
-    case .Success(let persistentStore):
-        // persistentStore is the related NSPersistentStore instance
-    case .Failure(let error):
-        // error is the NSError instance for the failure
-    }
+    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 {
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.pbxproj
@@ -7,10 +7,12 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		B503FADF1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADB1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift */; };
+		B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */; };
 		B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */; };
 		B503FAE11AFDC71700F90881 /* Palette.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADD1AFDC71700F90881 /* Palette.swift */; };
 		B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */; };
+		B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */; };
+		B5125C141B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = B5125C131B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel */; };
 		B52977D91B120B80003D50A5 /* ObserversViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977D81B120B80003D50A5 /* ObserversViewController.swift */; };
 		B52977DD1B120F3B003D50A5 /* TransactionsDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52977DC1B120F3B003D50A5 /* TransactionsDemoViewController.swift */; };
 		B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B52977DE1B120F83003D50A5 /* MapKit.framework */; };
@@ -21,12 +23,28 @@
 		B54AAD591AF4D26E00848AE0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD571AF4D26E00848AE0 /* Main.storyboard */; };
 		B54AAD5B1AF4D26E00848AE0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */; };
 		B54AAD5E1AF4D26E00848AE0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */; };
+		B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */; };
 		B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */; };
 		B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B566E3311B11DF3200F4F0C6 /* UserAccount.swift */; };
+		B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */; };
+		B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */; };
+		B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964D91B231BCA0075EE4A /* MaleAccount.swift */; };
+		B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */; };
+		B569650C1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */; };
+		B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56965171B2E20CC0075EE4A /* TimeZone.swift */; };
+		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 */; };
 		B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; };
 		B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B583A91B1AF5F4F4001F76AF /* CoreStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		B5E7240F1B11F993006FB83F /* TwitterAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E7240E1B11F993006FB83F /* TwitterAccount.swift */; };
-		B5E724111B11F994006FB83F /* FacebookAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E724101B11F994006FB83F /* FacebookAccount.swift */; };
+		B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; };
+		B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B5D9C9181B20AB1900E64F0E /* GCDKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */; };
+		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 */; };
+		B5EE259B1B3EA4890000406B /* OrganismV3.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259A1B3EA4890000406B /* OrganismV3.swift */; };
+		B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -67,6 +85,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				B5D9C91A1B20AB1900E64F0E /* GCDKit.framework in Embed Frameworks */,
 				B583A9211AF5F542001F76AF /* CoreStore.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -75,10 +94,12 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		B503FADB1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectListObserverDemoViewController.swift; sourceTree = "<group>"; };
+		B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectObserverDemoViewController.swift; sourceTree = "<group>"; };
 		B503FADD1AFDC71700F90881 /* Palette.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Palette.swift; sourceTree = "<group>"; };
 		B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaletteTableViewCell.swift; sourceTree = "<group>"; };
+		B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = OrganismV2ToV3.xcmappingmodel; sourceTree = "<group>"; };
+		B5125C131B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = OrganismV3ToV2.xcmappingmodel; sourceTree = "<group>"; };
 		B52977D81B120B80003D50A5 /* ObserversViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObserversViewController.swift; sourceTree = "<group>"; };
 		B52977DC1B120F3B003D50A5 /* TransactionsDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionsDemoViewController.swift; sourceTree = "<group>"; };
 		B52977DE1B120F83003D50A5 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
@@ -91,12 +112,28 @@
 		B54AAD581AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B54AAD5D1AF4D26E00848AE0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
+		B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2ToV3MigrationPolicy.swift; sourceTree = "<group>"; };
 		B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackSetupDemoViewController.swift; sourceTree = "<group>"; };
 		B566E3311B11DF3200F4F0C6 /* UserAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserAccount.swift; sourceTree = "<group>"; };
+		B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomLoggerViewController.swift; sourceTree = "<group>"; };
+		B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = StackSetupDemo.xcdatamodel; sourceTree = "<group>"; };
+		B56964D91B231BCA0075EE4A /* MaleAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaleAccount.swift; sourceTree = "<group>"; };
+		B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FemaleAccount.swift; sourceTree = "<group>"; };
+		B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchingAndQueryingDemoViewController.swift; sourceTree = "<group>"; };
+		B56965171B2E20CC0075EE4A /* TimeZone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeZone.swift; sourceTree = "<group>"; };
+		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>"; };
 		B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoreStore.xcodeproj; path = ../CoreStore.xcodeproj; sourceTree = "<group>"; };
-		B583A9251AF5F547001F76AF /* GCDKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = GCDKit.framework; path = "/Users/johnestropia/Library/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos/GCDKit.framework"; sourceTree = "<absolute>"; };
-		B5E7240E1B11F993006FB83F /* TwitterAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TwitterAccount.swift; sourceTree = "<group>"; };
-		B5E724101B11F994006FB83F /* FacebookAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacebookAccount.swift; sourceTree = "<group>"; };
+		B5D9C9181B20AB1900E64F0E /* 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>"; };
+		B5EE25861B36E2520000406B /* OrganismV2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV2.swift; sourceTree = "<group>"; };
+		B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MigrationDemoV3.xcdatamodel; sourceTree = "<group>"; };
+		B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MigrationsDemoViewController.swift; sourceTree = "<group>"; };
+		B5EE259A1B3EA4890000406B /* OrganismV3.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismV3.swift; sourceTree = "<group>"; };
+		B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrganismProtocol.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -106,6 +143,7 @@
 			files = (
 				B52977E11B120F8A003D50A5 /* CoreLocation.framework in Frameworks */,
 				B52977DF1B120F83003D50A5 /* MapKit.framework in Frameworks */,
+				B5D9C9191B20AB1900E64F0E /* GCDKit.framework in Frameworks */,
 				B583A9201AF5F542001F76AF /* CoreStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -117,7 +155,7 @@
 			isa = PBXGroup;
 			children = (
 				B52977D81B120B80003D50A5 /* ObserversViewController.swift */,
-				B503FADB1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift */,
+				B503FADB1AFDC71700F90881 /* ListObserverDemoViewController.swift */,
 				B503FADC1AFDC71700F90881 /* ObjectObserverDemoViewController.swift */,
 				B503FADD1AFDC71700F90881 /* Palette.swift */,
 				B503FADE1AFDC71700F90881 /* PaletteTableViewCell.swift */,
@@ -138,9 +176,9 @@
 			isa = PBXGroup;
 			children = (
 				B583A9141AF5F4F3001F76AF /* CoreStore.xcodeproj */,
+				B5D9C9181B20AB1900E64F0E /* GCDKit.framework */,
 				B52977E01B120F8A003D50A5 /* CoreLocation.framework */,
 				B52977DE1B120F83003D50A5 /* MapKit.framework */,
-				B583A9251AF5F547001F76AF /* GCDKit.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -169,10 +207,15 @@
 				B566E3271B117AE700F4F0C6 /* Stack Setup Demo */,
 				B503FADA1AFDC71700F90881 /* List and Object Observers Demo */,
 				B52977DB1B120F2C003D50A5 /* Transactions Demo */,
+				B56965091B2B35370075EE4A /* Fetching and Querying Demo */,
+				B569652F1B3591460075EE4A /* Migrations Demo */,
+				B56964C61B20AC200075EE4A /* Loggers Demo */,
 				B54AAD571AF4D26E00848AE0 /* Main.storyboard */,
 				B54AAD5A1AF4D26E00848AE0 /* Images.xcassets */,
 				B54AAD5C1AF4D26E00848AE0 /* LaunchScreen.xib */,
 				B54AAD501AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld */,
+				B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */,
+				B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */,
 				B54AAD4C1AF4D26E00848AE0 /* Supporting Files */,
 			);
 			path = CoreStoreDemo;
@@ -189,14 +232,49 @@
 		B566E3271B117AE700F4F0C6 /* Stack Setup Demo */ = {
 			isa = PBXGroup;
 			children = (
-				B5E724101B11F994006FB83F /* FacebookAccount.swift */,
-				B5E7240E1B11F993006FB83F /* TwitterAccount.swift */,
+				B56964DB1B231BCB0075EE4A /* FemaleAccount.swift */,
+				B56964D91B231BCA0075EE4A /* MaleAccount.swift */,
 				B566E3311B11DF3200F4F0C6 /* UserAccount.swift */,
 				B566E3291B117B1F00F4F0C6 /* StackSetupDemoViewController.swift */,
 			);
 			path = "Stack Setup Demo";
 			sourceTree = "<group>";
 		};
+		B56964C61B20AC200075EE4A /* Loggers Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B56964C81B20AC780075EE4A /* CustomLoggerViewController.swift */,
+			);
+			path = "Loggers Demo";
+			sourceTree = "<group>";
+		};
+		B56965091B2B35370075EE4A /* Fetching and Querying Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B56965171B2E20CC0075EE4A /* TimeZone.swift */,
+				B569650B1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift */,
+				B56965191B30888A0075EE4A /* FetchingResultsViewController.swift */,
+				B569651B1B30889A0075EE4A /* QueryingResultsViewController.swift */,
+			);
+			path = "Fetching and Querying Demo";
+			sourceTree = "<group>";
+		};
+		B569652F1B3591460075EE4A /* Migrations Demo */ = {
+			isa = PBXGroup;
+			children = (
+				B5EE259D1B3EC1B20000406B /* OrganismProtocol.swift */,
+				B5EE259A1B3EA4890000406B /* OrganismV3.swift */,
+				B5EE25861B36E2520000406B /* OrganismV2.swift */,
+				B5EE25841B36E23C0000406B /* OrganismV1.swift */,
+				B5EE258B1B36E40D0000406B /* MigrationsDemoViewController.swift */,
+				B5E599311B5240F50084BD5F /* OrganismTableViewCell.swift */,
+				B5125C111B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel */,
+				B560070E1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift */,
+				B5125C131B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel */,
+			);
+			path = "Migrations Demo";
+			sourceTree = "<group>";
+		};
 		B583A9151AF5F4F3001F76AF /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -235,7 +313,8 @@
 		B54AAD411AF4D26E00848AE0 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "John Rommel Estropia";
 				TargetAttributes = {
 					B54AAD481AF4D26E00848AE0 = {
@@ -302,19 +381,35 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B56965181B2E20CC0075EE4A /* TimeZone.swift in Sources */,
+				B56965291B3582D30075EE4A /* MigrationDemo.xcdatamodeld in Sources */,
+				B5E599321B5240F50084BD5F /* OrganismTableViewCell.swift in Sources */,
+				B5EE25851B36E23C0000406B /* OrganismV1.swift in Sources */,
 				B52977DD1B120F3B003D50A5 /* TransactionsDemoViewController.swift in Sources */,
 				B52977E41B121635003D50A5 /* Place.swift in Sources */,
+				B569650C1B2B36E10075EE4A /* FetchingAndQueryingDemoViewController.swift in Sources */,
+				B569651A1B30888A0075EE4A /* FetchingResultsViewController.swift in Sources */,
+				B5EE25871B36E2520000406B /* OrganismV2.swift in Sources */,
 				B503FAE01AFDC71700F90881 /* ObjectObserverDemoViewController.swift in Sources */,
 				B52977D91B120B80003D50A5 /* ObserversViewController.swift in Sources */,
+				B56964C91B20AC780075EE4A /* CustomLoggerViewController.swift in Sources */,
 				B566E32A1B117B1F00F4F0C6 /* StackSetupDemoViewController.swift in Sources */,
-				B5E724111B11F994006FB83F /* FacebookAccount.swift in Sources */,
-				B5E7240F1B11F993006FB83F /* TwitterAccount.swift in Sources */,
+				B56964DA1B231BCA0075EE4A /* MaleAccount.swift in Sources */,
 				B566E3321B11DF3200F4F0C6 /* UserAccount.swift in Sources */,
 				B54AAD521AF4D26E00848AE0 /* CoreStoreDemo.xcdatamodeld in Sources */,
+				B5EE259B1B3EA4890000406B /* OrganismV3.swift in Sources */,
 				B503FAE11AFDC71700F90881 /* Palette.swift in Sources */,
 				B503FAE21AFDC71700F90881 /* PaletteTableViewCell.swift in Sources */,
-				B503FADF1AFDC71700F90881 /* ObjectListObserverDemoViewController.swift in Sources */,
+				B560070F1B3EC90F00A9A8F9 /* OrganismV2ToV3MigrationPolicy.swift in Sources */,
+				B5125C141B521BA7003A42C7 /* OrganismV3ToV2.xcmappingmodel in Sources */,
+				B503FADF1AFDC71700F90881 /* ListObserverDemoViewController.swift in Sources */,
 				B54AAD4F1AF4D26E00848AE0 /* AppDelegate.swift in Sources */,
+				B56964D71B231AE90075EE4A /* StackSetupDemo.xcdatamodeld in Sources */,
+				B56964DC1B231BCB0075EE4A /* FemaleAccount.swift in Sources */,
+				B5EE259E1B3EC1B20000406B /* OrganismProtocol.swift in Sources */,
+				B5EE258C1B36E40D0000406B /* MigrationsDemoViewController.swift in Sources */,
+				B569651C1B30889A0075EE4A /* QueryingResultsViewController.swift in Sources */,
+				B5125C121B521B78003A42C7 /* OrganismV2ToV3.xcmappingmodel in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -374,6 +469,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -389,7 +485,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -427,7 +523,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -438,13 +534,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos",
-				);
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStoreDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -453,13 +546,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/CoreStoreDemo-ftknhsqfpsthfogvisxisgpbbhsj/Build/Products/Debug-iphoneos",
-				);
 				INFOPLIST_FILE = CoreStoreDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.johnestropia.CoreStoreDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -498,6 +588,28 @@
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 		};
+		B56964D51B231AE90075EE4A /* StackSetupDemo.xcdatamodeld */ = {
+			isa = XCVersionGroup;
+			children = (
+				B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */,
+			);
+			currentVersion = B56964D61B231AE90075EE4A /* StackSetupDemo.xcdatamodel */;
+			path = StackSetupDemo.xcdatamodeld;
+			sourceTree = "<group>";
+			versionGroupType = wrapper.xcdatamodel;
+		};
+		B56965271B3582D30075EE4A /* MigrationDemo.xcdatamodeld */ = {
+			isa = XCVersionGroup;
+			children = (
+				B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */,
+				B5EE25801B36E1B00000406B /* MigrationDemoV2.xcdatamodel */,
+				B56965281B3582D30075EE4A /* MigrationDemo.xcdatamodel */,
+			);
+			currentVersion = B5EE25881B36E2750000406B /* MigrationDemoV3.xcdatamodel */;
+			path = MigrationDemo.xcdatamodeld;
+			sourceTree = "<group>";
+			versionGroupType = wrapper.xcdatamodel;
+		};
 /* End XCVersionGroup section */
 	};
 	rootObject = B54AAD411AF4D26E00848AE0 /* Project object */;
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xccheckout
@@ -22,7 +22,7 @@
 		<key>4B60F1BCB491FF717C56441AE7783C74F417BE48</key>
 		<string>../../..</string>
 		<key>8B2E522D57154DFA93A06982C36315ECBEA4FA97</key>
-		<string>../../../Libraries/GCDKit/</string>
+		<string>../../..Libraries/GCDKit</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>github.com:JohnEstropia/CoreStore.git</string>
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcshareddata/CoreStoreDemo.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : 0,
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "B6855E48-4B19-4321-B1C7-CB2706E12777",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "8B2E522D57154DFA93A06982C36315ECBEA4FA97" : "CoreStoreLibraries\/GCDKit",
+    "4B60F1BCB491FF717C56441AE7783C74F417BE48" : "CoreStore"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "CoreStoreDemo",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 203,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "CoreStoreDemo\/CoreStoreDemo.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/CoreStore.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4B60F1BCB491FF717C56441AE7783C74F417BE48"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:JohnEstropia\/GCDKit.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8B2E522D57154DFA93A06982C36315ECBEA4FA97"
+    }
+  ]
+}
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/project.xcworkspace/xcuserdata/johnestropia.xcuserdatad/WorkspaceSettings.xcsettings
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/CoreStoreDemo.xcscheme
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-               BuildableName = "CoreStoreDemo.app"
-               BlueprintName = "CoreStoreDemo"
-               ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B54AAD481AF4D26E00848AE0"
-            BuildableName = "CoreStoreDemo.app"
-            BlueprintName = "CoreStoreDemo"
-            ReferencedContainer = "container:CoreStoreDemo.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
--- a/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CoreStoreDemo.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>B54AAD481AF4D26E00848AE0</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
--- a/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
+++ b/CoreStoreDemo/CoreStoreDemo/AppDelegate.swift
@@ -20,6 +20,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
        
+        application.statusBarStyle = .LightContent
        return true
    }
 }
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/LaunchScreen.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
    </dependencies>
    <objects>
@@ -14,17 +14,17 @@
                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 John Rommel Estropia. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                    <rect key="frame" x="20" y="439" width="441" height="21"/>
                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CoreStoreDemo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CoreStore" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="50"/>
+                    <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
            <constraints>
                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
--- a/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
+++ b/CoreStoreDemo/CoreStoreDemo/Base.lproj/Main.storyboard
@@ -1,10 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ni8-QF-XHB">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8152.3" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ni8-QF-XHB">
    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8124.4"/>
        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
    </dependencies>
+    <customFonts key="customFonts">
+        <mutableArray key="AppleSDGothicNeo.ttc">
+            <string>AppleSDGothicNeo-Regular</string>
+        </mutableArray>
+        <mutableArray key="HelveticaNeue.ttc">
+            <string>HelveticaNeue-Bold</string>
+            <string>HelveticaNeue-Bold</string>
+            <string>HelveticaNeue</string>
+            <string>HelveticaNeue</string>
+        </mutableArray>
+        <mutableArray key="HelveticaNeueLights.ttc">
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Thin</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+            <string>HelveticaNeue-Light</string>
+        </mutableArray>
+    </customFonts>
    <scenes>
        <!--SNS Accounts-->
        <scene sceneID="3If-81-mNf">
@@ -13,31 +43,32 @@
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="S3A-lm-AuA">
                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="separatorColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <view key="tableHeaderView" contentMode="scaleToFill" id="yud-WH-MPa">
                            <rect key="frame" x="0.0" y="64" width="600" height="150"/>
                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                            <subviews>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sns" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="czc-nd-es9">
-                                    <rect key="frame" x="20" y="20" width="560" height="21.5"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <rect key="frame" x="20" y="20" width="560" height="26.5"/>
+                                    <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="22"/>
+                                    <color key="textColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                    <nil key="highlightedColor"/>
                                </label>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-91-O2N">
-                                    <rect key="frame" x="20" y="65" width="42.5" height="20.5"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <rect key="frame" x="20" y="70" width="41" height="20.5"/>
+                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
+                                    <color key="textColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                    <nil key="highlightedColor"/>
                                </label>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="friends" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p2y-0T-hQs">
-                                    <rect key="frame" x="536" y="67" width="44" height="17"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <rect key="frame" x="539.5" y="72" width="40.5" height="17"/>
+                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="14"/>
+                                    <color key="textColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                    <nil key="highlightedColor"/>
                                </label>
                            </subviews>
-                            <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                            <constraints>
                                <constraint firstItem="1eh-91-O2N" firstAttribute="top" secondItem="czc-nd-es9" secondAttribute="bottom" constant="23.5" id="F6q-Jt-glI"/>
                                <constraint firstItem="p2y-0T-hQs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="1eh-91-O2N" secondAttribute="trailing" constant="20" id="GVS-6o-rmj"/>
@@ -51,19 +82,23 @@
                        </view>
                        <prototypes>
                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="8b8-lM-Krq" detailTextLabel="hR1-Zb-BOk" style="IBUITableViewCellStyleValue1" id="dMt-nx-EO5">
+                                <rect key="frame" x="0.0" y="236" width="600" height="44"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dMt-nx-EO5" id="gdK-VV-zNb">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8b8-lM-Krq">
+                                            <rect key="frame" x="15" y="13" width="28.5" height="19"/>
                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                            <nil key="highlightedColor"/>
                                        </label>
                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hR1-Zb-BOk">
+                                            <rect key="frame" x="533" y="13" width="52" height="19"/>
                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="16"/>
                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
                                            <nil key="highlightedColor"/>
                                        </label>
@@ -87,32 +122,185 @@
            </objects>
            <point key="canvasLocation" x="3694" y="650"/>
        </scene>
+        <!--Evolution-->
+        <scene sceneID="iwU-Hv-zNr">
+            <objects>
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="iVv-Vc-nCL" customClass="MigrationsDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Un6-jI-efh"/>
+                        <viewControllerLayoutGuide type="bottom" id="t9A-zf-Iew"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="75P-2m-6cr">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="WUc-3Y-Quw">
+                                <rect key="frame" x="0.0" y="324" width="600" height="276"/>
+                                <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="separatorColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrganismTableViewCell" id="WVb-th-o8c" customClass="OrganismTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="22" width="600" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WVb-th-o8c" id="JBq-Ml-a9p">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OQf-Bd-Zze">
+                                                    <rect key="frame" x="520" y="8" width="72" height="27.5"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                                    <inset key="contentEdgeInsets" minX="7" minY="0.0" maxX="7" maxY="0.0"/>
+                                                    <state key="normal" title="mutate!"/>
+                                                    <connections>
+                                                        <action selector="mutateButtonTouchUpInside:" destination="WVb-th-o8c" eventType="touchUpInside" id="REw-UX-rJ0"/>
+                                                    </connections>
+                                                </button>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VZk-6K-4ut">
+                                                    <rect key="frame" x="15" y="8" width="495" height="27.5"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="17"/>
+                                                    <color key="textColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="OQf-Bd-Zze" firstAttribute="top" secondItem="JBq-Ml-a9p" secondAttribute="topMargin" id="39z-i5-EeS"/>
+                                                <constraint firstItem="VZk-6K-4ut" firstAttribute="top" secondItem="JBq-Ml-a9p" secondAttribute="topMargin" id="WO1-gf-MIu"/>
+                                                <constraint firstItem="VZk-6K-4ut" firstAttribute="leading" secondItem="JBq-Ml-a9p" secondAttribute="leadingMargin" constant="7" id="X0N-Il-F26"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="OQf-Bd-Zze" secondAttribute="bottom" id="YwC-dw-rGI"/>
+                                                <constraint firstItem="OQf-Bd-Zze" firstAttribute="leading" secondItem="VZk-6K-4ut" secondAttribute="trailing" constant="10" id="mo1-NZ-iPa"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="VZk-6K-4ut" secondAttribute="bottom" id="ucK-FJ-7v4"/>
+                                                <constraint firstItem="OQf-Bd-Zze" firstAttribute="trailing" secondItem="JBq-Ml-a9p" secondAttribute="trailingMargin" id="v3e-PY-3wW"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="dnaLabel" destination="VZk-6K-4ut" id="CSU-Ig-qMu"/>
+                                            <outlet property="mutateButton" destination="OQf-Bd-Zze" id="5gd-Jx-tMT"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="iVv-Vc-nCL" id="yp2-X4-fhE"/>
+                                    <outlet property="delegate" destination="iVv-Vc-nCL" id="V5b-s8-XOl"/>
+                                </connections>
+                            </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XKA-Ub-c2X">
+                                <rect key="frame" x="0.0" y="64" width="600" height="260"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i7U-bW-juB" customClass="UIButton">
+                                        <rect key="frame" x="0.0" y="0.0" width="600" height="260"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Organism" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zxy-nY-P44">
+                                                <rect key="frame" x="20" y="90.5" width="560" height="26.5"/>
+                                                <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="22"/>
+                                                <color key="textColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="attributes" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Ac-xl-ldZ">
+                                                <rect key="frame" x="20" y="131.5" width="560" height="20.5"/>
+                                                <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="17"/>
+                                                <color key="textColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="rAZ-eJ-sxy">
+                                                <rect key="frame" x="20" y="20" width="560" height="29"/>
+                                                <segments>
+                                                    <segment title="First"/>
+                                                    <segment title="Second"/>
+                                                    <segment title=""/>
+                                                </segments>
+                                                <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                <connections>
+                                                    <action selector="segmentedControlValueChanged:" destination="iVv-Vc-nCL" eventType="valueChanged" id="RwG-kW-RPg"/>
+                                                </connections>
+                                            </segmentedControl>
+                                            <progressView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="869-wx-Odb">
+                                                <rect key="frame" x="20" y="68" width="560" height="2"/>
+                                                <color key="progressTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                <color key="trackTintColor" white="1" alpha="0.20000000000000001" colorSpace="calibratedWhite"/>
+                                            </progressView>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstItem="zxy-nY-P44" firstAttribute="leading" secondItem="i7U-bW-juB" secondAttribute="leading" constant="20" id="1u1-Tq-hRn"/>
+                                            <constraint firstItem="6Ac-xl-ldZ" firstAttribute="top" secondItem="zxy-nY-P44" secondAttribute="bottom" constant="14.5" id="39B-9l-O3g"/>
+                                            <constraint firstAttribute="trailing" secondItem="zxy-nY-P44" secondAttribute="trailing" constant="20" id="3d5-Zk-rB1"/>
+                                            <constraint firstAttribute="trailing" secondItem="6Ac-xl-ldZ" secondAttribute="trailing" constant="20" id="EJq-uA-8dQ"/>
+                                            <constraint firstItem="rAZ-eJ-sxy" firstAttribute="top" secondItem="i7U-bW-juB" secondAttribute="top" constant="20" id="Ey7-mP-RNA"/>
+                                            <constraint firstItem="zxy-nY-P44" firstAttribute="top" secondItem="869-wx-Odb" secondAttribute="bottom" constant="20.5" id="GU3-JM-b99"/>
+                                            <constraint firstItem="rAZ-eJ-sxy" firstAttribute="leading" secondItem="i7U-bW-juB" secondAttribute="leading" constant="20" id="KKJ-gG-pFL"/>
+                                            <constraint firstAttribute="trailing" secondItem="869-wx-Odb" secondAttribute="trailing" constant="20" id="Lni-gD-7h0"/>
+                                            <constraint firstItem="869-wx-Odb" firstAttribute="top" secondItem="rAZ-eJ-sxy" secondAttribute="bottom" constant="20" id="QBz-cP-SVZ"/>
+                                            <constraint firstAttribute="trailing" secondItem="rAZ-eJ-sxy" secondAttribute="trailing" constant="20" id="WoD-cr-aj9"/>
+                                            <constraint firstAttribute="height" constant="260" id="XTa-ql-yEW"/>
+                                            <constraint firstItem="6Ac-xl-ldZ" firstAttribute="leading" secondItem="i7U-bW-juB" secondAttribute="leading" constant="20" id="jkv-ow-f0q"/>
+                                            <constraint firstItem="869-wx-Odb" firstAttribute="leading" secondItem="i7U-bW-juB" secondAttribute="leading" constant="20" id="qgE-y5-uh8"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="260" id="90R-Mf-iAB"/>
+                                    <constraint firstItem="i7U-bW-juB" firstAttribute="leading" secondItem="XKA-Ub-c2X" secondAttribute="leading" id="e9h-f4-c37"/>
+                                    <constraint firstItem="i7U-bW-juB" firstAttribute="top" secondItem="XKA-Ub-c2X" secondAttribute="top" id="vJV-dl-RLx"/>
+                                    <constraint firstAttribute="trailing" secondItem="i7U-bW-juB" secondAttribute="trailing" id="wYt-hg-yKM"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="XKA-Ub-c2X" secondAttribute="trailing" id="U0P-51-KT9"/>
+                            <constraint firstAttribute="trailing" secondItem="WUc-3Y-Quw" secondAttribute="trailing" id="i7I-7B-97K"/>
+                            <constraint firstItem="WUc-3Y-Quw" firstAttribute="leading" secondItem="75P-2m-6cr" secondAttribute="leading" id="i8b-GU-yFg"/>
+                            <constraint firstItem="XKA-Ub-c2X" firstAttribute="top" secondItem="Un6-jI-efh" secondAttribute="bottom" id="lU2-wP-RQb"/>
+                            <constraint firstItem="XKA-Ub-c2X" firstAttribute="leading" secondItem="75P-2m-6cr" secondAttribute="leading" id="oa7-qv-9am"/>
+                            <constraint firstItem="t9A-zf-Iew" firstAttribute="top" secondItem="WUc-3Y-Quw" secondAttribute="bottom" id="tts-uy-w5J"/>
+                            <constraint firstItem="WUc-3Y-Quw" firstAttribute="top" secondItem="XKA-Ub-c2X" secondAttribute="bottom" id="vjy-iN-Xi7"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Evolution" id="uc7-DN-PYG"/>
+                    <connections>
+                        <outlet property="headerContainer" destination="i7U-bW-juB" id="hpf-7a-yBd"/>
+                        <outlet property="organismLabel" destination="6Ac-xl-ldZ" id="pgF-ej-ovy"/>
+                        <outlet property="progressView" destination="869-wx-Odb" id="um3-UM-uOP"/>
+                        <outlet property="segmentedControl" destination="rAZ-eJ-sxy" id="K3Q-X2-Jrm"/>
+                        <outlet property="tableView" destination="WUc-3Y-Quw" id="3Ki-v0-lTb"/>
+                        <outlet property="titleLabel" destination="zxy-nY-P44" id="9JO-hP-yVp"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="LzB-gZ-6fG" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3694" y="4113"/>
+        </scene>
        <!--CoreStore Demos-->
        <scene sceneID="0Be-vc-h1W">
            <objects>
                <tableViewController id="t0d-B0-B7U" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="uHB-Yr-ujV">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="50" sectionHeaderHeight="10" sectionFooterHeight="10" id="uHB-Yr-ujV">
                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
                        <sections>
                            <tableViewSection id="wIP-Hn-YfF">
                                <cells>
                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Q3n-Df-v1t" detailTextLabel="Hbn-cf-Y7m" style="IBUITableViewCellStyleSubtitle" id="AXm-KE-45G">
+                                        <rect key="frame" x="0.0" y="99" width="600" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AXm-KE-45G" id="9te-Wx-hkf">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Accounts" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Q3n-Df-v1t">
+                                                    <rect key="frame" x="15" y="6" width="82" height="24"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901960784313" green="0.24313725490196078" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Setting up multiple persistent store configurations" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hbn-cf-Y7m">
+                                                    <rect key="frame" x="15" y="30" width="264" height="13.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                            </subviews>
@@ -122,20 +310,24 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="vpt-cT-gMo" detailTextLabel="ou9-TZ-8bf" style="IBUITableViewCellStyleSubtitle" id="fsb-zw-8Ii">
+                                        <rect key="frame" x="0.0" y="149" width="600" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fsb-zw-8Ii" id="Upm-AO-Fw3">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Colors" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vpt-cT-gMo">
+                                                    <rect key="frame" x="15" y="6" width="56" height="24"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Observing list changes and single object changes" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ou9-TZ-8bf">
+                                                    <rect key="frame" x="15" y="30" width="261.5" height="13.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                            </subviews>
@@ -145,20 +337,24 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="UbU-Kd-yrY" detailTextLabel="uP1-Jc-o9v" style="IBUITableViewCellStyleSubtitle" id="ekW-PJ-mbo">
+                                        <rect key="frame" x="0.0" y="199" width="600" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ekW-PJ-mbo" id="CYq-mg-PVS">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Placemark" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UbU-Kd-yrY">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Placemarks" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="UbU-Kd-yrY">
+                                                    <rect key="frame" x="15" y="6" width="100.5" height="24"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Making changes with transactions" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uP1-Jc-o9v">
+                                                    <rect key="frame" x="15" y="30" width="179.5" height="13.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                            </subviews>
@@ -167,45 +363,86 @@
                                            <segue destination="jPl-fH-NlD" kind="show" id="g1J-LG-mxf"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ZfY-Aq-Ykq" detailTextLabel="QzD-9b-k1j" style="IBUITableViewCellStyleSubtitle" id="wyK-rk-3tI">
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wyK-rk-3tI" id="fLd-KK-QcW">
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZfY-Aq-Ykq">
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Fetching objects and raw values" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QzD-9b-k1j">
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="C8Y-0y-lEG" detailTextLabel="jZw-qE-0ws" style="IBUITableViewCellStyleSubtitle" id="ph1-8z-C1m">
+                                        <rect key="frame" x="0.0" y="249" width="600" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ph1-8z-C1m" id="nNz-rd-ksg">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C8Y-0y-lEG">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Time Zones" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="C8Y-0y-lEG">
+                                                    <rect key="frame" x="15" y="6" width="101.5" height="24"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Implementing a custom logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jZw-qE-0ws">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Fetching objects and raw values" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jZw-qE-0ws">
+                                                    <rect key="frame" x="15" y="30" width="169" height="13.5"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
                                            </subviews>
                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="qbj-MK-nIY" kind="show" id="1xo-NL-U8c"/>
+                                        </connections>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="ZfY-Aq-Ykq" detailTextLabel="QzD-9b-k1j" style="IBUITableViewCellStyleSubtitle" id="wyK-rk-3tI">
+                                        <rect key="frame" x="0.0" y="299" width="600" height="50"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wyK-rk-3tI" id="fLd-KK-QcW">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ZfY-Aq-Ykq">
+                                                    <rect key="frame" x="15" y="6" width="61" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Implementing a custom logger" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QzD-9b-k1j">
+                                                    <rect key="frame" x="15" y="30" width="159.5" height="13.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="5yy-0N-QDU" kind="show" id="5D7-Xp-1HT"/>
+                                        </connections>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="hSG-mG-YBw" detailTextLabel="X9P-TQ-LYh" style="IBUITableViewCellStyleSubtitle" id="xTM-Cf-0if">
+                                        <rect key="frame" x="0.0" y="349" width="600" height="50"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xTM-Cf-0if" id="DfO-BW-krd">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="49.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Evolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hSG-mG-YBw">
+                                                    <rect key="frame" x="15" y="6" width="78.5" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Migrating and de-migrating stores" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X9P-TQ-LYh">
+                                                    <rect key="frame" x="15" y="30" width="179.5" height="13.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="iVv-Vc-nCL" kind="show" id="HbO-rU-Qfj"/>
+                                        </connections>
                                    </tableViewCell>
                                </cells>
                            </tableViewSection>
@@ -219,7 +456,7 @@
                </tableViewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="Xgp-Zn-Sbp" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="2982" y="1325"/>
+            <point key="canvasLocation" x="2634" y="2013"/>
        </scene>
        <!--Object Observer-->
        <scene sceneID="Y7v-tc-8cX">
@@ -230,65 +467,65 @@
                        <viewControllerLayoutGuide type="bottom" id="aI4-O3-OCi"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="w8K-eN-RvU">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="268"/>
+                        <rect key="frame" x="0.0" y="0.0" width="592" height="268"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" verticalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NhC-oM-bkd">
-                                <rect key="frame" x="16" y="70" width="568" height="36"/>
+                                <rect key="frame" x="20" y="69.5" width="552" height="36.5"/>
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                <constraints>
                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" id="TIX-qi-B34"/>
                                </constraints>
                            </view>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="250" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsLetterSpacingToFitWidth="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vfe-Yq-3Xa">
-                                <rect key="frame" x="16" y="116" width="568" height="18"/>
+                                <rect key="frame" x="20" y="116" width="552" height="18"/>
                                <constraints>
                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" id="4h9-ha-EzR"/>
                                </constraints>
                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hue" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sgg-Md-Nf3">
-                                <rect key="frame" x="16" y="154" width="74" height="18"/>
+                                <rect key="frame" x="20" y="154" width="74" height="18"/>
                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Saturation" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rry-vh-bRK">
-                                <rect key="frame" x="16" y="192" width="74" height="18"/>
+                                <rect key="frame" x="20" y="192" width="74" height="18"/>
                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Brightness" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vTa-ly-eyO">
-                                <rect key="frame" x="16" y="230" width="74" height="18"/>
+                                <rect key="frame" x="20" y="230" width="74" height="18"/>
                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" minValue="0.0" maxValue="359" translatesAutoresizingMaskIntoConstraints="NO" id="YQ6-fq-3Wb">
-                                <rect key="frame" x="98" y="148" width="488" height="31"/>
+                                <rect key="frame" x="102" y="148" width="472" height="31"/>
                                <connections>
                                    <action selector="hueSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="9Hy-3h-llE"/>
                                </connections>
                            </slider>
                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="xXz-78-tAd">
-                                <rect key="frame" x="98" y="186" width="488" height="31"/>
+                                <rect key="frame" x="102" y="186" width="472" height="31"/>
                                <connections>
                                    <action selector="saturationSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="qtU-ua-ZTc"/>
                                </connections>
                            </slider>
                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="hpy-2d-eOP">
-                                <rect key="frame" x="98" y="224" width="488" height="31"/>
+                                <rect key="frame" x="102" y="224" width="472" height="31"/>
                                <connections>
                                    <action selector="brightnessSliderValueDidChange:" destination="dX3-kR-CYC" eventType="valueChanged" id="F09-EP-2iD"/>
                                </connections>
                            </slider>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p4O-tf-dgt">
-                                <rect key="frame" x="16" y="49" width="568" height="21"/>
+                                <rect key="frame" x="20" y="49" width="552" height="20.5"/>
                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                        </subviews>
@@ -354,17 +591,17 @@
                        <viewControllerLayoutGuide type="bottom" id="LNL-mj-D7l"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="6x3-vn-Egt">
-                        <rect key="frame" x="0.0" y="64" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5f-tW-lXf">
-                                <rect key="frame" x="0.0" y="64" width="600" height="268"/>
+                                <rect key="frame" x="4" y="64" width="592" height="268"/>
                                <connections>
                                    <segue destination="5Fw-je-9gI" kind="embed" id="YcI-2Z-ijV"/>
                                </connections>
                            </containerView>
                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6So-f3-4Gp">
-                                <rect key="frame" x="0.0" y="332" width="600" height="268"/>
+                                <rect key="frame" x="4" y="332" width="592" height="268"/>
                                <connections>
                                    <segue destination="sll-yo-mBc" kind="embed" id="AAl-HS-dq2"/>
                                </connections>
@@ -399,6 +636,12 @@
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="00L-5k-Eno">
                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="tintColor" red="0.92549019610000005" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <textAttributes key="titleTextAttributes">
+                            <fontDescription key="fontDescription" name="HelveticaNeue-UltraLight" family="Helvetica Neue" pointSize="24"/>
+                            <color key="textColor" red="0.92549019607843142" green="0.94117647058823528" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </textAttributes>
                    </navigationBar>
                    <nil name="viewControllers"/>
                    <connections>
@@ -407,19 +650,21 @@
                </navigationController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="sm4-t7-KeT" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="2170" y="1325"/>
+            <point key="canvasLocation" x="1822" y="2013"/>
        </scene>
        <!--List Observer-->
        <scene sceneID="gkX-bd-Rel">
            <objects>
-                <tableViewController id="3AE-ED-0oj" customClass="ObjectListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="3AE-ED-0oj" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="DAz-BE-6Ca">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="268"/>
+                        <rect key="frame" x="0.0" y="0.0" width="592" height="268"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <prototypes>
                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="G3X-70-BCD" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="66" width="592" height="44"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G3X-70-BCD" id="aT8-nz-i5l">
+                                    <rect key="frame" x="0.0" y="0.0" width="559" height="43.5"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uQX-PI-UWF">
@@ -430,9 +675,9 @@
                                            </constraints>
                                        </view>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HJC-5w-lIN">
-                                            <rect key="frame" x="45" y="8" width="37" height="27"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                            <nil key="highlightedColor"/>
                                        </label>
                                    </subviews>
@@ -469,15 +714,17 @@
        <!--List Observer-->
        <scene sceneID="iDB-TD-It9">
            <objects>
-                <tableViewController id="lCE-i6-UCT" customClass="ObjectListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController id="lCE-i6-UCT" customClass="ListObserverDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Zba-8M-Zd7">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="268"/>
+                        <rect key="frame" x="0.0" y="0.0" width="592" height="268"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                        <prototypes>
                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="PaletteTableViewCell" id="zSO-3e-OVq" customClass="PaletteTableViewCell" customModule="CoreStoreDemo" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="66" width="592" height="44"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zSO-3e-OVq" id="cHA-by-n4b">
+                                    <rect key="frame" x="0.0" y="0.0" width="559" height="43.5"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5uq-Yi-XwH">
@@ -488,9 +735,9 @@
                                            </constraints>
                                        </view>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zyu-PC-WmO">
-                                            <rect key="frame" x="45" y="8" width="37" height="27"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <rect key="frame" x="45" y="8" width="34.5" height="27"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                            <nil key="highlightedColor"/>
                                        </label>
                                    </subviews>
@@ -533,10 +780,11 @@
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="6XA-6M-yvZ">
                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                        <autoresizingMask key="autoresizingMask"/>
-                        <color key="tintColor" red="0.75362819430000005" green="0.91446238759999998" blue="0.99948346610000005" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="barTintColor" red="0.49803921580314636" green="0.49803921580314636" blue="0.49803921580314636" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="tintColor" red="0.74117647060000003" green="0.76470588240000004" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <textAttributes key="titleTextAttributes">
-                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="20"/>
+                            <color key="textColor" red="0.74117647060000003" green="0.76470588240000004" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        </textAttributes>
                    </navigationBar>
                    <nil name="viewControllers"/>
@@ -548,7 +796,7 @@
            </objects>
            <point key="canvasLocation" x="4404" y="1546"/>
        </scene>
-        <!--Placemark-->
+        <!--Placemarks-->
        <scene sceneID="LRD-q1-hw1">
            <objects>
                <viewController id="jPl-fH-NlD" customClass="TransactionsDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
@@ -557,11 +805,11 @@
                        <viewControllerLayoutGuide type="bottom" id="RZg-hi-T8O"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="k4s-iL-Krh">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="536"/>
+                        <rect key="frame" x="0.0" y="64" width="600" height="536"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" misplaced="YES" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                            <mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="V2U-0R-Ts0">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="536"/>
                                <connections>
                                    <outlet property="delegate" destination="jPl-fH-NlD" id="Sjn-YC-haS"/>
                                </connections>
@@ -576,7 +824,7 @@
                        </constraints>
                    </view>
                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
-                    <navigationItem key="navigationItem" title="Placemark" id="s5y-WX-W5w"/>
+                    <navigationItem key="navigationItem" title="Placemarks" id="s5y-WX-W5w"/>
                    <connections>
                        <outlet property="mapView" destination="V2U-0R-Ts0" id="X6a-Bp-psg"/>
                    </connections>
@@ -585,6 +833,65 @@
            </objects>
            <point key="canvasLocation" x="3694" y="2020"/>
        </scene>
+        <!--Logger-->
+        <scene sceneID="n7W-0g-bbY">
+            <objects>
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="5yy-0N-QDU" customClass="CustomLoggerViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="pvA-Nu-u2P"/>
+                        <viewControllerLayoutGuide type="bottom" id="Cwn-Jd-4Lr"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="n9M-Je-Dj0">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" directionalLockEnabled="YES" alwaysBounceVertical="YES" indicatorStyle="white" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TpK-gX-CTN">
+                                <rect key="frame" x="0.0" y="142" width="600" height="458"/>
+                                <color key="backgroundColor" red="0.20392156862745098" green="0.28627450980392155" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" red="0.94509803921568625" green="0.7686274509803922" blue="0.058823529411764705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="15"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bordered" momentary="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4iq-B4-k0p">
+                                <rect key="frame" x="20" y="94" width="560" height="29"/>
+                                <segments>
+                                    <segment title="Log"/>
+                                    <segment title="Error"/>
+                                    <segment title="Assert"/>
+                                </segments>
+                                <color key="tintColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <connections>
+                                    <action selector="segmentedControlValueChanged:" destination="5yy-0N-QDU" eventType="valueChanged" id="2pp-Vt-2Os"/>
+                                </connections>
+                            </segmentedControl>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="4iq-B4-k0p" firstAttribute="leading" secondItem="n9M-Je-Dj0" secondAttribute="leading" constant="20" id="6SM-eN-NxP"/>
+                            <constraint firstItem="TpK-gX-CTN" firstAttribute="leading" secondItem="n9M-Je-Dj0" secondAttribute="leading" id="AAw-IG-taz"/>
+                            <constraint firstItem="TpK-gX-CTN" firstAttribute="height" secondItem="n9M-Je-Dj0" secondAttribute="height" multiplier="0.5" id="Du2-yY-yfP"/>
+                            <constraint firstItem="4iq-B4-k0p" firstAttribute="top" secondItem="pvA-Nu-u2P" secondAttribute="bottom" constant="30" id="Mco-Qt-OkH"/>
+                            <constraint firstItem="TpK-gX-CTN" firstAttribute="top" secondItem="4iq-B4-k0p" secondAttribute="bottom" constant="20" id="tMF-ER-rYX"/>
+                            <constraint firstAttribute="trailing" secondItem="4iq-B4-k0p" secondAttribute="trailing" constant="20" id="uBb-jQ-c4V"/>
+                            <constraint firstItem="Cwn-Jd-4Lr" firstAttribute="top" secondItem="TpK-gX-CTN" secondAttribute="bottom" id="vSD-vy-P5P"/>
+                            <constraint firstAttribute="trailing" secondItem="TpK-gX-CTN" secondAttribute="trailing" id="xit-v8-6QP"/>
+                        </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="Du2-yY-yfP"/>
+                            </mask>
+                        </variation>
+                    </view>
+                    <navigationItem key="navigationItem" title="Logger" id="hD2-by-4fO"/>
+                    <connections>
+                        <outlet property="segmentedControl" destination="4iq-B4-k0p" id="aJT-Tr-QRX"/>
+                        <outlet property="textView" destination="TpK-gX-CTN" id="keL-wF-b90"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="gKf-zW-DSX" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3694" y="3412"/>
+        </scene>
        <!--Navigation Controller-->
        <scene sceneID="3ih-RN-P43">
            <objects>
@@ -594,10 +901,11 @@
                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="wJo-mp-1pS">
                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                        <autoresizingMask key="autoresizingMask"/>
-                        <color key="tintColor" red="0.7536281943321228" green="0.9144623875617981" blue="0.99948346614837646" alpha="1" colorSpace="calibratedRGB"/>
-                        <color key="barTintColor" red="0.49803921579999999" green="0.49803921579999999" blue="0.49803921579999999" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="tintColor" red="0.74117647058823533" green="0.76470588235294112" blue="0.7803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="0.17254901960784313" green="0.24313725490196078" blue="0.31372549019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <textAttributes key="titleTextAttributes">
-                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <fontDescription key="fontDescription" name="HelveticaNeue-Thin" family="Helvetica Neue" pointSize="20"/>
+                            <color key="textColor" red="0.74117647060000003" green="0.76470588240000004" blue="0.78039215689999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        </textAttributes>
                    </navigationBar>
                    <nil name="viewControllers"/>
@@ -609,11 +917,187 @@
            </objects>
            <point key="canvasLocation" x="4404" y="1144.5"/>
        </scene>
+        <!--Time Zones-->
+        <scene sceneID="nFT-bo-7y9">
+            <objects>
+                <viewController automaticallyAdjustsScrollViewInsets="NO" id="qbj-MK-nIY" customClass="FetchingAndQueryingDemoViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="dgu-PC-LiB"/>
+                        <viewControllerLayoutGuide type="bottom" id="DlN-cN-JXd"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="eC3-ql-d2o">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="WGY-kX-mAx">
+                                <rect key="frame" x="0.0" y="64" width="600" height="536"/>
+                                <color key="backgroundColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="separatorColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <view key="tableHeaderView" contentMode="scaleToFill" id="iaH-1W-Sbo">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="80"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <subviews>
+                                        <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bordered" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="YVj-dA-fyV">
+                                            <rect key="frame" x="20" y="26" width="560" height="29"/>
+                                            <segments>
+                                                <segment title="Fetch"/>
+                                                <segment title="Query"/>
+                                            </segments>
+                                            <color key="tintColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <connections>
+                                                <action selector="segmentedControlValueChanged:" destination="qbj-MK-nIY" eventType="valueChanged" id="Wok-dl-uq7"/>
+                                            </connections>
+                                        </segmentedControl>
+                                    </subviews>
+                                    <color key="backgroundColor" white="1" alpha="0.80000000000000004" colorSpace="calibratedWhite"/>
+                                    <constraints>
+                                        <constraint firstItem="YVj-dA-fyV" firstAttribute="leading" secondItem="iaH-1W-Sbo" secondAttribute="leading" constant="20" id="1dX-t7-dyR"/>
+                                        <constraint firstAttribute="centerY" secondItem="YVj-dA-fyV" secondAttribute="centerY" id="HXU-Z7-jfu"/>
+                                        <constraint firstAttribute="trailing" secondItem="YVj-dA-fyV" secondAttribute="trailing" constant="20" id="yZc-YH-2a6"/>
+                                    </constraints>
+                                </view>
+                                <prototypes>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="6db-P0-6Ms" style="IBUITableViewCellStyleDefault" id="vUr-WV-qur">
+                                        <rect key="frame" x="0.0" y="102" width="600" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vUr-WV-qur" id="Vr0-hE-cn9">
+                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6db-P0-6Ms">
+                                                    <rect key="frame" x="15" y="0.0" width="550" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="18"/>
+                                                    <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                                <connections>
+                                    <outlet property="dataSource" destination="qbj-MK-nIY" id="EzZ-Ai-1Ws"/>
+                                    <outlet property="delegate" destination="qbj-MK-nIY" id="nxB-y6-zeW"/>
+                                </connections>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="WGY-kX-mAx" firstAttribute="top" secondItem="dgu-PC-LiB" secondAttribute="bottom" id="0pS-cU-ibk"/>
+                            <constraint firstAttribute="trailing" secondItem="WGY-kX-mAx" secondAttribute="trailing" id="NeY-g5-CaB"/>
+                            <constraint firstItem="WGY-kX-mAx" firstAttribute="leading" secondItem="eC3-ql-d2o" secondAttribute="leading" id="hmg-4g-RJR"/>
+                            <constraint firstItem="DlN-cN-JXd" firstAttribute="top" secondItem="WGY-kX-mAx" secondAttribute="bottom" id="noT-BW-H0m"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="Time Zones" id="iCK-OF-qH9"/>
+                    <connections>
+                        <outlet property="segmentedControl" destination="YVj-dA-fyV" id="BPp-f2-VxW"/>
+                        <outlet property="tableView" destination="WGY-kX-mAx" id="7kc-fB-s7N"/>
+                        <segue destination="tIs-pN-OgO" kind="show" identifier="FetchingResultsViewController" id="AoY-Dn-t34"/>
+                        <segue destination="o9D-Xm-13g" kind="show" identifier="QueryingResultsViewController" id="0RK-WR-PQ9"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="blS-OT-gHK" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3694" y="2712"/>
+        </scene>
+        <!--Fetch Results-->
+        <scene sceneID="kk7-cC-Fj8">
+            <objects>
+                <tableViewController id="tIs-pN-OgO" customClass="FetchingResultsViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="36" sectionFooterHeight="22" id="tVl-tT-UDk">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="separatorColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="RgX-yK-1L2" detailTextLabel="QZ4-A2-x4h" style="IBUITableViewCellStyleSubtitle" id="uBt-Iy-nWP">
+                                <rect key="frame" x="0.0" y="100" width="600" height="60"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uBt-Iy-nWP" id="6SD-ur-9zp">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RgX-yK-1L2">
+                                            <rect key="frame" x="15" y="11" width="48.5" height="24"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QZ4-A2-x4h">
+                                            <rect key="frame" x="15" y="35" width="31" height="13.5"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="tIs-pN-OgO" id="6Bt-9f-xrK"/>
+                            <outlet property="delegate" destination="tIs-pN-OgO" id="unW-dH-8W2"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Fetch Results" id="q8f-ux-g9l"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="oNB-PO-h8i" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4404" y="2369"/>
+        </scene>
+        <!--Query Results-->
+        <scene sceneID="eUn-Bw-RNd">
+            <objects>
+                <tableViewController id="o9D-Xm-13g" customClass="QueryingResultsViewController" customModule="CoreStoreDemo" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="36" sectionFooterHeight="22" id="bMh-zR-xwu">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="separatorColor" red="0.20392156859999999" green="0.28627450980000002" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="Syt-QJ-KXg" detailTextLabel="yHS-dP-IKS" style="IBUITableViewCellStyleSubtitle" id="q7Q-aF-Ftl">
+                                <rect key="frame" x="0.0" y="100" width="600" height="60"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q7Q-aF-Ftl" id="fc3-eg-yes">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="name" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Syt-QJ-KXg">
+                                            <rect key="frame" x="15" y="11" width="48.5" height="24"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="20"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="offset" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yHS-dP-IKS">
+                                            <rect key="frame" x="15" y="35" width="31" height="13.5"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                            <color key="textColor" red="0.17254901959999999" green="0.24313725489999999" blue="0.31372549020000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="o9D-Xm-13g" id="X7V-ld-5ea"/>
+                            <outlet property="delegate" destination="o9D-Xm-13g" id="h9U-qa-e4j"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Query Results" id="yuZ-gO-DnV"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="VxN-sF-a59" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4404" y="3055"/>
+        </scene>
    </scenes>
    <resources>
        <image name="second" width="30" height="30"/>
    </resources>
    <inferredMetricsTieBreakers>
-        <segue reference="hyN-De-zte"/>
+        <segue reference="fIB-GS-Ppk"/>
    </inferredMetricsTieBreakers>
 </document>
--- a/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
+++ b/CoreStoreDemo/CoreStoreDemo/CoreStoreDemo.xcdatamodeld/CoreStoreDemo.xcdatamodel/contents
@@ -13,26 +13,25 @@
        <attribute name="subtitle" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
    </entity>
-    <entity name="UserAccount" representedClassName="CoreStoreDemo.UserAccount" syncable="YES">
-        <attribute name="accountType" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="friends" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+    <entity name="TimeZone" representedClassName="CoreStoreDemo.TimeZone" syncable="YES">
+        <attribute name="abbreviation" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="daylightSavingTimeOffset" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/>
+        <attribute name="hasDaylightSavingTime" optional="YES" attributeType="Boolean" syncable="YES"/>
        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="secondsFromGMT" optional="YES" attributeType="Integer 32" defaultValueString="0.0" syncable="YES"/>
    </entity>
+    <configuration name="FetchingAndQueryingDemo">
+        <memberEntity name="TimeZone"/>
+    </configuration>
    <configuration name="ObservingDemo">
        <memberEntity name="Palette"/>
    </configuration>
-    <configuration name="SetupDemo_Jane">
-        <memberEntity name="UserAccount"/>
-    </configuration>
-    <configuration name="SetupDemo_John">
-        <memberEntity name="UserAccount"/>
-    </configuration>
    <configuration name="TransactionsDemo">
        <memberEntity name="Place"/>
    </configuration>
    <elements>
        <element name="Palette" positionX="261" positionY="189" width="128" height="105"/>
-        <element name="UserAccount" positionX="261" positionY="216" width="128" height="90"/>
        <element name="Place" positionX="261" positionY="225" width="128" height="105"/>
+        <element name="TimeZone" positionX="297" positionY="270" width="128" height="120"/>
    </elements>
 </model>
--- a/Demo/FetchingAndQueryingDemoViewController.swift
+++ b/Demo/FetchingAndQueryingDemoViewController.swift
@@ -0,0 +1,290 @@
+//
+//  FetchingAndQueryingDemoViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/12.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+
+
+private struct Static {
+    
+    static let timeZonesStack: DataStack = {
+        
+        let dataStack = DataStack()
+        try! dataStack.addSQLiteStoreAndWait(
+            fileName: "TimeZoneDemo.sqlite",
+            configuration: "FetchingAndQueryingDemo",
+            resetStoreOnModelMismatch: true
+        )
+    
+        dataStack.beginSynchronous { (transaction) -> Void in
+            
+            transaction.deleteAll(From(TimeZone))
+            
+            for name in NSTimeZone.knownTimeZoneNames() {
+                
+                let rawTimeZone = NSTimeZone(name: name)!
+                let cachedTimeZone = transaction.create(Into(TimeZone))
+                
+                cachedTimeZone.name = rawTimeZone.name
+                cachedTimeZone.abbreviation = rawTimeZone.abbreviation ?? ""
+                cachedTimeZone.secondsFromGMT = Int32(rawTimeZone.secondsFromGMT)
+                cachedTimeZone.hasDaylightSavingTime = rawTimeZone.daylightSavingTime
+                cachedTimeZone.daylightSavingTimeOffset = rawTimeZone.daylightSavingTimeOffset
+            }
+            
+            transaction.commit()
+        }
+        
+        return dataStack
+    }()
+}
+
+
+// MARK: - FetchingAndQueryingDemoViewController
+
+class FetchingAndQueryingDemoViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
+    
+    // MARK: UIViewController
+    
+    override func viewDidAppear(animated: Bool) {
+        
+        super.viewDidAppear(animated)
+        
+        if self.didAppearOnce {
+            
+            return
+        }
+        
+        self.didAppearOnce = true
+        
+        let alert = UIAlertController(
+            title: "Fetch and Query Demo",
+            message: "This demo shows how to execute fetches and queries.\n\nEach menu item executes and displays a preconfigured fetch/query.",
+            preferredStyle: .Alert
+        )
+        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
+        self.presentViewController(alert, animated: true, completion: nil)
+    }
+    
+    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+        
+        super.prepareForSegue(segue, sender: sender)
+        
+        if let indexPath = sender as? NSIndexPath {
+            
+            switch segue.destinationViewController {
+                
+            case let controller as FetchingResultsViewController:
+                let item = self.fetchingItems[indexPath.row]
+                controller.setTimeZones(item.fetch(), title: item.title)
+                
+            case let controller as QueryingResultsViewController:
+                let item = self.queryingItems[indexPath.row]
+                controller.setValue(item.query(), title: item.title)
+                
+            default:
+                break
+            }
+        }
+    }
+    
+    
+    // MARK: UITableViewDataSource
+    
+    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        switch self.segmentedControl?.selectedSegmentIndex {
+            
+        case .Some(Section.Fetching.rawValue):
+            return self.fetchingItems.count
+            
+        case .Some(Section.Querying.rawValue):
+            return self.queryingItems.count
+            
+        default:
+            return 0
+        }
+    }
+    
+    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell")!
+        
+        switch self.segmentedControl?.selectedSegmentIndex {
+            
+        case .Some(Section.Fetching.rawValue):
+            cell.textLabel?.text = self.fetchingItems[indexPath.row].title
+            
+        case .Some(Section.Querying.rawValue):
+            cell.textLabel?.text = self.queryingItems[indexPath.row].title
+            
+        default:
+            cell.textLabel?.text = nil
+        }
+        
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+        
+        tableView.deselectRowAtIndexPath(indexPath, animated: true)
+        
+        switch self.segmentedControl?.selectedSegmentIndex {
+            
+        case .Some(Section.Fetching.rawValue):
+            self.performSegueWithIdentifier("FetchingResultsViewController", sender: indexPath)
+            
+        case .Some(Section.Querying.rawValue):
+            self.performSegueWithIdentifier("QueryingResultsViewController", sender: indexPath)
+            
+        default:
+            break
+        }
+    }
+    
+    
+    // MARK: Private
+    
+    private enum Section: Int {
+        
+        case Fetching
+        case Querying
+    }
+    
+    private let fetchingItems = [
+        (
+            title: "All Time Zones",
+            fetch: { () -> [TimeZone] in
+                
+                return Static.timeZonesStack.fetchAll(
+                    From(TimeZone),
+                    OrderBy(.Ascending("name"))
+                )!
+            }
+        ),
+        (
+            title: "Time Zones in Asia",
+            fetch: { () -> [TimeZone] in
+                
+                return Static.timeZonesStack.fetchAll(
+                    From(TimeZone),
+                    Where("%K BEGINSWITH[c] %@", "name", "Asia"),
+                    OrderBy(.Ascending("secondsFromGMT"))
+                )!
+            }
+        ),
+        (
+            title: "Time Zones in America and Europe",
+            fetch: { () -> [TimeZone] in
+                
+                return Static.timeZonesStack.fetchAll(
+                    From(TimeZone),
+                    Where("%K BEGINSWITH[c] %@", "name", "America")
+                        || Where("%K BEGINSWITH[c] %@", "name", "Europe"),
+                    OrderBy(.Ascending("secondsFromGMT"))
+                )!
+            }
+        ),
+        (
+            title: "All Time Zones Except America",
+            fetch: { () -> [TimeZone] in
+                
+                return Static.timeZonesStack.fetchAll(
+                    From(TimeZone),
+                    !Where("%K BEGINSWITH[c] %@", "name", "America"),
+                    OrderBy(.Ascending("secondsFromGMT"))
+                    )!
+            }
+        ),
+        (
+            title: "Time Zones with Summer Time",
+            fetch: { () -> [TimeZone] in
+                
+                return Static.timeZonesStack.fetchAll(
+                    From(TimeZone),
+                    Where("hasDaylightSavingTime", isEqualTo: true),
+                    OrderBy(.Ascending("name"))
+                )!
+            }
+        )
+    ]
+    
+    private let queryingItems = [
+        (
+            title: "Number of Time Zones",
+            query: { () -> AnyObject in
+                
+                return Static.timeZonesStack.queryValue(
+                    From(TimeZone),
+                    Select<NSNumber>(.Count("name"))
+                )!
+            }
+        ),
+        (
+            title: "Abbreviation For Tokyo's Time Zone",
+            query: { () -> AnyObject in
+                
+                return Static.timeZonesStack.queryValue(
+                    From(TimeZone),
+                    Select<String>("abbreviation"),
+                    Where("%K ENDSWITH[c] %@", "name", "Tokyo")
+                )!
+            }
+        ),
+        (
+            title: "All Abbreviations",
+            query: { () -> AnyObject in
+                
+                return Static.timeZonesStack.queryAttributes(
+                    From(TimeZone),
+                    Select<NSDictionary>("name", "abbreviation"),
+                    OrderBy(.Ascending("name"))
+                )!
+            }
+        ),
+        (
+            title: "Number of Countries per Time Zone",
+            query: { () -> AnyObject in
+                
+                return Static.timeZonesStack.queryAttributes(
+                    From(TimeZone),
+                    Select<NSDictionary>(.Count("abbreviation"), "abbreviation"),
+                    GroupBy("abbreviation"),
+                    OrderBy(.Ascending("secondsFromGMT"), .Ascending("name"))
+                )!
+            }
+        ),
+        (
+            title: "Number of Countries with Summer Time",
+            query: { () -> AnyObject in
+                
+                return Static.timeZonesStack.queryAttributes(
+                    From(TimeZone),
+                    Select<NSDictionary>(
+                        .Count("hasDaylightSavingTime", As: "numberOfCountries"),
+                        "hasDaylightSavingTime"
+                    ),
+                    GroupBy("hasDaylightSavingTime"),
+                    OrderBy(.Descending("hasDaylightSavingTime"))
+                )!
+            }
+        )
+    ]
+    
+    var didAppearOnce = false
+    
+    @IBOutlet dynamic weak var segmentedControl: UISegmentedControl?
+    @IBOutlet dynamic weak var tableView: UITableView?
+    
+    @IBAction dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+        
+        self.tableView?.reloadData()
+    }
+}
--- a/Demo/FetchingResultsViewController.swift
+++ b/Demo/FetchingResultsViewController.swift
@@ -0,0 +1,68 @@
+//
+//  FetchingResultsViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/17.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+// MARK: - FetchingResultsViewController
+
+class FetchingResultsViewController: UITableViewController {
+
+    // MARK: Public
+    
+    func setTimeZones(timeZones: [TimeZone]?, title: String) {
+        
+        self.timeZones += timeZones ?? []
+        self.sectionTitle = title
+        
+        self.tableView?.reloadData()
+    }
+    
+    
+    // MARK: UIViewController
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        self.tableView.estimatedRowHeight = 60
+        self.tableView.rowHeight = UITableViewAutomaticDimension
+    }
+    
+    
+    // MARK: UITableViewDataSource
+    
+    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return self.timeZones.count
+    }
+    
+    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell", forIndexPath: indexPath)
+        
+        let timeZone = self.timeZones[indexPath.row]
+        cell.textLabel?.text = timeZone.name
+        cell.detailTextLabel?.text = timeZone.abbreviation
+        
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        
+        return self.sectionTitle
+    }
+    
+    
+    // MARK: Private
+    
+    var timeZones = [TimeZone]()
+    var sectionTitle: String?
+}
--- a/Demo/QueryingResultsViewController.swift
+++ b/Demo/QueryingResultsViewController.swift
@@ -0,0 +1,88 @@
+//
+//  QueryingResultsViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/17.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+class QueryingResultsViewController: UITableViewController {
+    
+    // MARK: Public
+    
+    func setValue(value: AnyObject?, title: String) {
+        
+        switch value {
+            
+        case .Some(let array as [AnyObject]):
+            self.values = array.map { (item: AnyObject) -> (title: String, detail: String) in
+                (
+                    title: item.description,
+                    detail: _stdlib_getDemangledTypeName(item)
+                )
+            }
+            
+        case .Some(let item):
+            self.values = [
+                (
+                    title: item.description,
+                    detail: _stdlib_getDemangledTypeName(item)
+                )
+            ]
+            
+        default:
+            self.values = []
+        }
+        
+        self.sectionTitle = title
+        
+        self.tableView?.reloadData()
+    }
+    
+    
+    // MARK: UIViewController
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        self.tableView.estimatedRowHeight = 60
+        self.tableView.rowHeight = UITableViewAutomaticDimension
+    }
+    
+    
+    // MARK: UITableViewDataSource
+    
+    override func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return self.values.count
+    }
+    
+    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell", forIndexPath: indexPath)
+        
+        let value = self.values[indexPath.row]
+        
+        cell.textLabel?.text = value.title
+        cell.detailTextLabel?.text = value.detail
+        
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    override func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        
+        return self.sectionTitle
+    }
+    
+    
+    // MARK: Private
+    
+    var values: [(title: String, detail: String)] = []
+    var sectionTitle: String?
+}
--- a/CoreStoreDemo/CoreStoreDemo/Fetching
+++ b/CoreStoreDemo/CoreStoreDemo/Fetching
@@ -0,0 +1,20 @@
+//
+//  TimeZone.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/15.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class TimeZone: NSManagedObject {
+
+    @NSManaged var secondsFromGMT: Int32
+    @NSManaged var abbreviation: String
+    @NSManaged var hasDaylightSavingTime: Bool
+    @NSManaged var daylightSavingTimeOffset: Double
+    @NSManaged var name: String
+
+}
--- a/CoreStoreDemo/CoreStoreDemo/Info.plist
+++ b/CoreStoreDemo/CoreStoreDemo/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.johnestropia.HardcoreDataDemo</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -30,6 +30,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UIStatusBarTintParameters</key>
 	<dict>
 		<key>UINavigationBar</key>
@@ -44,5 +46,7 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
--- a/Demo/ObjectListObserverDemoViewController.swift
+++ b/Demo/ObjectListObserverDemoViewController.swift
@@ -1,5 +1,5 @@
 //
-//  ObjectListObserverDemoViewController.swift
+//  ListObserverDemoViewController.swift
 //  CoreStoreDemo
 //
 //  Created by John Rommel Estropia on 2015/05/02.
@@ -12,26 +12,26 @@ import CoreStore

 private struct Static {
    
-    static let palettes: ManagedObjectListController<Palette> = {
+    static let palettes: ListMonitor<Palette> = {
        
-        CoreStore.addSQLiteStore(
-            "ColorsDemo.sqlite",
+        try! CoreStore.addSQLiteStoreAndWait(
+            fileName: "ColorsDemo.sqlite",
            configuration: "ObservingDemo",
-            resetStoreOnMigrationFailure: true
+            resetStoreOnModelMismatch: true
        )
        
-        return CoreStore.observeSectionedList(
+        return CoreStore.monitorSectionedList(
            From(Palette),
-            SectionedBy("colorName"),
+            SectionBy("colorName"),
            OrderBy(.Ascending("hue"))
        )
    }()
 }


-// MARK: - ObjectListObserverDemoViewController
+// MARK: - ListObserverDemoViewController

-class ObjectListObserverDemoViewController: UITableViewController, ManagedObjectListSectionObserver {
+class ListObserverDemoViewController: UITableViewController, ListSectionObserver {
    
    // MARK: NSObject
    
@@ -138,32 +138,32 @@ class ObjectListObserverDemoViewController: UITableViewController, ManagedObject
    }
    
    
-    // MARK: ManagedObjectListChangeObserver
+    // MARK: ListObserver
    
-    func managedObjectListWillChange(listController: ManagedObjectListController<Palette>) {
+    func listMonitorWillChange(monitor: ListMonitor<Palette>) {
        
        self.tableView.beginUpdates()
    }
    
-    func managedObjectListDidChange(listController: ManagedObjectListController<Palette>) {
+    func listMonitorDidChange(monitor: ListMonitor<Palette>) {
        
        self.tableView.endUpdates()
    }
    
    
-    // MARK: ManagedObjectListObjectObserver
+    // MARK: ListObjectObserver
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didInsertObject object: Palette, toIndexPath indexPath: NSIndexPath) {
+    func listMonitor(monitor: ListMonitor<Palette>, didInsertObject object: Palette, toIndexPath indexPath: NSIndexPath) {
        
        self.tableView.insertRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
    }
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: NSIndexPath) {
+    func listMonitor(monitor: ListMonitor<Palette>, didDeleteObject object: Palette, fromIndexPath indexPath: NSIndexPath) {
        
        self.tableView.deleteRowsAtIndexPaths([indexPath], withRowAnimation: .Automatic)
    }
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: NSIndexPath) {
+    func listMonitor(monitor: ListMonitor<Palette>, didUpdateObject object: Palette, atIndexPath indexPath: NSIndexPath) {
        
        if let cell = self.tableView.cellForRowAtIndexPath(indexPath) as? PaletteTableViewCell {
            
@@ -173,21 +173,21 @@ class ObjectListObserverDemoViewController: UITableViewController, ManagedObject
        }
    }
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didMoveObject object: Palette, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {
+    func listMonitor(monitor: ListMonitor<Palette>, didMoveObject object: Palette, fromIndexPath: NSIndexPath, toIndexPath: NSIndexPath) {
        
        self.tableView.deleteRowsAtIndexPaths([fromIndexPath], withRowAnimation: .Automatic)
        self.tableView.insertRowsAtIndexPaths([toIndexPath], withRowAnimation: .Automatic)
    }
    
    
-    // MARK: ManagedObjectListSectionObserver
+    // MARK: ListSectionObserver
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
+    func listMonitor(monitor: ListMonitor<Palette>, didInsertSection sectionInfo: NSFetchedResultsSectionInfo, toSectionIndex sectionIndex: Int) {
        
        self.tableView.insertSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
    }
    
-    func managedObjectList(listController: ManagedObjectListController<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
+    func listMonitor(monitor: ListMonitor<Palette>, didDeleteSection sectionInfo: NSFetchedResultsSectionInfo, fromSectionIndex sectionIndex: Int) {
        
        self.tableView.deleteSections(NSIndexSet(index: sectionIndex), withRowAnimation: .Automatic)
    }
@@ -195,7 +195,7 @@ class ObjectListObserverDemoViewController: UITableViewController, ManagedObject
    
    // MARK: Private
    
-    @IBAction dynamic func resetBarButtonItemTouched(sender: AnyObject?) {
+    @IBAction private dynamic func resetBarButtonItemTouched(sender: AnyObject?) {
        
        CoreStore.beginAsynchronous { (transaction) -> Void in
            
@@ -204,7 +204,7 @@ class ObjectListObserverDemoViewController: UITableViewController, ManagedObject
        }
    }
    
-    @IBAction dynamic func addBarButtonItemTouched(sender: AnyObject?) {
+    @IBAction private dynamic func addBarButtonItemTouched(sender: AnyObject?) {
        
        CoreStore.beginAsynchronous { (transaction) -> Void in
            
--- a/Demo/ObjectObserverDemoViewController.swift
+++ b/Demo/ObjectObserverDemoViewController.swift
@@ -12,23 +12,23 @@ import CoreStore

 // MARK: - ObjectObserverDemoViewController

-class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver {
+class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
    
    var palette: Palette? {
        
        get {
            
-            return self.objectController?.object
+            return self.monitor?.object
        }
        set {
            
            if let palette = newValue {
                
-                self.objectController = CoreStore.observeObject(palette)
+                self.monitor = CoreStore.monitorObject(palette)
            }
            else {
                
-                self.objectController = nil
+                self.monitor = nil
            }
        }
    }
@@ -37,17 +37,17 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
    
    deinit {
        
-        self.objectController?.removeObserver(self)
+        self.monitor?.removeObserver(self)
    }
    

    // MARK: UIViewController
    
-    required init(coder aDecoder: NSCoder) {
+    required init?(coder aDecoder: NSCoder) {
        
        if let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue"))) {
            
-            self.objectController = CoreStore.observeObject(palette)
+            self.monitor = CoreStore.monitorObject(palette)
        }
        else {
            
@@ -60,7 +60,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
            }
            
            let palette = CoreStore.fetchOne(From(Palette), OrderBy(.Ascending("hue")))!
-            self.objectController = CoreStore.observeObject(palette)
+            self.monitor = CoreStore.monitorObject(palette)
        }
        
        super.init(coder: aDecoder)
@@ -69,28 +69,23 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
    override func viewDidLoad() {
        
        super.viewDidLoad()
-        self.objectController?.addObserver(self)
+        self.monitor?.addObserver(self)
        
-        if let palette = self.objectController?.object {
+        if let palette = self.monitor?.object {
            
            self.reloadPaletteInfo(palette, changedKeys: nil)
        }
    }
    
    
-    // MARK: ManagedObjectObserver
+    // MARK: ObjectObserver
    
-    func managedObjectWillUpdate(objectController: ManagedObjectController<Palette>, object: Palette) {
-        
-        // none
-    }
-    
-    func managedObjectWasUpdated(objectController: ManagedObjectController<Palette>, object: Palette, changedPersistentKeys: Set<KeyPath>) {
+    func objectMonitor(monitor: ObjectMonitor<Palette>, didUpdateObject object: Palette, changedPersistentKeys: Set<KeyPath>) {
        
        self.reloadPaletteInfo(object, changedKeys: changedPersistentKeys)
    }
    
-    func managedObjectWasDeleted(objectController: ManagedObjectController<Palette>, object: Palette) {
+    func objectMonitor(monitor: ObjectMonitor<Palette>, didDeleteObject object: Palette) {
        
        self.navigationItem.rightBarButtonItem?.enabled = false
        
@@ -108,7 +103,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
    
    // MARK: Private
    
-    var objectController: ManagedObjectController<Palette>?
+    var monitor: ObjectMonitor<Palette>?
    
    @IBOutlet weak var colorNameLabel: UILabel?
    @IBOutlet weak var colorView: UIView?
@@ -123,7 +118,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
        let hue = self.hueSlider?.value ?? 0
        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
            
-            if let palette = transaction.fetch(self?.objectController?.object) {
+            if let palette = transaction.edit(self?.monitor?.object) {
                
                palette.hue = Int32(hue)
                transaction.commit()
@@ -136,7 +131,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
        let saturation = self.saturationSlider?.value ?? 0
        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
            
-            if let palette = transaction.fetch(self?.objectController?.object) {
+            if let palette = transaction.edit(self?.monitor?.object) {
                
                palette.saturation = saturation
                transaction.commit()
@@ -149,7 +144,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
        let brightness = self.brightnessSlider?.value ?? 0
        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
            
-            if let palette = transaction.fetch(self?.objectController?.object) {
+            if let palette = transaction.edit(self?.monitor?.object) {
                
                palette.brightness = brightness
                transaction.commit()
@@ -161,7 +156,7 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
        
        CoreStore.beginAsynchronous { [weak self] (transaction) -> Void in
            
-            transaction.delete(self?.objectController?.object)
+            transaction.delete(self?.monitor?.object)
            transaction.commit()
        }
    }
@@ -176,10 +171,6 @@ class ObjectObserverDemoViewController: UIViewController, ManagedObjectObserver
        
        self.hsbLabel?.text = palette.colorText
        
-        let hue = palette.hue
-        let saturation = palette.saturation
-        let brightness = palette.brightness
-        
        if changedKeys == nil || changedKeys?.contains("hue") == true {
            
            self.hueSlider?.value = Float(palette.hue)
--- a/Demo/ObserversViewController.swift
+++ b/Demo/ObserversViewController.swift
@@ -21,7 +21,7 @@ class ObserversViewController: UIViewController {
        
        let alert = UIAlertController(
            title: "Observers Demo",
-            message: "This demo shows how to observe changes to a list of objects. The top and bottom view controllers both observe a single shared \"ManagedObjectListController\" instance.\n\nTap on a row to see another demo that shows how to observe changes to a single object using a \"ManagedObjectController\".",
+            message: "This demo shows how to observe changes to a list of objects. The top and bottom view controllers both observe a single shared \"ListMonitor\" instance.\n\nTap on a row to see how to observe changes made to a single object using a \"ObjectMonitor\".",
            preferredStyle: .Alert
        )
        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
--- a/Demo/CustomLoggerViewController.swift
+++ b/Demo/CustomLoggerViewController.swift
@@ -0,0 +1,129 @@
+//
+//  CustomLoggerViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/05.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+import GCDKit
+
+
+// MARK: - CustomLoggerViewController
+
+class CustomLoggerViewController: UIViewController, CoreStoreLogger {
+    
+    // MARK: NSObject
+    
+    deinit {
+        
+        CoreStore.logger = DefaultLogger()
+    }
+    
+    let dataStack = DataStack()
+    
+    // MARK: UIViewController
+
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        try! self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite")
+        CoreStore.logger = self
+    }
+    
+    override func viewDidAppear(animated: Bool) {
+        
+        super.viewDidAppear(animated)
+        
+        let alert = UIAlertController(
+            title: "Logger Demo",
+            message: "This demo shows how to plug-in any logging framework to CoreStore.\n\nThe view controller implements CoreStoreLogger and appends all logs to the text view.",
+            preferredStyle: .Alert
+        )
+        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
+        self.presentViewController(alert, animated: true, completion: nil)
+    }
+
+    
+    // MARK: CoreStoreLogger
+    
+    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        GCDQueue.Main.async { [weak self] in
+            
+            let levelString: String
+            switch level {
+                
+            case .Trace: levelString = "Trace"
+            case .Notice: levelString = "Notice"
+            case .Warning: levelString = "Warning"
+            case .Fatal: levelString = "Fatal"
+            }
+            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Log:\(levelString)] \(message)\n\n")
+        }
+    }
+    
+    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        GCDQueue.Main.async { [weak self] in
+            
+            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Error] \(message): \(error)\n\n")
+        }
+    }
+    
+    func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        if condition() {
+            
+            return
+        }
+        
+        GCDQueue.Main.async { [weak self] in
+            
+            self?.textView?.insertText("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Assert] \(message)\n\n")
+        }
+    }
+    
+    @noreturn func fatalError(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        Swift.fatalError("\((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ [Abort] \(message)")
+    }
+    
+    
+    // MARK: Private
+    
+    @IBOutlet dynamic weak var textView: UITextView?
+    @IBOutlet dynamic weak var segmentedControl: UISegmentedControl?
+    
+    @IBAction dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+        
+        switch self.segmentedControl?.selectedSegmentIndex {
+            
+        case .Some(0):
+            self.dataStack.beginAsynchronous { (transaction) -> Void in
+                
+                transaction.create(Into(Palette))
+            }
+            
+        case .Some(1):
+            do {
+                
+                try self.dataStack.addSQLiteStoreAndWait(fileName: "emptyStore.sqlite", configuration: "invalidStore")
+            }
+            catch _ { }
+            
+        case .Some(2):
+            self.dataStack.beginAsynchronous { (transaction) -> Void in
+                
+                transaction.commit()
+                transaction.commit()
+            }
+            
+        default:
+            return
+        }
+    }
+}
--- a/Demo/MigrationsDemoViewController.swift
+++ b/Demo/MigrationsDemoViewController.swift
@@ -0,0 +1,388 @@
+//
+//  MigrationsDemoViewController.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/21.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+import CoreStore
+
+
+// MARK: - MigrationsDemoViewController
+
+class MigrationsDemoViewController: UIViewController {
+    
+    // MARK: UIViewController
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        if let segmentedControl = self.segmentedControl {
+            
+            for (index, model) in self.models.enumerate() {
+                
+                segmentedControl.setTitle(
+                    model.label,
+                    forSegmentAtIndex: index
+                )
+            }
+        }
+        self.setDataStack(nil, model: nil, scrollToSelection: false)
+    }
+    
+    override func viewDidAppear(animated: Bool) {
+        
+        super.viewDidAppear(animated)
+        
+        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.",
+            preferredStyle: .Alert
+        )
+        alert.addAction(UIAlertAction(title: "OK", style: .Cancel, handler: nil))
+        self.presentViewController(alert, animated: true, completion: nil)
+        
+        
+        let modelMetadata = withExtendedLifetime(DataStack(modelName: "MigrationDemo")) {
+            (dataStack: DataStack) -> ModelMetadata in
+            
+            let models = self.models
+            do {
+                
+                let migrations = try dataStack.requiredMigrationsForSQLiteStore(
+                    fileName: "MigrationDemo.sqlite"
+                )
+                
+                let storeVersion = migrations.first?.sourceVersion ?? dataStack.modelVersion
+                for model in models {
+                    
+                    if model.version == storeVersion {
+                        
+                        return model
+                    }
+                }
+            }
+            catch _ { }
+            
+            return models.first!
+        }
+        
+        self.selectModelVersion(modelMetadata)
+    }
+    
+    
+    // MARK: Private
+    
+    private typealias ModelMetadata = (label: String, version: String, entityType: AnyClass, migrationChain: MigrationChain)
+    
+    private let models: [ModelMetadata] = [
+        (
+            label: "Model V1",
+            version: "MigrationDemo",
+            entityType: OrganismV1.self,
+            migrationChain: ["MigrationDemoV3", "MigrationDemoV2", "MigrationDemo"]
+        ),
+        (
+            label: "Model V2",
+            version: "MigrationDemoV2",
+            entityType: OrganismV2.self,
+            migrationChain: [
+                "MigrationDemo": "MigrationDemoV2",
+                "MigrationDemoV3": "MigrationDemoV2"
+            ]
+        ),
+        (
+            label: "Model V3",
+            version: "MigrationDemoV3",
+            entityType: OrganismV3.self,
+            migrationChain: ["MigrationDemo", "MigrationDemoV2", "MigrationDemoV3"]
+        )
+    ]
+    
+    private var _listMonitor: ListMonitor<NSManagedObject>?
+    private var listMonitor: ListMonitor<NSManagedObject>? {
+        
+        return self._listMonitor
+    }
+    
+    private var _dataStack: DataStack?
+    private var dataStack: DataStack? {
+        
+        return self._dataStack
+    }
+    
+    private var _lastSelectedIndexPath: NSIndexPath?
+    private var lastSelectedIndexPath: NSIndexPath? {
+        
+        return self._lastSelectedIndexPath
+    }
+    
+    private func setSelectedIndexPath(indexPath: NSIndexPath, scrollToSelection: Bool) {
+        
+        self._lastSelectedIndexPath = indexPath
+        self.updateDisplay(reloadData: false, scrollToSelection: scrollToSelection, animated: true)
+    }
+    
+    @IBOutlet private dynamic weak var headerContainer: UIView?
+    @IBOutlet private dynamic weak var titleLabel: UILabel?
+    @IBOutlet private dynamic weak var organismLabel: UILabel?
+    @IBOutlet private dynamic weak var segmentedControl: UISegmentedControl?
+    @IBOutlet private dynamic weak var progressView: UIProgressView?
+    @IBOutlet private dynamic weak var tableView: UITableView?
+    
+    @IBAction private dynamic func segmentedControlValueChanged(sender: AnyObject?) {
+        
+        guard let index = self.segmentedControl?.selectedSegmentIndex else {
+            
+            return
+        }
+        
+        self.selectModelVersion(self.models[index])
+    }
+    
+    private func selectModelVersion(model: ModelMetadata) {
+        
+        if self.dataStack?.modelVersion == model.version {
+            
+            return
+        }
+        
+        self.setDataStack(nil, model: nil, scrollToSelection: false) // explicitly trigger NSPersistentStore cleanup by deallocating the stack
+        
+        let dataStack = DataStack(
+            modelName: "MigrationDemo",
+            migrationChain: model.migrationChain
+        )
+        
+        self.setEnabled(false)
+        let progress = try! dataStack.addSQLiteStore(
+            fileName: "MigrationDemo.sqlite",
+            completion: { [weak self] (result) -> Void in
+                
+                guard let strongSelf = self else {
+                    
+                    return
+                }
+                
+                guard case .Success = result else {
+                    
+                    strongSelf.setEnabled(true)
+                    return
+                }
+                
+                strongSelf.setDataStack(dataStack, model: model, scrollToSelection: true)
+                
+                let count = dataStack.queryValue(From(model.entityType), Select<Int>(.Count("dna")))
+                if count > 0 {
+                    
+                    strongSelf.setEnabled(true)
+                }
+                else {
+                    
+                    dataStack.beginAsynchronous { (transaction) -> Void in
+                        
+                        for i: Int64 in 1 ..< 10000 {
+                            
+                            let organism = transaction.create(Into(model.entityType)) as! OrganismProtocol
+                            organism.dna = i
+                            organism.mutate()
+                        }
+                        
+                        transaction.commit { result -> Void in
+                            
+                            self?.setEnabled(true)
+                        }
+                    }
+                }
+            }
+        )
+        
+        if let progress = progress {
+            
+            progress.setProgressHandler { [weak self] (progress) -> Void in
+                
+                self?.reloadTableHeaderWithProgress(progress)
+            }
+        }
+    }
+    
+    private func setEnabled(enabled: Bool) {
+        
+        UIView.animateWithDuration(
+            0.2,
+            delay: 0,
+            options: .BeginFromCurrentState,
+            animations: { () -> Void in
+                
+                let navigationItem = self.navigationItem
+                navigationItem.leftBarButtonItem?.enabled = enabled
+                navigationItem.rightBarButtonItem?.enabled = enabled
+                navigationItem.hidesBackButton = !enabled
+                
+                self.segmentedControl?.enabled = enabled
+                
+                if let tableView = self.tableView {
+                    
+                    tableView.alpha = enabled ? 1.0 : 0.5
+                    tableView.userInteractionEnabled = enabled
+                }
+            },
+            completion: nil
+        )
+    }
+    
+    private func setDataStack(dataStack: DataStack?, model: ModelMetadata?, scrollToSelection: Bool) {
+        
+        if let dataStack = dataStack, let model = model {
+            
+            self.segmentedControl?.selectedSegmentIndex = self.models.map { $0.version }.indexOf(model.version)!
+            
+            self._dataStack = dataStack
+            let listMonitor = dataStack.monitorList(From(model.entityType), OrderBy(.Descending("dna")))
+            listMonitor.addObserver(self)
+            self._listMonitor = listMonitor
+            
+            if self.lastSelectedIndexPath == nil  {
+                
+                if listMonitor.numberOfObjectsInSection(0) > 0 {
+                    
+                    self.setSelectedIndexPath(NSIndexPath(forRow: 0, inSection: 0), scrollToSelection: true)
+                }
+            }
+        }
+        else {
+           
+            self.segmentedControl?.selectedSegmentIndex = UISegmentedControlNoSegment
+            self._dataStack = nil
+            self._listMonitor = nil
+        }
+        
+        self.updateDisplay(reloadData: true, scrollToSelection: scrollToSelection, animated: false)
+    }
+    
+    private func reloadTableHeaderWithProgress(progress: NSProgress) {
+        
+        self.progressView?.setProgress(Float(progress.fractionCompleted), animated: true)
+        self.titleLabel?.text = "Migrating: \(progress.localizedDescription)"
+        self.organismLabel?.text = "Incremental step \(progress.localizedAdditionalDescription)"
+    }
+    
+    private func updateDisplay(reloadData reloadData: Bool, scrollToSelection: Bool, animated: Bool) {
+        
+        var lines = [String]()
+        var organismType = ""
+        if let indexPath = self.lastSelectedIndexPath, let organism = self.listMonitor?[indexPath] {
+            
+            for property in organism.entity.properties {
+                
+                let value: AnyObject = organism.valueForKey(property.name) ?? NSNull()
+                lines.append("\(property.name): \(value)")
+            }
+            organismType = organism.entity.managedObjectClassName
+        }
+        
+        self.titleLabel?.text = organismType
+        self.organismLabel?.text = "\n".join(lines)
+        self.progressView?.progress = 0
+        
+        self.headerContainer?.setNeedsLayout()
+        
+        guard let tableView = self.tableView else {
+            
+            return
+        }
+        
+        if reloadData {
+            
+            tableView.reloadData()
+        }
+        
+        tableView.layoutIfNeeded()
+        
+        if let indexPath = self.lastSelectedIndexPath where indexPath.row < tableView.numberOfRowsInSection(0) {
+            
+            tableView.selectRowAtIndexPath(indexPath,
+                animated: scrollToSelection && animated,
+                scrollPosition: scrollToSelection ? .Middle : .None
+            )
+        }
+    }
+}
+
+
+// MARK: - MigrationsDemoViewController: ListObserver
+
+extension MigrationsDemoViewController: ListObserver {
+    
+    // MARK: ListObserver
+    
+    func listMonitorWillChange(monitor: ListMonitor<NSManagedObject>) { }
+    
+    func listMonitorDidChange(monitor: ListMonitor<NSManagedObject>) {
+        
+        if self.lastSelectedIndexPath == nil && self.listMonitor?.numberOfObjectsInSection(0) > 0 {
+            
+            self.tableView?.reloadData()
+            self.setSelectedIndexPath(NSIndexPath(forRow: 0, inSection: 0), scrollToSelection: false)
+        }
+        else {
+            
+            self.updateDisplay(reloadData: true, scrollToSelection: true, animated: true)
+        }
+    }
+}
+
+
+// MARK: - MigrationsDemoViewController: UITableViewDataSource, UITableViewDelegate
+
+extension MigrationsDemoViewController: UITableViewDataSource, UITableViewDelegate {
+    
+    // MARK: UITableViewDataSource
+    
+    @objc dynamic func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return self.listMonitor?.numberOfObjectsInSection(0) ?? 0
+    }
+    
+    @objc dynamic func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCellWithIdentifier("OrganismTableViewCell", forIndexPath: indexPath) as! OrganismTableViewCell
+        
+        let dna = (self.listMonitor?[indexPath] as? OrganismProtocol)?.dna.description ?? ""
+        cell.dnaLabel?.text = "DNA: \(dna)"
+        cell.mutateButtonHandler = { [weak self] _ -> Void in
+            
+            guard let strongSelf = self,
+                let dataStack = strongSelf.dataStack,
+                let organism = strongSelf.listMonitor?[indexPath] else {
+                    
+                    return
+            }
+            
+            strongSelf.setSelectedIndexPath(indexPath, scrollToSelection: false)
+            strongSelf.setEnabled(false)
+            dataStack.beginAsynchronous { (transaction) -> Void in
+                
+                let organism = transaction.edit(organism) as! OrganismProtocol
+                organism.mutate()
+                
+                transaction.commit { _ -> Void in
+                    
+                    self?.setEnabled(true)
+                }
+            }
+        }
+        return cell
+    }
+    
+    
+    // MARK: UITableViewDelegate
+    
+    @objc dynamic func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
+        
+        self.setSelectedIndexPath(indexPath, scrollToSelection: false)
+    }
+}
--- a/Demo/MyAppModel.xcdatamodeld/.xccurrentversion
+++ b/Demo/MyAppModel.xcdatamodeld/.xccurrentversion
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
--- a/Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents
+++ b/Demo/MyAppModel.xcdatamodeld/MyAppModel.xcdatamodel/contents
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="8166.2" systemVersion="14E46" minimumToolsVersion="Xcode 7.0">
+    <elements/>
+</model>
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -0,0 +1,16 @@
+//
+//  OrganismProtocol.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/27.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+
+protocol OrganismProtocol: class {
+    
+    var dna: Int64 { get set }
+    
+    func mutate()
+}
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -0,0 +1,22 @@
+//
+//  OrganismTableViewCell.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/07/12.
+//  Copyright © 2015 John Rommel Estropia. All rights reserved.
+//
+
+import UIKit
+
+class OrganismTableViewCell: UITableViewCell {
+
+    @IBOutlet weak dynamic var dnaLabel: UILabel?
+    @IBOutlet weak dynamic var mutateButton: UIButton?
+    
+    var mutateButtonHandler: (() -> Void)?
+
+    @IBAction dynamic func mutateButtonTouchUpInside(sender: UIButton?) {
+     
+        self.mutateButtonHandler?()
+    }
+}
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -0,0 +1,25 @@
+//
+//  OrganismV1.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/21.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class OrganismV1: NSManagedObject, OrganismProtocol {
+
+    @NSManaged var dna: Int64
+    @NSManaged var hasHead: Bool
+    @NSManaged var hasTail: Bool
+    
+    // MARK: OrganismProtocol
+    
+    func mutate() {
+        
+        self.hasHead = arc4random_uniform(2) == 1
+        self.hasTail = arc4random_uniform(2) == 1
+    }
+}
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -0,0 +1,27 @@
+//
+//  OrganismV2.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/21.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class OrganismV2: NSManagedObject, OrganismProtocol {
+    
+    @NSManaged var dna: Int64
+    @NSManaged var hasHead: Bool
+    @NSManaged var hasTail: Bool
+    @NSManaged var numberOfFlippers: Int32
+    
+    // MARK: OrganismProtocol
+    
+    func mutate() {
+        
+        self.hasHead = arc4random_uniform(2) == 1
+        self.hasTail = arc4random_uniform(2) == 1
+        self.numberOfFlippers = Int32(arc4random_uniform(9) / 2 * 2)
+    }
+}
--- a/Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml
+++ b/Demo/OrganismV2ToV3.xcmappingmodel/xcmapping.xml
--- a/Demo/OrganismV2ToV3MigrationPolicy.swift
+++ b/Demo/OrganismV2ToV3MigrationPolicy.swift
@@ -0,0 +1,23 @@
+//
+//  OrganismV2ToV3MigrationPolicy.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/27.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import CoreData
+
+class OrganismV2ToV3MigrationPolicy: NSEntityMigrationPolicy {
+    
+    override func createDestinationInstancesForSourceInstance(sInstance: NSManagedObject, entityMapping mapping: NSEntityMapping, manager: NSMigrationManager) throws {
+        
+        try super.createDestinationInstancesForSourceInstance(sInstance, entityMapping: mapping, manager: manager)
+        
+        for dInstance in manager.destinationInstancesForEntityMappingNamed(mapping.name, sourceInstances: [sInstance]) {
+            
+            dInstance.setValue(false, forKey: "hasVertebrae")
+            dInstance.setValue(sInstance.valueForKey("numberOfFlippers"), forKey: "numberOfLimbs")
+        }
+    }
+}
--- a/CoreStoreDemo/CoreStoreDemo/MIgrations
+++ b/CoreStoreDemo/CoreStoreDemo/MIgrations
@@ -0,0 +1,29 @@
+//
+//  OrganismV3.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/27.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class OrganismV3: NSManagedObject, OrganismProtocol {
+    
+    @NSManaged var dna: Int64
+    @NSManaged var hasHead: Bool
+    @NSManaged var hasTail: Bool
+    @NSManaged var numberOfLimbs: Int32
+    @NSManaged var hasVertebrae: Bool
+    
+    // MARK: OrganismProtocol
+    
+    func mutate() {
+        
+        self.hasHead = arc4random_uniform(2) == 1
+        self.hasTail = arc4random_uniform(2) == 1
+        self.numberOfLimbs = Int32(arc4random_uniform(9) / 2 * 2)
+        self.hasVertebrae = arc4random_uniform(2) == 1
+    }
+}
--- a/Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml
+++ b/Demo/OrganismV3ToV2.xcmappingmodel/xcmapping.xml
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/.xccurrentversion
+++ b/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/.xccurrentversion
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>_XCCurrentVersionName</key>
+	<string>MigrationDemoV3.xcdatamodel</string>
+</dict>
+</plist>
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
+++ b/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemo.xcdatamodel/contents
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV1" syncable="YES">
+        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="hasHead" optional="YES" attributeType="Boolean" syncable="YES"/>
+        <attribute name="hasTail" optional="YES" attributeType="Boolean" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Organism" positionX="-36" positionY="9" width="128" height="90"/>
+    </elements>
+</model>
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
+++ b/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV2.xcdatamodel/contents
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV2" syncable="YES">
+        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" syncable="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" syncable="YES"/>
+        <attribute name="numberOfFlippers" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Organism" positionX="-36" positionY="9" width="128" height="105"/>
+    </elements>
+</model>
--- a/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
+++ b/CoreStoreDemo/CoreStoreDemo/MigrationDemo.xcdatamodeld/MigrationDemoV3.xcdatamodel/contents
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="7701" systemVersion="14E46" minimumToolsVersion="Xcode 4.3">
+    <entity name="Organism" representedClassName="CoreStoreDemo.OrganismV3" syncable="YES">
+        <attribute name="dna" optional="YES" attributeType="Integer 64" syncable="YES"/>
+        <attribute name="hasHead" attributeType="Boolean" syncable="YES"/>
+        <attribute name="hasTail" attributeType="Boolean" syncable="YES"/>
+        <attribute name="hasVertebrae" attributeType="Boolean" syncable="YES"/>
+        <attribute name="numberOfLimbs" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Organism" positionX="-36" positionY="9" width="128" height="120"/>
+    </elements>
+</model>
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -1,15 +0,0 @@
-//
-//  FacebookAccount.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
-//
-
-import Foundation
-import CoreData
-
-
-// MARK: - FacebookAccount
-
-class FacebookAccount: TwitterAccount { }
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -0,0 +1,15 @@
+//
+//  FemaleAccount.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/06.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class FemaleAccount: UserAccount {
+
+
+}
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -0,0 +1,15 @@
+//
+//  MaleAccount.swift
+//  CoreStoreDemo
+//
+//  Created by John Rommel Estropia on 2015/06/06.
+//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class MaleAccount: UserAccount {
+
+
+}
--- a/Demo/StackSetupDemoViewController.swift
+++ b/Demo/StackSetupDemoViewController.swift
@@ -12,34 +12,33 @@ import CoreStore

 private struct Static {
    
-    static let johnConfiguration = "SetupDemo_John"
-    static let janeConfiguration = "SetupDemo_Jane"
+    static let maleConfiguration = "MaleAccounts"
+    static let femaleConfiguration = "FemaleAccounts"
    
    static let facebookStack: DataStack = {
        
-        let dataStack = DataStack(modelName: "CoreStoreDemo")
-        dataStack.addSQLiteStore(
-            "AccountsDemo_FB_John.sqlite",
-            configuration: johnConfiguration,
-            resetStoreOnMigrationFailure: true
+        let dataStack = DataStack(modelName: "StackSetupDemo")
+        try! dataStack.addSQLiteStoreAndWait(
+            fileName: "AccountsDemo_FB_Male.sqlite",
+            configuration: maleConfiguration,
+            resetStoreOnModelMismatch: true
        )
-        dataStack.addSQLiteStore(
-            "AccountsDemo_FB_Jane.sqlite",
-            configuration: janeConfiguration,
-            resetStoreOnMigrationFailure: true
+        try! dataStack.addSQLiteStoreAndWait(
+            fileName: "AccountsDemo_FB_Female.sqlite",
+            configuration: femaleConfiguration,
+            resetStoreOnModelMismatch: true
        )
        
        dataStack.beginSynchronous { (transaction) -> Void in
            
-            transaction.deleteAll(From<UserAccount>(johnConfiguration))
-            transaction.deleteAll(From<UserAccount>(janeConfiguration))
+            transaction.deleteAll(From(UserAccount))
            
-            let account1 = transaction.create(Into<UserAccount>(johnConfiguration))
+            let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
            account1.accountType = "Facebook"
            account1.name = "John Smith HCD"
            account1.friends = 42
            
-            let account2 = transaction.create(Into<UserAccount>(janeConfiguration))
+            let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
            account2.accountType = "Facebook"
            account2.name = "Jane Doe HCD"
            account2.friends = 314
@@ -52,29 +51,28 @@ private struct Static {
    
    static let twitterStack: DataStack = {
        
-        let dataStack = DataStack(modelName: "CoreStoreDemo")
-        dataStack.addSQLiteStore(
-            "AccountsDemo_TW_John.sqlite",
-            configuration: johnConfiguration,
-            resetStoreOnMigrationFailure: true
+        let dataStack = DataStack(modelName: "StackSetupDemo")
+        try! dataStack.addSQLiteStoreAndWait(
+            fileName: "AccountsDemo_TW_Male.sqlite",
+            configuration: maleConfiguration,
+            resetStoreOnModelMismatch: true
        )
-        dataStack.addSQLiteStore(
-            "AccountsDemo_TW_Jane.sqlite",
-            configuration: janeConfiguration,
-            resetStoreOnMigrationFailure: true
+        try! dataStack.addSQLiteStoreAndWait(
+            fileName: "AccountsDemo_TW_Female.sqlite",
+            configuration: femaleConfiguration,
+            resetStoreOnModelMismatch: true
        )
        
        dataStack.beginSynchronous { (transaction) -> Void in
            
-            transaction.deleteAll(From<UserAccount>(johnConfiguration))
-            transaction.deleteAll(From<UserAccount>(janeConfiguration))
+            transaction.deleteAll(From(UserAccount))
            
-            let account1 = transaction.create(Into<UserAccount>(johnConfiguration))
+            let account1 = transaction.create(Into<MaleAccount>(maleConfiguration))
            account1.accountType = "Twitter"
            account1.name = "#johnsmith_hcd"
            account1.friends = 7
            
-            let account2 = transaction.create(Into<UserAccount>(janeConfiguration))
+            let account2 = transaction.create(Into<FemaleAccount>(femaleConfiguration))
            account2.accountType = "Twitter"
            account2.name = "#janedoe_hcd"
            account2.friends = 100
@@ -94,14 +92,8 @@ private struct Static {
 class StackSetupDemoViewController: UITableViewController {
    
    let accounts = [
-        [
-            Static.facebookStack.fetchOne(From<UserAccount>(Static.johnConfiguration))!,
-            Static.facebookStack.fetchOne(From<UserAccount>(Static.janeConfiguration))!
-        ],
-        [
-            Static.twitterStack.fetchOne(From<UserAccount>(Static.johnConfiguration))!,
-            Static.twitterStack.fetchOne(From<UserAccount>(Static.janeConfiguration))!
-        ]
+        Static.facebookStack.fetchAll(From(UserAccount)) ?? [],
+        Static.twitterStack.fetchAll(From(UserAccount)) ?? []
    ]
    
    
@@ -146,7 +138,7 @@ class StackSetupDemoViewController: UITableViewController {
    
    override func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
        
-        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell") as! UITableViewCell
+        let cell = tableView.dequeueReusableCellWithIdentifier("UITableViewCell")!
        
        let account = self.accounts[indexPath.section][indexPath.row]
        cell.textLabel?.text = account.name
@@ -168,20 +160,27 @@ class StackSetupDemoViewController: UITableViewController {
        
        switch section {
            
-        case 0: return "Facebook Accounts"
-        case 1: return "Twitter Accounts"
-        default: return nil
+        case 0:
+            let count = self.accounts[section].count
+            return "Facebook Accounts (\(count) users)"
+            
+        case 1:
+            let count = self.accounts[section].count
+            return "Twitter Accounts (\(count) users)"
+            
+        default:
+            return nil
        }
    }
    
    
    // MARK: Private
    
-    @IBOutlet weak var accountTypeLabel: UILabel?
-    @IBOutlet weak var nameLabel: UILabel?
-    @IBOutlet weak var friendsLabel: UILabel?
+    @IBOutlet private dynamic weak var accountTypeLabel: UILabel?
+    @IBOutlet private dynamic weak var nameLabel: UILabel?
+    @IBOutlet private dynamic weak var friendsLabel: UILabel?
    
-    func updateDetailsWithAccount(account: UserAccount) {
+    private func updateDetailsWithAccount(account: UserAccount) {
        
        self.accountTypeLabel?.text = account.accountType
        self.nameLabel?.text = account.name
--- a/CoreStoreDemo/CoreStoreDemo/Stack
+++ b/CoreStoreDemo/CoreStoreDemo/Stack
@@ -1,15 +0,0 @@
-//
-//  TwitterAccount.swift
-//  CoreStoreDemo
-//
-//  Created by John Rommel Estropia on 2015/05/24.
-//  Copyright (c) 2015 John Rommel Estropia. All rights reserved.
-//
-
-import Foundation
-import CoreData
-
-
-// MARK: - TwitterAccount
-
-class TwitterAccount: UserAccount { }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Rommel Estropia	ba4fb5e5cb	version bump	2015-08-21 08:03:14 +09:00
John Rommel Estropia	d860da2507	Merge branch 'develop'	2015-08-21 08:03:01 +09:00
John Estropia	2bcf8008c5	let transaction fetch existing objects from external contexts	2015-08-20 17:20:38 +09:00
John Estropia	71477c0839	allow equality comparison on ListMonitor and ObjectMonitor to help distinguish senders when observing multiple monitors	2015-08-20 14:25:14 +09:00
John Estropia	3348aa0bef	added utility to check if objects exist in a ListMonitor	2015-08-20 13:51:14 +09:00
John Estropia	2ed61fdb17	added utilities to ListMonitor to extract all objects in specified sections	2015-08-20 12:15:20 +09:00
John Estropia	9cfad8a17a	oops, GroupBy should not be needed for monitorList()	2015-08-19 21:00:27 +09:00
John Estropia	3bf34f33dc	added utilities for ListMonitor to optionally extract objects with potentially invalid indexes/indexPaths	2015-08-19 20:56:50 +09:00
John Estropia	90bfaeaae8	removed unused key tuple	2015-08-19 18:30:39 +09:00
John Estropia	a29a4b38fe	added utilities to get existing NSManagedObject instances using object IDs	2015-08-19 15:53:20 +09:00
John Estropia	5a96ef13f6	added utility to get NSManagedObjectID from an object URI	2015-08-19 15:07:15 +09:00
John Estropia	b92ee76907	added utility to refresh an object	2015-08-19 12:19:14 +09:00
John Estropia	67ccae4ef6	added missing parameters	2015-08-19 11:21:39 +09:00
John Estropia	62b11309f3	expose DataStack vars to CoreStore	2015-08-18 21:49:40 +09:00
John Estropia	8c6a7df731	provide a way to enumerate entities managed by the DataStack	2015-08-18 21:40:33 +09:00
John Rommel Estropia	b475afe79f	updated Readme	2015-08-17 23:51:08 +09:00
John Rommel Estropia	a263851266	import array of ImportableObjects	2015-08-17 23:50:03 +09:00
John Estropia	cbc3eb8887	woops, develop branch should be Swift 2.0, not 1.2	2015-08-11 15:37:44 +08:00
John Rommel Estropia	2fb3263aa1	refactored autoreleasepool calls	2015-08-09 18:27:21 +09:00
John Rommel Estropia	64aa97264e	added utilities for importing data	2015-08-09 05:06:42 +09:00
John Rommel Estropia	8066bf2a5a	fixed assertion failures when fetching from detached data transactions	2015-08-09 05:05:26 +09:00
John Rommel Estropia	283104af3f	thanks to protocol extensions, you can now omit ListObserver and ObjectObserver methods you don't need to implement	2015-08-09 05:04:47 +09:00
John Rommel Estropia	83c724f584	updated default logger to still run assertions even on optimized (-O) builds	2015-08-08 22:12:08 +09:00
John Rommel Estropia	59ad525786	fixed for Xcode 7 beta 5	2015-08-08 10:24:40 +09:00
John Rommel Estropia	b85d7521e1	version bump	2015-07-29 22:24:11 +09:00
John Rommel Estropia	4dbc4558e3	display explanation dialog for migration demo	2015-07-29 22:21:22 +09:00
John Rommel Estropia	2a56c097f2	Merge branch 'master' into develop	2015-07-29 21:32:17 +09:00
John Estropia	d4b95aed64	Merge pull request #10 from bddckr/patch-1 Fix building with Carthage	2015-07-28 12:44:43 +09:00
Christopher - Marcel Böddecker	0d2650c54b	Fix building with Carthage	2015-07-27 19:26:19 +02:00
John Rommel Estropia	6a3885edda	aesthetic	2015-07-26 21:21:19 +09:00
John Rommel Estropia	1c6085ad82	expose DetachedDataTransaction's context and allow creating children detached transactions (https://github.com/JohnEstropia/CoreStore/issues/9 )	2015-07-26 21:20:48 +09:00
John Rommel Estropia	2dae2ae39c	update GCDKit submodule version	2015-07-26 17:11:53 +09:00
John Rommel Estropia	a1e37975cc	updated project settings for Xcode 7 beta 4	2015-07-26 17:08:56 +09:00
John Rommel Estropia	0c8a43c3b0	added shorthand vars for inspecting MigrationType values. updated readme	2015-07-26 17:04:19 +09:00
John Rommel Estropia	9676e3aca2	addSQLiteStoreAndWait() does not support auto-migrating stores anymore; use the asynchronous addSQLiteStore(..., completion:) method instead.	2015-07-26 10:07:42 +09:00
John Rommel Estropia	a34d2795af	remove queue asserts for detached transactions	2015-07-26 09:27:00 +09:00
John Rommel Estropia	106789d592	refactor some internal methods. renamed addInMemoryStore to addInMemoryStoreAndWait to reflect synchronicity.	2015-07-25 23:05:48 +09:00
John Rommel Estropia	edc51de030	catch intentional error in logger demo	2015-07-24 08:06:59 +09:00
John Rommel Estropia	f85eb2e057	merge changes to the main context asynchronously (fixes https://github.com/JohnEstropia/CoreStore/issues/7 )	2015-07-24 08:05:13 +09:00
John Rommel Estropia	f0161b50ed	submodule update	2015-07-19 00:07:47 +09:00
John Rommel Estropia	6c780c1282	use GCDKit's swift2.0 supported commit	2015-07-19 00:05:58 +09:00
John Rommel Estropia	b711ec9644	gcdkit version	2015-07-18 23:57:59 +09:00
John Rommel Estropia	a581f91507	Merge branch 'develop' Conflicts: README.md	2015-07-18 23:53:37 +09:00
John Estropia	ebd4df5c2f	Update README.md	2015-07-14 13:23:41 +09:00
John Estropia	2780fd7682	Update README.md	2015-07-14 13:23:26 +09:00
John Rommel Estropia	982e75a36e	updated README	2015-07-14 07:56:50 +09:00
John Rommel Estropia	79d5598abe	updated README	2015-07-14 07:54:23 +09:00
John Rommel Estropia	b88679c507	updated README	2015-07-14 07:50:12 +09:00
John Rommel Estropia	858dd0962d	updated documentation (in progress)	2015-07-14 07:44:45 +09:00
John Estropia	e7bcb501fd	fixed migrationchain validation	2015-07-13 16:16:19 +09:00
John Rommel Estropia	f99349f99d	improved migrationchain validation	2015-07-13 07:47:43 +09:00
John Rommel Estropia	a64bcc474e	updated error handling for DataStack methods, updated migration demo app	2015-07-12 19:20:38 +09:00
John Rommel Estropia	8cfe8e2500	added NSProgress support for migrations	2015-07-12 00:49:53 +09:00
John Rommel Estropia	33268eeea1	fix demo app: label layout problem on iOS 9	2015-07-10 07:17:22 +09:00
John Estropia	b2a190ea33	require explicit parameter for fileName when calling addSQLiteStore() and it's variants	2015-07-09 21:28:37 +09:00
John Estropia	35fbaf9513	updated for Xcode 7 beta 3	2015-07-09 21:25:19 +09:00
John Estropia	450afb00fa	Merge branch 'master' into develop Conflicts: CoreStore.podspec CoreStore/Info.plist CoreStore/Saving and Processing/DataStack+Transaction.swift	2015-07-09 19:01:23 +09:00
John Estropia	e0048f589c	version bump	2015-07-09 18:57:59 +09:00
John Estropia	929fdfd9a9	remove thread asserts when creating new transactions. fixes https://github.com/JohnEstropia/CoreStore/issues/6	2015-07-09 18:55:35 +09:00
John Estropia	7e0d3120e1	fix jump link for readme	2015-07-09 18:34:42 +09:00
John Rommel Estropia	acfe5dd7a7	use GCDKit commit with iOS 7 support	2015-07-09 08:10:36 +09:00
John Rommel Estropia	9da323b0b8	assert migration chain when creating a data stack	2015-07-09 08:08:11 +09:00
John Estropia	4f3e679aa1	Merge branch 'master' into develop Conflicts: CoreStoreDemo/CoreStoreDemo.xcodeproj/xcshareddata/xcschemes/CoreStoreDemo.xcscheme	2015-07-08 12:30:41 +09:00
John Estropia	c1967ecdd3	fixed schemes for xcode 6.4	2015-07-08 10:41:18 +09:00
John Estropia	1a56dfd708	shared all schemes for Carthage	2015-07-08 10:28:57 +09:00
John Estropia	5f04f4c496	reversible migrations	2015-07-07 19:38:46 +09:00
John Rommel Estropia	5b85b0749e	migration utilities (beta), swift 2 conversion	2015-07-07 08:03:46 +09:00
John Rommel Estropia	bf0eebe057	migration utilities (beta)	2015-07-07 07:58:16 +09:00
John Rommel Estropia	261c3a6001	minor changes before Swift 2.0	2015-07-03 00:22:21 +09:00
John Rommel Estropia	91444b6dd3	Merge branch 'master' into develop	2015-07-02 22:47:36 +09:00
John Rommel Estropia	3bbae948ca	gitignore	2015-07-02 22:47:19 +09:00
John Rommel Estropia	e0b5da27f8	Merge branch 'master' into develop Conflicts: CoreStoreDemo/CoreStoreDemo.xcodeproj/xcuserdata/johnestropia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	2015-07-02 00:19:26 +09:00
John Estropia	d247198093	delete gitignore for old project name	2015-07-01 18:56:37 +09:00
John Estropia	589e5618ce	delete unnecessary files	2015-07-01 18:54:39 +09:00
John Rommel Estropia	8402ebcc0f	Carthage supportt	2015-07-01 08:13:19 +09:00
John Rommel Estropia	40f22761bf	Big update. Migration tools in progress	2015-07-01 08:03:09 +09:00
John Rommel Estropia	caf5c570df	Merge branch 'develop' Conflicts: CoreStoreDemo/CoreStoreDemo/Transactions Demo/TransactionsDemoViewController.swift	2015-06-19 04:07:27 +09:00
John Rommel Estropia	71c80c3497	marked experimental methods as private to prevent accidental usage	2015-06-19 04:05:56 +09:00
John Rommel Estropia	832dd8826e	Updated Demo app with Fetching and Querying samples	2015-06-19 04:02:53 +09:00
John Rommel Estropia	fcda83e6ac	incomplete migration prototype methods	2015-06-15 01:31:03 +08:00
John Rommel Estropia	7303e05820	fixed demo explanation alert title	2015-06-12 23:46:09 +08:00
John Rommel Estropia	a44400a935	version bump	2015-06-10 10:38:08 +09:00
John Rommel Estropia	f18d29d9bc	created an asynchronous method for adding sqlite store to handle asynchronous migrations. note that this commit breaks previous usage of DataStack.addSQLiteStore(...), which is now renamed to addSQLiteStoreAndWait(...)	2015-06-10 10:37:16 +09:00
John Rommel Estropia	c4171de86e	removed Median and StandardDeviation from supported aggregates as core data doesn't seem to support them either	2015-06-06 17:44:04 +09:00
John Rommel Estropia	b0a637520e	updated demo app	2015-06-05 02:21:34 +09:00
John Rommel Estropia	e8f17cb33a	updated read	2015-06-04 01:04:52 +09:00
John Rommel Estropia	3c29cdf2d2	updated read	2015-06-04 00:44:28 +09:00
John Rommel Estropia	e462ae5a19	fixed demo app	2015-06-04 00:40:19 +09:00
John Estropia	6ed6159eec	Update README.md	2015-06-03 01:52:01 +09:00
John Rommel Estropia	7710578bbc	updated readme	2015-06-03 01:20:14 +09:00
John Rommel Estropia	6727c39e21	updated readme	2015-06-01 01:43:19 +09:00
John Rommel Estropia	6aa24cef2d	minor changes, updated README	2015-05-31 14:42:06 +09:00
John Rommel Estropia	a6f3c0bf95	pod bump	2015-05-30 17:26:31 +09:00
John Rommel Estropia	869660d41d	updated README, added more utilities for updating and deleting objects from transactions	2015-05-30 17:26:06 +09:00
John Estropia	6b8d5df049	Updated README	2015-05-29 22:20:54 +09:00
John Estropia	1ca3ba5407	Update README.md	2015-05-29 09:47:56 +09:00
John Rommel Estropia	4da81250ec	updating readme	2015-05-29 08:09:03 +09:00