diff --git a/Sources/Internal/NSManagedObjectContext+Setup.swift b/Sources/Internal/NSManagedObjectContext+Setup.swift
index 222b39c..5b57446 100644
--- a/Sources/Internal/NSManagedObjectContext+Setup.swift
+++ b/Sources/Internal/NSManagedObjectContext+Setup.swift
@@ -61,7 +61,7 @@ internal extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal class func rootSavingContextForCoordinator(coordinator: NSPersistentStoreCoordinator) -> NSManagedObjectContext {
+    internal static func rootSavingContextForCoordinator(coordinator: NSPersistentStoreCoordinator) -> NSManagedObjectContext {
         
         let context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
         context.persistentStoreCoordinator = coordinator
@@ -73,7 +73,7 @@ internal extension NSManagedObjectContext {
     }
     
     @nonobjc
-    internal class func mainContextForRootContext(rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
+    internal static func mainContextForRootContext(rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
         
         let context = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
         context.parentContext = rootContext
diff --git a/Sources/Internal/NSManagedObjectModel+Setup.swift b/Sources/Internal/NSManagedObjectModel+Setup.swift
index 78921f2..ac9d8d5 100644
--- a/Sources/Internal/NSManagedObjectModel+Setup.swift
+++ b/Sources/Internal/NSManagedObjectModel+Setup.swift
@@ -34,7 +34,7 @@ internal extension NSManagedObjectModel {
     // MARK: Internal
     
     @nonobjc
-    internal class func fromBundle(bundle: NSBundle, modelName: String, modelVersionHints: Set<String> = []) -> NSManagedObjectModel {
+    internal static func fromBundle(bundle: NSBundle, modelName: String, modelVersionHints: Set<String> = []) -> NSManagedObjectModel {
         
         guard let modelFilePath = bundle.pathForResource(modelName, ofType: "momd") else {
             
diff --git a/Sources/ObjectiveC/CSCoreStore+Setup.swift b/Sources/ObjectiveC/CSCoreStore+Setup.swift
index 7bde5c9..5661913 100644
--- a/Sources/ObjectiveC/CSCoreStore+Setup.swift
+++ b/Sources/ObjectiveC/CSCoreStore+Setup.swift
@@ -35,7 +35,7 @@ public extension CSCoreStore {
      Returns the `defaultStack`'s model version. The version string is the same as the name of the version-specific .xcdatamodeld file.
      */
     @objc
-    public class var modelVersion: String {
+    public static var modelVersion: String {
         
         return CoreStore.modelVersion
     }
diff --git a/Sources/ObjectiveC/CSCoreStore.swift b/Sources/ObjectiveC/CSCoreStore.swift
index 4729562..758fdd7 100644
--- a/Sources/ObjectiveC/CSCoreStore.swift
+++ b/Sources/ObjectiveC/CSCoreStore.swift
@@ -40,7 +40,7 @@ public final class CSCoreStore: NSObject {
      Changing the `defaultStack` is thread safe, but it is recommended to setup stacks on a common queue (e.g. the main queue).
      */
     @objc
-    public class var defaultStack: CSDataStack {
+    public static var defaultStack: CSDataStack {
         
         get {