     
     func realmObjectClass(name: String) -> Object.Type {
         
-        if let objClass = NSClassFromString(name) {
-            return objClass as! Object.Type
-        } else {
-            let namespace = Bundle.main.infoDictionary!["CFBundleExecutable"] as! String
-            return NSClassFromString("\(namespace).\(name)") as! Object.Type
-        }
+        return modelTypes[name]!
     }
     
     func updateHasChanges(realm: Realm) {

        super.init()
        
        executeOnMainQueue {
            setup()
            setupChildrenRelationshipsLookup()
        }

    var objectNotificationTokens = [String: NotificationToken]()
    var pendingTrackingUpdates = [ObjectUpdate]()
    var childRelationships = [String: Array<ChildRelationship>]()
    var modelTypes = [String: Object.Type]()
    var hasChangesValue = false
    
    /* Should be initialized on main queue */
